On 22/05/2025 07:41, Joonas Lahtinen wrote:
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.
I don't quite remember the history and it is a pity 71b1669ea9bd ("drm/i915/uapi: tweak error capture on recoverable contexts") did not spell that out but almost made it sound like uapi disablement for some reason. But if there is an userspace fix, and you say VRAM capture is broken then that's fine by me.
Acked-by: Tvrtko Ursulin <tvrtko.ursu...@igalia.com> Regards, Tvrtko
We seem to have already submitted the userspace fix to remove that flag, so lets just rely on that for DG1. Cc: sta...@vger.kernel.org # v6.0+ Cc: Ville Syrjälä <ville.syrj...@linux.intel.com> Cc: Andi Shyti <andi.sh...@linux.intel.com> Cc: Matthew Auld <matthew.a...@intel.com> Cc: Thomas Hellström <thomas.hellst...@linux.intel.com> Cc: Tvrtko Ursulin <tursu...@ursulin.net> Signed-off-by: Joonas Lahtinen <joonas.lahti...@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) {
