[Intel-gfx] [PATCH 2/6] drm/i915: Don't warn if the workaround list is empty.

Daniel Vetter daniel at ffwll.ch
Wed Oct 7 07:37:40 PDT 2015


On Wed, Oct 07, 2015 at 02:44:01PM +0300, Francisco Jerez wrote:
> It's not an error for the workaround list to be empty if no
> workarounds are needed.  This will avoid spamming the logs
> unnecessarily on Gen6 after the workaround list is hooked up on
> pre-Gen8 hardware by the following commits.
> 
> Signed-off-by: Francisco Jerez <currojerez at riseup.net>

I think the idea of this was to not forget this when bringing up new
platforms. I think we wrestle workarounds often enough to have a low risk
for that ;-)

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 54ca344..3373516 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -717,7 +717,7 @@ static int intel_ring_workarounds_emit(struct drm_i915_gem_request *req)
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct i915_workarounds *w = &dev_priv->workarounds;
>  
> -	if (WARN_ON_ONCE(w->count == 0))
> +	if (w->count == 0)
>  		return 0;
>  
>  	ring->gpu_caches_dirty = true;
> -- 
> 2.5.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the Intel-gfx mailing list