[PATCH] drm/ci: Uprev IGT to pull in fixes

Rob Clark robdclark at gmail.com
Wed Sep 20 11:05:00 PDT 2023 

From: Rob Clark <robdclark at chromium.org>

There have been a few igt test fixes compared to the commit that we were
currently using.  Pull in a newer igt and update expectations.

Signed-off-by: Rob Clark <robdclark at chromium.org>
---
 drivers/gpu/drm/ci/gitlab-ci.yml               |  2 +-
 .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt  |  4 ++--
 drivers/gpu/drm/ci/xfails/i915-apl-fails.txt   | 11 -----------
 drivers/gpu/drm/ci/xfails/i915-cml-fails.txt   |  2 +-
 drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt   |  1 -
 drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt | 18 +-----------------
 .../drm/ci/xfails/rockchip-rk3288-fails.txt    |  2 ++
 7 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 2c4df53f5dfe..3ecb5879e80f 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
   UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
   TARGET_BRANCH: drm-next
 
-  IGT_VERSION: 471bfababd070e1dac0ebb87470ac4f2ae85e663
+  IGT_VERSION: 2517e42d612e0c1ca096acf8b5f6177f7ef4bce7
 
   DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git
   DEQP_RUNNER_GIT_TAG: v0.15.0
diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
index bd9392536e7c..bab21930a0d4 100644
--- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
@@ -1,7 +1,6 @@
 kms_addfb_basic at bad-pitch-65536,Fail
 kms_addfb_basic at bo-too-small,Fail
 kms_async_flips at invalid-async-flip,Fail
-kms_atomic at plane-immutable-zpos,Fail
 kms_atomic_transition at plane-toggle-modeset-transition,Fail
 kms_bw at linear-tiling-1-displays-2560x1440p,Fail
 kms_bw at linear-tiling-1-displays-3840x2160p,Fail
@@ -11,9 +10,10 @@ kms_color at degamma,Fail
 kms_cursor_crc at cursor-size-change,Fail
 kms_cursor_crc at pipe-A-cursor-size-change,Fail
 kms_cursor_crc at pipe-B-cursor-size-change,Fail
-kms_cursor_legacy at forked-move,Fail
 kms_hdr at bpc-switch,Fail
 kms_hdr at bpc-switch-dpms,Fail
 kms_plane_multiple at atomic-pipe-A-tiling-none,Fail
 kms_rmfb at close-fd,Fail
 kms_rotation_crc at primary-rotation-180,Fail
+kms_flip at flip-vs-modeset-vs-hang,Fail
+kms_flip at flip-vs-panning-vs-hang,Fail
diff --git a/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt b/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
index 46397ce38d5a..2e3b7c5dac3c 100644
--- a/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/i915-apl-fails.txt
@@ -8,13 +8,6 @@ kms_bw at linear-tiling-3-displays-3840x2160p,Fail
 kms_bw at linear-tiling-4-displays-1920x1080p,Fail
 kms_bw at linear-tiling-4-displays-2560x1440p,Fail
 kms_bw at linear-tiling-4-displays-3840x2160p,Fail
-kms_color at ctm-0-25,Fail
-kms_color at ctm-0-50,Fail
-kms_color at ctm-0-75,Fail
-kms_color at ctm-max,Fail
-kms_color at ctm-negative,Fail
-kms_color at ctm-red-to-blue,Fail
-kms_color at ctm-signed,Fail
 kms_flip_scaled_crc at flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
 kms_flip_scaled_crc at flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
 kms_flip_scaled_crc at flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
@@ -38,8 +31,6 @@ kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilegen12rcccs-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling,Fail
-kms_hdmi_inject at inject-4k,Timeout
-kms_plane at plane-position-hole,Timeout
 kms_plane_alpha_blend at alpha-basic,Fail
 kms_plane_alpha_blend at alpha-opaque-fb,Fail
 kms_plane_alpha_blend at alpha-transparent-fb,Fail
@@ -53,6 +44,4 @@ kms_plane_alpha_blend at pipe-B-constant-alpha-max,Fail
 kms_plane_alpha_blend at pipe-C-alpha-opaque-fb,Fail
 kms_plane_alpha_blend at pipe-C-alpha-transparent-fb,Fail
 kms_plane_alpha_blend at pipe-C-constant-alpha-max,Fail
-kms_plane_multiple at tiling-y,Timeout
-kms_pwrite_crc,Timeout
 kms_sysfs_edid_timing,Fail
diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
index 6139b410e767..13c0a25fc627 100644
--- a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
@@ -1,4 +1,3 @@
-kms_color at ctm-0-25,Fail
 kms_flip_scaled_crc at flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
 kms_flip_scaled_crc at flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
 kms_flip_scaled_crc at flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
@@ -16,3 +15,4 @@ kms_plane_alpha_blend at alpha-basic,Fail
 kms_plane_alpha_blend at alpha-opaque-fb,Fail
 kms_plane_alpha_blend at alpha-transparent-fb,Fail
 kms_plane_alpha_blend at constant-alpha-max,Fail
+kms_async_flips at crc,Fail
diff --git a/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt b/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
index a6da5544e198..27bfca1c6f2c 100644
--- a/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt
@@ -8,7 +8,6 @@ kms_bw at linear-tiling-4-displays-3840x2160p,Fail
 kms_bw at linear-tiling-5-displays-1920x1080p,Fail
 kms_bw at linear-tiling-5-displays-2560x1440p,Fail
 kms_bw at linear-tiling-5-displays-3840x2160p,Fail
-kms_color at ctm-0-25,Fail
 kms_flip at flip-vs-panning-vs-hang,Timeout
 kms_flip_scaled_crc at flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
 kms_flip_scaled_crc at flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
index 410e0eeb3161..e59a2fddfde0 100644
--- a/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
@@ -4,20 +4,4 @@
 # Test incorrectly assumes that CTM support implies gamma/degamma
 # LUT support.  None of the subtests handle the case of only having
 # CTM support
-kms_color.*
-
-# 4k at 60 is not supported on this hw, but driver doesn't handle it
-# too gracefully.. https://gitlab.freedesktop.org/drm/msm/-/issues/15
-kms_bw at linear-tiling-.*-displays-3840x2160p
-
-# Until igt fix lands: https://patchwork.freedesktop.org/patch/493175/
-kms_bw at linear-tiling-2.*
-kms_bw at linear-tiling-3.*
-kms_bw at linear-tiling-4.*
-kms_bw at linear-tiling-5.*
-kms_bw at linear-tiling-6.*
-
-# igt fix posted: https://patchwork.freedesktop.org/patch/499926/
-# failure mode is flakey due to randomization but fails frequently
-# enough to be detected as a Crash or occasionally UnexpectedPass.
-kms_plane_multiple at atomic-pipe-A-tiling-none
+#kms_color.*
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
index 2a1baa948e12..15ac861a58bf 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
@@ -46,3 +46,5 @@ kms_properties at connector-properties-legacy,Crash
 kms_properties at get_properties-sanity-atomic,Crash
 kms_properties at get_properties-sanity-non-atomic,Crash
 kms_setmode at invalid-clone-single-crtc,Crash
+kms_flip at flip-vs-modeset-vs-hang,Crash
+kms_flip at flip-vs-panning-vs-hang,Crash
-- 
2.41.0

More information about the Linux-rockchip mailing list