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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
