[PATCH] Revert "drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1"

[Joonas Lahtinen]

Quoting Joonas Lahtinen (2025-05-22 09:41:27)
> This reverts commit d6e020819612a4a06207af858e0978be4d3e3140.
> 
> The IS_DGFX check was put in place because error capture of buffer
> objects is expected to be broken on devices with VRAM.
> 
> We seem to have already submitted the userspace fix to remove that
> flag, so lets just rely on that for DG1.

Further, it seems that the userspace fix[1] has already been pushed and
released as part of media-driver 25.2.3, so really no reason to unblock
the broken codepath.

[1] https://github.com/intel/media-driver/commit/93c07d9b4b96a78bab21f6acd4eb863f4313ea4a

Regards, Joonas

> 
> Cc: stable at vger.kernel.org # v6.0+
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Andi Shyti <andi.shyti at linux.intel.com>
> Cc: Matthew Auld <matthew.auld at intel.com>
> Cc: Thomas Hellström <thomas.hellstrom at linux.intel.com>
> Cc: Tvrtko Ursulin <tursulin at ursulin.net>
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> index 7d44aadcd5a5..02c59808cbe4 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> @@ -2013,7 +2013,7 @@ static int eb_capture_stage(struct i915_execbuffer *eb)
>                         continue;
>  
>                 if (i915_gem_context_is_recoverable(eb->gem_context) &&
> -                   GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 10))
> +                   (IS_DGFX(eb->i915) || GRAPHICS_VER_FULL(eb->i915) > IP_VER(12, 0)))
>                         return -EINVAL;
>  
>                 for_each_batch_create_order(eb, j) {
> -- 
> 2.49.0
>