Re: [PATCH 2/3] drm/radeon/kms: move mtrr range add and memoryinformation

[Dave Airlie]

>  
>  /*
> + * Printing helpers
> + */
> +#define PINF(s, arg...) printk(KERN_INFO "radeon " s, ##arg)
> +#define PWRN(s, arg...) \
> +	printk(KERN_WARNING "radeon (WR:%s:%d) " s, __FILE__, __LINE__, ##arg)
> +#define PERR(s, arg...) \
> +	printk(KERN_ERR "radeon (ER:%s:%d) " s, __FILE__, __LINE__, ##arg)
> +

eh? no.

No more printf wrappers please, use DRM_*, or make them better,
or use drv_* or make them better.

but no sneaking stuff like this in a patch that doesn't mention it
introduces printf wrapping.

Dave.

> +
> +/*
>   * ASICs macro.
>   */
>  #define radeon_init(rdev) (rdev)->asic->init((rdev))
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index 72f6262..07ef8b6 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -598,14 +598,6 @@ int radeon_device_init(struct radeon_device *rdev,
>  		/* Get vram informations */
>  		radeon_vram_info(rdev);
>  
> -		/* Add an MTRR for the VRAM */
> -		rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
> -				MTRR_TYPE_WRCOMB, 1);
> -		DRM_INFO("Detected VRAM RAM=%uM, BAR=%uM\n",
> -				(unsigned)(rdev->mc.mc_vram_size >> 20),
> -				(unsigned)(rdev->mc.aper_size >> 20));
> -		DRM_INFO("RAM width %dbits %cDR\n",
> -				rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
>  		/* Initialize memory controller (also test AGP) */
>  		r = radeon_mc_init(rdev);
>  		if (r) {
> diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
> index b85fb83..0100b3b 100644
> --- a/drivers/gpu/drm/radeon/radeon_object.c
> +++ b/drivers/gpu/drm/radeon/radeon_object.c
> @@ -369,6 +369,13 @@ void radeon_object_force_delete(struct radeon_device *rdev)
>  
>  int radeon_object_init(struct radeon_device *rdev)
>  {
> +	/* Add an MTRR for the VRAM */
> +	rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
> +			MTRR_TYPE_WRCOMB, 1);
> +	PINF("Detected VRAM RAM=%lluM, BAR=%lluM\n",
> +		rdev->mc.mc_vram_size >> 20, rdev->mc.aper_size >> 20);
> +	PINF("RAM width %dbits %cDR\n",
> +			rdev->mc.vram_width, rdev->mc.vram_is_ddr ? 'D' : 'S');
>  	return radeon_ttm_init(rdev);
>  }
>  
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/