The move to softpin in igt is ongoing and should land soon. Meanwhile, like was done for ADL and RKL, add an exception to allow running the igt display tests before that conversion is complete so we can unblock CI.
Cc: Zbigniew Kempczynski zbigniew.kempczynski@intel.com Cc: Dave Airlie airlied@redhat.com Cc: Daniel Vetter daniel.vetter@intel.com Cc: Jason Ekstrand jason@jlekstrand.net Cc: Rodrigo Vivi rodrigo.vivi@intel.com Signed-off-by: Lucas De Marchi lucas.demarchi@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 f8f07d0bd83b..85f4808957b9 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -504,7 +504,7 @@ static bool platform_has_relocs_enabled(const struct i915_execbuffer *eb) */ if (GRAPHICS_VER(eb->i915) < 12 || IS_TIGERLAKE(eb->i915) || IS_ROCKETLAKE(eb->i915) || IS_ALDERLAKE_S(eb->i915) || - IS_ALDERLAKE_P(eb->i915)) + IS_ALDERLAKE_P(eb->i915) || IS_DG2(eb->i915)) return true;
return false;
On Fri, 18 Feb 2022 14:38:53 -0800, Lucas De Marchi wrote:
One example failure we see on DG2 if we don't do this (reported by Lucas):
IGT-Version: 1.26-g9cb64a75 (x86_64) (Linux: 5.17.0-rc4-demarchi+ x86_64) (testdisplay:10068) ioctl_wrappers-CRITICAL: Test assertion failure function gem_execbuf, file ../lib/ioctl_wrappers.c:674: (testdisplay:10068) ioctl_wrappers-CRITICAL: Failed assertion: __gem_execbuf(fd, execbuf) == 0 (testdisplay:10068) ioctl_wrappers-CRITICAL: error: -22 != 0 Stack trace: #0 ../lib/igt_core.c:1754 __igt_fail_assert() #1 [gem_execbuf+0x48] #2 ../lib/intel_batchbuffer.c:1053 igt_blitter_fast_copy__raw() #3 ../lib/igt_fb.c:2497 blitcopy() #4 ../lib/igt_fb.c:2646 setup_linear_mapping() #5 ../lib/igt_fb.c:2671 create_cairo_surface__gpu() #6 ../lib/igt_fb.c:3959 igt_get_cairo_surface() #7 ../lib/igt_fb.c:3987 igt_get_cairo_ctx() #8 ../lib/igt_fb.c:1980 igt_create_pattern_fb() #9 ../tests/testdisplay.c:271 set_mode() #10 ../tests/testdisplay.c:511 update_display() #11 ../tests/testdisplay.c:763 main() #12 ../csu/libc-start.c:342 __libc_start_main() #13 [_start+0x2e] Test testdisplay failed
dri-devel@lists.freedesktop.org
-
Dixit, Ashutosh -
Lucas De Marchi