svn commit: r197076 - head/sys/dev/agp

[Robert Noland]

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 <rnoland at FreeBSD.org>
FreeBSD