Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d662da8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 48e48a0b

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -981,8 +981,10 @@ i915_reset_gen7_sol_offsets(struct drm_device *dev, 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret, i;

	int ret, i;





	if (!IS_GEN7(dev) || ring != &dev_priv->ring[RCS])

	if (!IS_GEN7(dev) || ring != &dev_priv->ring[RCS]) {

		return 0;

		DRM_DEBUG("sol reset is gen7/rcs only\n");

		return -EINVAL;

	}





	ret = intel_ring_begin(ring, 4 * 3);

	ret = intel_ring_begin(ring, 4 * 3);

	if (ret)

	if (ret)