]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: Don't warn if the workaround list is empty part 2.
authorBoyer, Wayne <wayne.boyer@intel.com>
Thu, 7 Jan 2016 01:15:29 +0000 (17:15 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Fri, 8 Jan 2016 18:14:30 +0000 (10:14 -0800)
Extend the same reasoning as in the patch listed below.  It's not an
error for the workaround list to be empty if no workarounds are needed.

    commit 02235808b61cd9382d224b0df263193006dd9913
    Author: Francisco Jerez <currojerez@riseup.net>
    Date:   Wed Oct 7 14:44:01 2015 +0300
        drm/i915: Don't warn if the workaround list is empty.

Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1452129330-3484-2-git-send-email-rodrigo.vivi@intel.com
drivers/gpu/drm/i915/intel_lrc.c

index 23839ff04e277b5ff55d045f811a1f981604afcb..f7fac5f3b5ce577869819dcbfd7dab28889fd023 100644 (file)
@@ -1116,7 +1116,7 @@ static int intel_logical_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;