svn commit: r196225 - stable/7/sys/pci

[Robert Noland]

On Fri, 2009-08-14 at 21:07 +0000, Nick Hibma wrote:
> Author: n_hibma
> Date: Fri Aug 14 21:07:41 2009
> New Revision: 196225
> URL: http://svn.freebsd.org/changeset/base/196225
> 
> Log:
>   Revert r196169.

Thanks,

robert.

> Modified:
>   stable/7/sys/pci/agp_i810.c
> 
> Modified: stable/7/sys/pci/agp_i810.c
> ==============================================================================
> --- stable/7/sys/pci/agp_i810.c	Fri Aug 14 21:05:08 2009	(r196224)
> +++ stable/7/sys/pci/agp_i810.c	Fri Aug 14 21:07:41 2009	(r196225)
> @@ -474,13 +474,12 @@ agp_i810_attach(device_t dev)
>  				agp_generic_detach(dev);
>  				return EINVAL;
>  		}
> -
> -		if (bootverbose) {
> -			device_print_prettyname(dev);
> -			if (sc->stolen > 0)
> -				printf("detected %dk stolen memory, ", sc->stolen * 4);
> -			printf("aperture size is %dM\n", sc->initial_aperture / 1024 / 1024);
> +		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);
> @@ -665,13 +664,9 @@ agp_i810_attach(device_t dev)
>  		gtt_size += 4;
>  
>  		sc->stolen = (stolen - gtt_size) * 1024 / 4096;
> -
> -		if (bootverbose) {
> -			device_print_prettyname(dev);
> -			if (sc->stolen > 0)
> -				printf("detected %dk stolen memory, ", sc->stolen * 4);
> -			printf("aperture size is %dM\n", sc->initial_aperture / 1024 / 1024);
> -		}
> +		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);
-- 
Robert Noland <rnoland at FreeBSD.org>
FreeBSD