drm/i915: Catch abuse of I915_EXEC_GEN7_SOL_RESET

Currently we catch it, but silently succeed. Our userspace is
better than this.

v2: Add DRM_DEBUG (Chris)

Testcase: igt/gem_exec_params/sol-reset-*
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 0ec8621eb4f8..04102cc80ef4 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -981,8 +981,10 @@ i915_reset_gen7_sol_offsets(struct drm_device *dev,
         struct drm_i915_private *dev_priv = dev->dev_private;
         int ret, i;
 
-        if (!IS_GEN7(dev) || ring != &dev_priv->ring[RCS])
-                return 0;
+        if (!IS_GEN7(dev) || ring != &dev_priv->ring[RCS]) {
+                DRM_DEBUG("sol reset is gen7/rcs only\n");
+                return -EINVAL;
+        }
 
         ret = intel_ring_begin(ring, 4 * 3);
         if (ret)