From owner-svn-src-stable@FreeBSD.ORG Mon Apr 11 17:49:27 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1835F1065672; Mon, 11 Apr 2011 17:49:27 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E17BD8FC08; Mon, 11 Apr 2011 17:49:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3BHnQcc095420; Mon, 11 Apr 2011 17:49:26 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3BHnQSP095418; Mon, 11 Apr 2011 17:49:26 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <201104111749.p3BHnQSP095418@svn.freebsd.org> From: Andriy Gapon Date: Mon, 11 Apr 2011 17:49:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220544 - stable/8/sys/dev/agp X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2011 17:49:27 -0000 Author: avg Date: Mon Apr 11 17:49:26 2011 New Revision: 220544 URL: http://svn.freebsd.org/changeset/base/220544 Log: MFC r197076,197191: apperture size printing changes Reduce diff to head. On behalf of: n_hibma Modified: stable/8/sys/dev/agp/agp_i810.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/agp/agp_i810.c ============================================================================== --- stable/8/sys/dev/agp/agp_i810.c Mon Apr 11 17:39:07 2011 (r220543) +++ stable/8/sys/dev/agp/agp_i810.c Mon Apr 11 17:49:26 2011 (r220544) @@ -489,12 +489,6 @@ agp_i810_attach(device_t dev) agp_generic_detach(dev); return EINVAL; } - if (sc->stolen > 0) { - device_printf(dev, "detected %dk stolen memory\n", - sc->stolen * 4); - } - device_printf(dev, "aperture size is %dM\n", - sc->initial_aperture / 1024 / 1024); /* GATT address is already in there, make sure it's enabled */ pgtblctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL); @@ -684,9 +678,6 @@ agp_i810_attach(device_t dev) gtt_size += 4; sc->stolen = (stolen - gtt_size) * 1024 / 4096; - if (sc->stolen > 0) - device_printf(dev, "detected %dk stolen memory\n", sc->stolen * 4); - device_printf(dev, "aperture size is %dM\n", sc->initial_aperture / 1024 / 1024); /* GATT address is already in there, make sure it's enabled */ pgtblctl = bus_read_4(sc->sc_res[0], AGP_I810_PGTBL_CTL); @@ -696,6 +687,13 @@ agp_i810_attach(device_t dev) gatt->ag_physical = pgtblctl & ~1; } + device_printf(dev, "aperture size is %dM", + sc->initial_aperture / 1024 / 1024); + if (sc->stolen > 0) + printf(", detected %dk stolen memory\n", sc->stolen * 4); + else + printf("\n"); + if (0) agp_i810_dump_regs(dev);