Skip to content

Commit df36c51

Browse files
vsyrjalaSasha Levin
authored andcommitted
drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1
[ Upstream commit 25eeba4 ] 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: intel/media-driver#1920 Cc: [email protected] # v6.0+ Cc: Matthew Auld <[email protected]> Cc: Thomas Hellström <[email protected]> Testcase: igt/gem_exec_capture/capture-invisible Fixes: 71b1669 ("drm/i915/uapi: tweak error capture on recoverable contexts") Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit d6e020819612a4a06207af858e0978be4d3e3140) Signed-off-by: Joonas Lahtinen <[email protected]> Stable-dep-of: ed5915c ("Revert "drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1"") Signed-off-by: Sasha Levin <[email protected]>
1 parent cd55989 commit df36c51

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2014,7 +2014,7 @@ static int eb_capture_stage(struct i915_execbuffer *eb)
20142014
continue;
20152015

20162016
if (i915_gem_context_is_recoverable(eb->gem_context) &&
2017-
(IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0)))
2017+
GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10))
20182018
return -EINVAL;
20192019

20202020
for_each_batch_create_order(eb, j) {

0 commit comments

Comments
 (0)