Skip to content

Commit ed5915c

Browse files
Revert "drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1"
This reverts commit d6e0208. The IS_DGFX check was put in place because error capture of buffer objects is expected to be broken on devices with VRAM. Userspace fix[1] to the impacted media driver has been submitted, merged and a new driver release is out as 25.2.3 where the capture flag is dropped on DG1 thus unblocking the usage of media driver on DG1. [1] intel/media-driver@93c07d9 Cc: [email protected] # v6.0+ Cc: Ville Syrjälä <[email protected]> Cc: Andi Shyti <[email protected]> Cc: Matthew Auld <[email protected]> Cc: Thomas Hellström <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Acked-by: Tvrtko Ursulin <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Link: https://lore.kernel.org/r/[email protected] [Joonas: Update message to point out the merged userspace fix] Signed-off-by: Joonas Lahtinen <[email protected]> (cherry picked from commit d2dc30e) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent 25eeba4 commit ed5915c

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
@@ -2013,7 +2013,7 @@ static int eb_capture_stage(struct i915_execbuffer *eb)
20132013
continue;
20142014

20152015
if (i915_gem_context_is_recoverable(eb->gem_context) &&
2016-
GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10))
2016+
(IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0)))
20172017
return -EINVAL;
20182018

20192019
for_each_batch_create_order(eb, j) {

0 commit comments

Comments
 (0)