From owner-svn-src-all@FreeBSD.ORG Thu Sep 10 19:31:55 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7E6981065679; Thu, 10 Sep 2009 19:31:55 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from gizmo.2hip.net (gizmo.2hip.net [64.74.207.195]) by mx1.freebsd.org (Postfix) with ESMTP id 2E6358FC1B; Thu, 10 Sep 2009 19:31:54 +0000 (UTC) Received: from [192.168.1.4] (adsl-241-169-177.bna.bellsouth.net [74.241.169.177]) (authenticated bits=0) by gizmo.2hip.net (8.14.3/8.14.3) with ESMTP id n8AJVqkc064784 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 10 Sep 2009 15:31:53 -0400 (EDT) (envelope-from rnoland@FreeBSD.org) From: Robert Noland To: Nick Hibma In-Reply-To: <200909101924.n8AJOkKB028848@svn.freebsd.org> References: <200909101924.n8AJOkKB028848@svn.freebsd.org> Content-Type: text/plain Organization: FreeBSD Date: Thu, 10 Sep 2009 14:31:47 -0500 Message-Id: <1252611107.1899.10.camel@balrog.2hip.net> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_PBL, RDNS_DYNAMIC,SPF_SOFTFAIL autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on gizmo.2hip.net Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r197076 - head/sys/dev/agp X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2009 19:31:55 -0000 On Thu, 2009-09-10 at 19:24 +0000, Nick Hibma wrote: > Author: n_hibma > Date: Thu Sep 10 19:24:46 2009 > New Revision: 197076 > URL: http://svn.freebsd.org/changeset/base/197076 > > Log: > Move the printing of aperture size and stolen memory behind bootverbose. > None of the other AGP drivers actually displays this information at all, None of the agp drivers are quite as special as agp_i810. Please revert this change. robert. > MFC after: 1 week > > Modified: > head/sys/dev/agp/agp_i810.c > > Modified: head/sys/dev/agp/agp_i810.c > ============================================================================== > --- head/sys/dev/agp/agp_i810.c Thu Sep 10 19:12:08 2009 (r197075) > +++ head/sys/dev/agp/agp_i810.c Thu Sep 10 19:24:46 2009 (r197076) > @@ -474,12 +474,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); > @@ -664,9 +658,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); > @@ -676,6 +667,15 @@ agp_i810_attach(device_t dev) > gatt->ag_physical = pgtblctl & ~1; > } > > + if (bootverbose) { > + 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); > -- Robert Noland FreeBSD