[PATCH 3/4] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1

[PATCH 3/4] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1

[Ville Syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

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
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Fixes: 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts")
Signed-off-by: Ville Syrjälä <ville.syrjala@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 ca7e9216934a..ea9d5063ce78 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) &&
-		    (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) {
-- 
2.45.3

Re: [PATCH 3/4] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1

[Andi Shyti]

Hi Ville,

On Tue, Apr 01, 2025 at 07:37:51PM +0300, Ville Syrjala wrote:
> 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

...

>  		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))

How is this is more relaxed than the old version?

Andi

Re: [PATCH 3/4] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1

[Ville Syrjälä]

On Tue, Apr 01, 2025 at 07:34:11PM +0200, Andi Shyti wrote:
> Hi Ville,
> 
> On Tue, Apr 01, 2025 at 07:37:51PM +0300, Ville Syrjala wrote:
> > 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
> 
> ...
> 
> >  		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))
> 
> How is this is more relaxed than the old version?

It doesn't trip on DG1 (ip ver == 12.10)

-- 
Ville Syrjälä
Intel

Re: [PATCH 3/4] drm/i915/gem: Allow EXEC_CAPTURE on recoverable contexts on DG1

[Andi Shyti]

Hi Ville,

> >  		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))
> 
> How is this is more relaxed than the old version?

nevermind...

Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>

Thanks,
Andi