]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 12 May 2025 19:22:15 +0000 (21:22 +0200)
committerJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Tue, 27 May 2025 13:40:50 +0000 (16:40 +0300)
The intel-media-driver is currently broken on DG1 because
it uses EXEC_CAPTURE with recovarable contexts. Relax the
check to allow that.

I've also submitted a fix for the intel-media-driver:
https://github.com/intel/media-driver/pull/1920

Cc: stable@vger.kernel.org # v6.0+
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Testcase: igt/gem_exec_capture/capture-invisible
Fixes: 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts")
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20250411144313.11660-2-ville.syrjala@linux.intel.com
(cherry picked from commit d6e020819612a4a06207af858e0978be4d3e3140)
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

index ca7e9216934a7d89f9f2b5ab3bfa445b75cffc84..ea9d5063ce78c711487f216fce2b0b61f904443a 100644 (file)
@@ -2013,7 +2013,7 @@ static int eb_capture_stage(struct i915_execbuffer *eb)
                        continue;
 
                if (i915_gem_context_is_recoverable(eb->gem_context) &&
-                   (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0)))
+                   GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10))
                        return -EINVAL;
 
                for_each_batch_create_order(eb, j) {