[Intel-gfx] [PATCH 2/3] drm/i915: tune down user-triggerable dmesg noise in the cursor/overlay code

[Damien Lespiau]

On Fri, Feb 14, 2014 at 02:06:06PM +0100, Daniel Vetter wrote:
> Spotted while auditing the code for fencing issues.
> 
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>

-- 
Damien

> ---
>  drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
>  drivers/gpu/drm/i915/intel_overlay.c |  2 +-
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ac05da4cc188..8f54e779f09a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -7549,7 +7549,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
>  		return -ENOENT;
>  
>  	if (obj->base.size < width * height * 4) {
> -		DRM_ERROR("buffer is to small\n");
> +		DRM_DEBUG_KMS("buffer is to small\n");
>  		ret = -ENOMEM;
>  		goto fail;
>  	}
> @@ -7560,7 +7560,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
>  		unsigned alignment;
>  
>  		if (obj->tiling_mode) {
> -			DRM_ERROR("cursor cannot be tiled\n");
> +			DRM_DEBUG_KMS("cursor cannot be tiled\n");
>  			ret = -EINVAL;
>  			goto fail_locked;
>  		}
> @@ -7576,13 +7576,13 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
>  
>  		ret = i915_gem_object_pin_to_display_plane(obj, alignment, NULL);
>  		if (ret) {
> -			DRM_ERROR("failed to move cursor bo into the GTT\n");
> +			DRM_DEBUG_KMS("failed to move cursor bo into the GTT\n");
>  			goto fail_locked;
>  		}
>  
>  		ret = i915_gem_object_put_fence(obj);
>  		if (ret) {
> -			DRM_ERROR("failed to release fence for cursor");
> +			DRM_DEBUG_KMS("failed to release fence for cursor");
>  			goto fail_unpin;
>  		}
>  
> @@ -7593,7 +7593,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
>  						  (intel_crtc->pipe == 0) ? I915_GEM_PHYS_CURSOR_0 : I915_GEM_PHYS_CURSOR_1,
>  						  align);
>  		if (ret) {
> -			DRM_ERROR("failed to attach phys object\n");
> +			DRM_DEBUG_KMS("failed to attach phys object\n");
>  			goto fail_locked;
>  		}
>  		addr = obj->phys_obj->handle->busaddr;
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index ac519cb46f22..312961a8472e 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -1076,7 +1076,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
>  	mutex_lock(&dev->struct_mutex);
>  
>  	if (new_bo->tiling_mode) {
> -		DRM_ERROR("buffer used for overlay image can not be tiled\n");
> +		DRM_DEBUG_KMS("buffer used for overlay image can not be tiled\n");
>  		ret = -EINVAL;
>  		goto out_unlock;
>  	}
> -- 
> 1.8.5.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx