[PATCH v2 5/9] drm/ci: clean up xfails (specially flakes list)

[Helen Koike]

Since the script that collected the list of the expectation files was
bogus and placing test to the flakes list incorrectly, restart the
expectation files with the correct script.

This reduces a lot the number of tests in the flakes list.

Signed-off-by: Helen Koike <helen.koike at collabora.com>
Reviewed-by: David Heidelberg <david.heidelberg at collabora.com>

---

v2:
- fix typo in the commit message
- re-add kms_cursor_legacy at flip-vs-cursor-toggle back to msm-sdm845-flakes.txt
- removed kms_async_flips at crc,Fail from i915-cml-fails.txt
---
 .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 13 ++++--
 .../drm/ci/xfails/amdgpu-stoney-flakes.txt    | 20 ---------
 drivers/gpu/drm/ci/xfails/i915-amly-fails.txt |  9 ++++
 .../gpu/drm/ci/xfails/i915-amly-flakes.txt    | 32 ---------------
 drivers/gpu/drm/ci/xfails/i915-apl-fails.txt  | 11 -----
 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt |  1 -
 drivers/gpu/drm/ci/xfails/i915-cml-fails.txt  | 14 ++++++-
 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 38 -----------------
 drivers/gpu/drm/ci/xfails/i915-glk-fails.txt  | 17 ++++++++
 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 41 -------------------
 drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt  |  7 ++++
 drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 26 ------------
 drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt  |  1 -
 drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt |  5 ---
 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt |  1 -
 .../drm/ci/xfails/mediatek-mt8173-flakes.txt  |  0
 .../drm/ci/xfails/mediatek-mt8183-fails.txt   |  5 ++-
 .../drm/ci/xfails/mediatek-mt8183-flakes.txt  | 14 -------
 .../gpu/drm/ci/xfails/meson-g12b-fails.txt    | 14 ++++---
 .../gpu/drm/ci/xfails/meson-g12b-flakes.txt   |  4 --
 .../gpu/drm/ci/xfails/msm-apq8016-flakes.txt  |  4 --
 .../gpu/drm/ci/xfails/msm-apq8096-fails.txt   |  2 +
 .../gpu/drm/ci/xfails/msm-apq8096-flakes.txt  |  4 --
 .../gpu/drm/ci/xfails/msm-sc7180-fails.txt    | 15 ++++---
 .../gpu/drm/ci/xfails/msm-sc7180-flakes.txt   | 24 +++++++----
 .../gpu/drm/ci/xfails/msm-sc7180-skips.txt    | 18 +-------
 .../gpu/drm/ci/xfails/msm-sdm845-fails.txt    |  9 +---
 .../gpu/drm/ci/xfails/msm-sdm845-flakes.txt   | 19 +++++----
 .../drm/ci/xfails/rockchip-rk3288-fails.txt   |  6 +++
 .../drm/ci/xfails/rockchip-rk3288-flakes.txt  |  9 ----
 .../drm/ci/xfails/rockchip-rk3399-fails.txt   | 40 +++++++++++++++++-
 .../drm/ci/xfails/rockchip-rk3399-flakes.txt  | 28 +++----------
 .../drm/ci/xfails/virtio_gpu-none-flakes.txt  |  0
 33 files changed, 162 insertions(+), 289 deletions(-)
 delete mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
 delete mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt

diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
index bd9392536e7c..aa57aaa8869b 100644
--- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt
@@ -1,8 +1,14 @@
 kms_addfb_basic at bad-pitch-65536,Fail
 kms_addfb_basic at bo-too-small,Fail
+kms_addfb_basic at too-high,Fail
+kms_async_flips at async-flip-with-page-flip-events,Fail
+kms_async_flips at crc,Fail
 kms_async_flips at invalid-async-flip,Fail
-kms_atomic at plane-immutable-zpos,Fail
+kms_atomic_transition at plane-all-modeset-transition-internal-panels,Fail
+kms_atomic_transition at plane-all-transition,Fail
+kms_atomic_transition at plane-all-transition-nonblocking,Fail
 kms_atomic_transition at plane-toggle-modeset-transition,Fail
+kms_atomic_transition at plane-use-after-nonblocking-unbind,Fail
 kms_bw at linear-tiling-1-displays-2560x1440p,Fail
 kms_bw at linear-tiling-1-displays-3840x2160p,Fail
 kms_bw at linear-tiling-2-displays-3840x2160p,Fail
@@ -11,9 +17,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_flip at flip-vs-modeset-vs-hang,Fail
+kms_flip at flip-vs-panning-vs-hang,Fail
 kms_hdr at bpc-switch,Fail
 kms_hdr at bpc-switch-dpms,Fail
+kms_plane at pixel-format,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
diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt
index f8defa0f9e67..6faf75e667d3 100644
--- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt
+++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt
@@ -1,21 +1 @@
-kms_addfb_basic at too-high
-kms_async_flips at alternate-sync-async-flip
 kms_async_flips at async-flip-with-page-flip-events
-kms_async_flips at crc
-kms_async_flips at test-cursor
-kms_async_flips at test-time-stamp
-kms_atomic_transition at plane-all-modeset-transition-internal-panels
-kms_atomic_transition at plane-all-transition
-kms_atomic_transition at plane-use-after-nonblocking-unbind
-kms_bw at linear-tiling-1-displays-1920x1080p
-kms_bw at linear-tiling-2-displays-1920x1080p
-kms_bw at linear-tiling-2-displays-2560x1440p
-kms_bw at linear-tiling-3-displays-2560x1440p
-kms_bw at linear-tiling-3-displays-3840x2160p
-kms_cursor_crc at pipe-A-cursor-alpha-opaque
-kms_cursor_crc at pipe-B-cursor-alpha-opaque
-kms_plane at pixel-format
-kms_plane_multiple at atomic-pipe-B-tiling-none
-kms_plane_scaling at downscale-with-rotation-factor-0-5
-kms_universal_plane at disable-primary-vs-flip-pipe-A
-kms_universal_plane at disable-primary-vs-flip-pipe-B
diff --git a/drivers/gpu/drm/ci/xfails/i915-amly-fails.txt b/drivers/gpu/drm/ci/xfails/i915-amly-fails.txt
index 5f513c638beb..59438e4df86e 100644
--- a/drivers/gpu/drm/ci/xfails/i915-amly-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/i915-amly-fails.txt
@@ -2,6 +2,10 @@ 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
 kms_flip_scaled_crc at flip-32bpp-xtile-to-64bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-32bpp-linear-downscaling,Fail
@@ -10,7 +14,12 @@ kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-downscaling,Fail
+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_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
diff --git a/drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt
deleted file mode 100644
index d5000515a315..000000000000
--- a/drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-kms_bw at linear-tiling-2-displays-1920x1080p
-kms_bw at linear-tiling-2-displays-2560x1440p
-kms_bw at linear-tiling-2-displays-3840x2160p
-kms_bw at linear-tiling-3-displays-1920x1080p
-kms_bw at linear-tiling-3-displays-2560x1440p
-kms_bw at linear-tiling-3-displays-3840x2160p
-kms_bw at linear-tiling-4-displays-1920x1080p
-kms_bw at linear-tiling-4-displays-2560x1440p
-kms_bw at linear-tiling-4-displays-3840x2160p
-kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling
-kms_plane_alpha_blend at pipe-A-alpha-basic
-kms_plane_alpha_blend at pipe-A-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-A-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-A-constant-alpha-max
-kms_plane_alpha_blend at pipe-B-alpha-basic
-kms_plane_alpha_blend at pipe-B-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-B-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-B-constant-alpha-max
-kms_plane_alpha_blend at pipe-C-alpha-basic
-kms_plane_alpha_blend at pipe-C-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-C-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-C-constant-alpha-max
-kms_sysfs_edid_timing
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-apl-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt
deleted file mode 100644
index 331c5841bb41..000000000000
--- a/drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt
+++ /dev/null
@@ -1 +0,0 @@
-kms_frontbuffer_tracking at fbc-tiling-linear
diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
index 6139b410e767..240ef8467c26 100644
--- a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt
@@ -1,8 +1,11 @@
-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
 kms_flip_scaled_crc at flip-32bpp-xtile-to-64bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-32bpp-linear-downscaling,Fail
@@ -11,8 +14,17 @@ kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-downscaling,Fail
+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_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_plane_alpha_blend at constant-alpha-min,Fail
+kms_psr2_su at page_flip-NV12,Fail
+kms_psr2_su at page_flip-P010,Fail
+kms_setmode at basic,Fail
diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt
deleted file mode 100644
index 0514a7b3fdb0..000000000000
--- a/drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-kms_bw at linear-tiling-2-displays-1920x1080p
-kms_bw at linear-tiling-2-displays-2560x1440p
-kms_bw at linear-tiling-2-displays-3840x2160p
-kms_bw at linear-tiling-3-displays-1920x1080p
-kms_bw at linear-tiling-3-displays-2560x1440p
-kms_bw at linear-tiling-3-displays-3840x2160p
-kms_bw at linear-tiling-4-displays-1920x1080p
-kms_bw at linear-tiling-4-displays-2560x1440p
-kms_bw at linear-tiling-4-displays-3840x2160p
-kms_draw_crc at draw-method-xrgb8888-render-xtiled
-kms_flip at flip-vs-suspend
-kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling
-kms_hdr at bpc-switch-suspend
-kms_plane_alpha_blend at constant-alpha-min
-kms_plane_alpha_blend at pipe-A-alpha-basic
-kms_plane_alpha_blend at pipe-A-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-A-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-A-constant-alpha-max
-kms_plane_alpha_blend at pipe-B-alpha-basic
-kms_plane_alpha_blend at pipe-B-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-B-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-B-constant-alpha-max
-kms_plane_alpha_blend at pipe-C-alpha-basic
-kms_plane_alpha_blend at pipe-C-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-C-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-C-constant-alpha-max
-kms_psr2_su at page_flip-NV12
-kms_psr2_su at page_flip-P010
-kms_setmode at basic
diff --git a/drivers/gpu/drm/ci/xfails/i915-glk-fails.txt b/drivers/gpu/drm/ci/xfails/i915-glk-fails.txt
index 5bd432e78129..4596055d7e5e 100644
--- a/drivers/gpu/drm/ci/xfails/i915-glk-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/i915-glk-fails.txt
@@ -1,8 +1,15 @@
 kms_fbcon_fbt at fbc,Fail
+kms_flip at blocking-wf_vblank,Fail
+kms_flip at wf_vblank-ts-check,Fail
+kms_flip at wf_vblank-ts-check-interruptible,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
 kms_flip_scaled_crc at flip-32bpp-xtile-to-64bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-32bpp-linear-downscaling,Fail
@@ -11,9 +18,19 @@ kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-downscaling,Fail
+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_frontbuffer_tracking at fbc-tiling-linear,Fail
 kms_frontbuffer_tracking at fbcdrrs-tiling-linear,Fail
 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_rotation_crc at multiplane-rotation,Fail
+kms_rotation_crc at multiplane-rotation-cropping-bottom,Fail
+kms_rotation_crc at multiplane-rotation-cropping-top,Fail
+kms_setmode at basic,Fail
diff --git a/drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt
deleted file mode 100644
index fc41d13a2d56..000000000000
--- a/drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-kms_bw at linear-tiling-1-displays-3840x2160p
-kms_bw at linear-tiling-2-displays-1920x1080p
-kms_bw at linear-tiling-2-displays-2560x1440p
-kms_bw at linear-tiling-2-displays-3840x2160p
-kms_bw at linear-tiling-3-displays-1920x1080p
-kms_bw at linear-tiling-3-displays-2560x1440p
-kms_bw at linear-tiling-3-displays-3840x2160p
-kms_bw at linear-tiling-4-displays-1920x1080p
-kms_bw at linear-tiling-4-displays-2560x1440p
-kms_bw at linear-tiling-4-displays-3840x2160p
-kms_flip at blocking-wf_vblank
-kms_flip at wf_vblank-ts-check
-kms_flip at wf_vblank-ts-check-interruptible
-kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-upscaling
-kms_frontbuffer_tracking at fbc-tiling-linear
-kms_plane_alpha_blend at pipe-A-alpha-basic
-kms_plane_alpha_blend at pipe-A-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-A-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-A-constant-alpha-max
-kms_plane_alpha_blend at pipe-B-alpha-basic
-kms_plane_alpha_blend at pipe-B-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-B-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-B-constant-alpha-max
-kms_plane_alpha_blend at pipe-C-alpha-basic
-kms_plane_alpha_blend at pipe-C-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-C-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-C-constant-alpha-max
-kms_prop_blob at invalid-set-prop-any
-kms_rotation_crc at multiplane-rotation
-kms_rotation_crc at multiplane-rotation-cropping-bottom
-kms_rotation_crc at multiplane-rotation-cropping-top
-kms_setmode at basic
diff --git a/drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt b/drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt
index 56ec021a7679..dab202716909 100644
--- a/drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt
@@ -4,7 +4,10 @@ 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
 kms_flip_scaled_crc at flip-32bpp-xtile-to-64bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling,Fail
 kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-upscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-16bpp-linear-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-linear-to-32bpp-linear-downscaling,Fail
@@ -13,8 +16,12 @@ kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-16bpp-xtile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-downscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-xtile-to-32bpp-xtile-upscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling,Fail
+kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling,Fail
 kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-downscaling,Fail
+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_plane_alpha_blend at alpha-basic,Fail
 kms_plane_alpha_blend at alpha-opaque-fb,Fail
diff --git a/drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt
deleted file mode 100644
index f3ba1c4c5d46..000000000000
--- a/drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-kms_async_flips at crc
-kms_bw at linear-tiling-2-displays-1920x1080p
-kms_bw at linear-tiling-2-displays-3840x2160p
-kms_bw at linear-tiling-3-displays-1920x1080p
-kms_bw at linear-tiling-3-displays-2560x1440p
-kms_bw at linear-tiling-3-displays-3840x2160p
-kms_bw at linear-tiling-4-displays-1920x1080p
-kms_bw at linear-tiling-4-displays-3840x2160p
-kms_color at ctm-0-25
-kms_flip_scaled_crc at flip-32bpp-ytile-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-32bpp-ytileccs-to-64bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-downscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-16bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytile-upscaling
-kms_flip_scaled_crc at flip-64bpp-ytile-to-32bpp-ytilercccs-downscaling
-kms_plane_alpha_blend at pipe-A-alpha-basic
-kms_plane_alpha_blend at pipe-A-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-A-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-B-alpha-basic
-kms_plane_alpha_blend at pipe-B-alpha-transparent-fb
-kms_plane_alpha_blend at pipe-B-constant-alpha-max
-kms_plane_alpha_blend at pipe-C-alpha-basic
-kms_plane_alpha_blend at pipe-C-alpha-opaque-fb
-kms_plane_alpha_blend at pipe-C-alpha-transparent-fb
-kms_sysfs_edid_timing
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/i915-tgl-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt
deleted file mode 100644
index 1cd910ee06df..000000000000
--- a/drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-kms_draw_crc at .*
-kms_flip at blocking-absolute-wf_vblank
-kms_flip at bo-too-big-interruptible
-kms_flip at busy-flip
-kms_flip at flip-vs-rmfb-interruptible
diff --git a/drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt
deleted file mode 100644
index c33202e7e2a1..000000000000
--- a/drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt
+++ /dev/null
@@ -1 +0,0 @@
-kms_flip at flip-vs-suspend
diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
index 6ff81d00e84e..67d690fc4037 100644
--- a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
@@ -6,5 +6,8 @@ kms_bw at linear-tiling-2-displays-3840x2160p,Fail
 kms_bw at linear-tiling-3-displays-2560x1440p,Fail
 kms_bw at linear-tiling-3-displays-3840x2160p,Fail
 kms_color at pipe-A-invalid-gamma-lut-sizes,Fail
+kms_plane_cursor at overlay,Fail
+kms_plane_cursor at primary,Fail
+kms_plane_cursor at viewport,Fail
 kms_plane_scaling at upscale-with-rotation-20x20,Fail
-kms_rmfb at close-fd,Fail
\ No newline at end of file
+kms_rmfb at close-fd,Fail
diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
deleted file mode 100644
index 208890b79eb0..000000000000
--- a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-core_setmaster_vs_auth
-kms_bw at linear-tiling-1-displays-1920x1080p
-kms_bw at linear-tiling-1-displays-3840x2160p
-kms_bw at linear-tiling-3-displays-1920x1080p
-kms_cursor_legacy at cursor-vs-flip-atomic
-kms_plane_scaling at invalid-num-scalers
-kms_plane_scaling at planes-upscale-20x20
-kms_plane_scaling at planes-upscale-20x20-downscale-factor-0-5
-kms_plane_scaling at upscale-with-modifier-20x20
-kms_plane_scaling at upscale-with-pixel-format-20x20
-kms_prop_blob at invalid-set-prop-any
-kms_properties at get_properties-sanity-atomic
-kms_properties at plane-properties-atomic
-kms_properties at plane-properties-legacy
\ No newline at end of file
diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
index 860e702091e2..56a2ae7047b4 100644
--- a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
@@ -1,12 +1,16 @@
 kms_3d,Fail
-kms_properties at connector-properties-atomic,Fail
-kms_properties at get_properties-sanity-atomic,Fail
-kms_properties at get_properties-sanity-non-atomic,Fail
-kms_properties at connector-properties-legacy,Fail
 kms_cursor_legacy at forked-bo,Fail
 kms_cursor_legacy at forked-move,Fail
 kms_cursor_legacy at single-bo,Fail
 kms_cursor_legacy at single-move,Fail
 kms_cursor_legacy at torture-bo,Fail
 kms_cursor_legacy at torture-move,Fail
-kms_hdmi_inject at inject-4k,Fail
\ No newline at end of file
+kms_force_connector_basic at force-edid,Fail
+kms_hdmi_inject at inject-4k,Fail
+kms_plane_cursor at overlay,Fail
+kms_plane_cursor at primary,Fail
+kms_plane_cursor at viewport,Fail
+kms_properties at connector-properties-atomic,Fail
+kms_properties at connector-properties-legacy,Fail
+kms_properties at get_properties-sanity-atomic,Fail
+kms_properties at get_properties-sanity-non-atomic,Fail
diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-flakes.txt b/drivers/gpu/drm/ci/xfails/meson-g12b-flakes.txt
deleted file mode 100644
index b63329d06767..000000000000
--- a/drivers/gpu/drm/ci/xfails/meson-g12b-flakes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-kms_force_connector_basic at force-connector-state
-kms_force_connector_basic at force-edid
-kms_force_connector_basic at force-load-detect
-kms_force_connector_basic at prune-stale-modes
\ No newline at end of file
diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt b/drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt
deleted file mode 100644
index 0e3b60d3fade..000000000000
--- a/drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-kms_force_connector_basic at force-connector-state
-kms_force_connector_basic at force-edid
-kms_force_connector_basic at force-load-detect
-kms_force_connector_basic at prune-stale-modes
diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
index 88a1fc0a3b0d..2cd49e8ee47f 100644
--- a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
@@ -1,2 +1,4 @@
 kms_3d,Fail
 kms_addfb_basic at addfb25-bad-modifier,Fail
+kms_force_connector_basic at force-edid,Fail
+kms_hdmi_inject at inject-4k,Fail
diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt b/drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt
deleted file mode 100644
index 0e3b60d3fade..000000000000
--- a/drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-kms_force_connector_basic at force-connector-state
-kms_force_connector_basic at force-edid
-kms_force_connector_basic at force-load-detect
-kms_force_connector_basic at prune-stale-modes
diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
index 14adeba3b62d..f71166a57731 100644
--- a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
@@ -1,12 +1,17 @@
+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-blue-to-red,Fail
+kms_color at ctm-green-to-red,Fail
+kms_color at ctm-negative,Fail
+kms_color at ctm-red-to-blue,Fail
+kms_color at ctm-signed,Fail
 kms_cursor_legacy at cursor-vs-flip-toggle,Fail
 kms_cursor_legacy at cursor-vs-flip-varying-size,Fail
 kms_cursor_legacy at cursorA-vs-flipA-atomic-transitions,Crash
+kms_flip at flip-vs-modeset-vs-hang,Fail
+kms_flip at flip-vs-panning-vs-hang,Fail
 kms_pipe_crc_basic at compare-crc-sanitycheck-nv12,Fail
-kms_plane at pixel-format,Fail
-kms_plane at pixel-format-source-clamping,Fail
-kms_plane at plane-position-covered,Fail
-kms_plane at plane-position-hole,Fail
-kms_plane at plane-position-hole-dpms,Fail
 kms_plane_alpha_blend at alpha-7efc,Fail
 kms_plane_alpha_blend at coverage-7efc,Fail
 kms_plane_alpha_blend at coverage-vs-premult-vs-constant,Fail
diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
index 636563d3e59a..04730044ed12 100644
--- a/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
@@ -1,7 +1,17 @@
-
-# Test ends up reading CRC from frame before cursor update
-# bug
-# sometimes.. tbd if this is a kernel CRC bug or a test
-kms_cursor_crc at .*
-kms_plane_multiple at atomic-pipe-A-tiling-none
-kms_atomic_transition at modeset-transition-nonblocking-fencing,Fail
\ No newline at end of file
+kms_color at ctm-0-25
+kms_color at ctm-0-50
+kms_color at ctm-0-75
+kms_color at ctm-blue-to-red
+kms_color at ctm-green-to-red
+kms_color at ctm-negative
+kms_color at ctm-red-to-blue
+kms_color at ctm-signed
+kms_flip at flip-vs-modeset-vs-hang
+kms_flip at flip-vs-panning-vs-hang
+kms_plane at pixel-format
+kms_plane at pixel-format-source-clamping
+kms_plane at plane-position-covered
+kms_plane at plane-position-hole
+kms_plane at plane-position-hole-dpms
+kms_writeback at writeback-fb-id
+kms_writeback at writeback-invalid-parameters
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/msm-sdm845-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt
index 09c0c623cd75..c55baa2d18c1 100644
--- a/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt
@@ -15,19 +15,16 @@ kms_color at pipe-A-ctm-max,Fail
 kms_color at pipe-A-ctm-negative,Fail
 kms_color at pipe-A-ctm-red-to-blue,Fail
 kms_color at pipe-A-legacy-gamma,Fail
-kms_cursor_legacy at basic-flip-after-cursor-atomic,Fail
 kms_cursor_legacy at basic-flip-after-cursor-legacy,Fail
 kms_cursor_legacy at basic-flip-after-cursor-varying-size,Fail
 kms_cursor_legacy at basic-flip-before-cursor-atomic,Fail
 kms_cursor_legacy at basic-flip-before-cursor-legacy,Fail
-kms_cursor_legacy at basic-flip-before-cursor-varying-size,Fail
 kms_cursor_legacy at cursor-vs-flip-atomic,Fail
 kms_cursor_legacy at cursor-vs-flip-atomic-transitions,Fail
 kms_cursor_legacy at cursor-vs-flip-atomic-transitions-varying-size,Fail
 kms_cursor_legacy at cursor-vs-flip-legacy,Fail
 kms_cursor_legacy at cursor-vs-flip-toggle,Fail
 kms_cursor_legacy at cursor-vs-flip-varying-size,Fail
-kms_cursor_legacy at cursorA-vs-flipA-toggle,Fail
 kms_cursor_legacy at flip-vs-cursor-atomic,Fail
 kms_cursor_legacy at flip-vs-cursor-crc-atomic,Fail
 kms_cursor_legacy at flip-vs-cursor-crc-legacy,Fail
@@ -35,11 +32,9 @@ kms_cursor_legacy at flip-vs-cursor-legacy,Fail
 kms_cursor_legacy at short-flip-after-cursor-atomic-transitions,Fail
 kms_cursor_legacy at short-flip-after-cursor-atomic-transitions-varying-size,Fail
 kms_cursor_legacy at short-flip-after-cursor-toggle,Fail
-kms_cursor_legacy at short-flip-before-cursor-atomic-transitions,Fail
-kms_cursor_legacy at short-flip-before-cursor-atomic-transitions-varying-size,Fail
+kms_flip at flip-vs-modeset-vs-hang,Fail
+kms_flip at flip-vs-panning-vs-hang,Fail
 kms_pipe_crc_basic at compare-crc-sanitycheck-nv12,Fail
-kms_plane at pixel-format,Fail
-kms_plane at pixel-format-source-clamping,Fail
 kms_plane_alpha_blend at alpha-7efc,Fail
 kms_plane_alpha_blend at coverage-7efc,Fail
 kms_plane_alpha_blend at coverage-vs-premult-vs-constant,Fail
diff --git a/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt b/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt
index 5b3aaab7ac3f..16d205c04cbb 100644
--- a/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt
@@ -1,11 +1,12 @@
-
-
-# Test ends up reading CRC from frame before cursor update
-# bug
-# sometimes.. tbd if this is a kernel CRC bug or a test
-kms_cursor_crc at .*
+kms_cursor_legacy at basic-flip-after-cursor-atomic
+kms_cursor_legacy at basic-flip-before-cursor-varying-size
+kms_cursor_legacy at cursorA-vs-flipA-toggle
+kms_cursor_legacy at flip-vs-cursor-atomic-transitions
 kms_cursor_legacy at flip-vs-cursor-toggle
-kms_cursor_legacy at pipe-A-forked-bo
-kms_cursor_legacy at pipe-A-forked-move
+kms_cursor_legacy at flip-vs-cursor-varying-size
+kms_cursor_legacy at short-flip-before-cursor-atomic-transitions
 kms_cursor_legacy at short-flip-before-cursor-toggle
-kms_flip at dpms-vs-vblank-race-interruptible
+kms_flip at flip-vs-modeset-vs-hang
+kms_flip at flip-vs-panning-vs-hang
+kms_plane at pixel-format
+kms_plane at pixel-format-source-clamping
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
index 2a1baa948e12..90c63f519e9e 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
@@ -5,8 +5,13 @@ kms_bw at linear-tiling-2-displays-3840x2160p,Fail
 kms_bw at linear-tiling-3-displays-1920x1080p,Fail
 kms_bw at linear-tiling-3-displays-2560x1440p,Fail
 kms_bw at linear-tiling-3-displays-3840x2160p,Fail
+kms_flip at flip-vs-modeset-vs-hang,Crash
+kms_flip at flip-vs-panning-vs-hang,Crash
 kms_force_connector_basic at force-load-detect,Fail
 kms_invalid_mode at int-max-clock,Crash
+kms_pipe_crc_basic at compare-crc-sanitycheck-nv12,Crash
+kms_pipe_crc_basic at nonblocking-crc-frame-sequence,Crash
+kms_pipe_crc_basic at read-crc-frame-sequence,Crash
 kms_plane at pixel-format,Crash
 kms_plane at pixel-format-source-clamping,Crash
 kms_plane at plane-position-hole,Crash
@@ -45,4 +50,5 @@ kms_properties at connector-properties-atomic,Crash
 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_rmfb at close-fd,Crash
 kms_setmode at invalid-clone-single-crtc,Crash
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
deleted file mode 100644
index 45c54c75c899..000000000000
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-kms_addfb_basic at addfb25-bad-modifier
-kms_cursor_crc at .*
-kms_flip at basic-flip-vs-wf_vblank
-kms_invalid_mode at int-max-clock,Crash
-kms_pipe_crc_basic at .*
-kms_properties at connector-properties-atomic,Crash
-kms_properties at get_properties-sanity-atomic,Crash
-kms_properties at get_properties-sanity-non-atomic,Crash
-kms_rmfb at close-fd
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
index 6db08ba6b008..d516d9c1d546 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
@@ -1,15 +1,40 @@
+kms_color at gamma,Fail
 kms_color at legacy-gamma,Fail
 kms_color at pipe-A-legacy-gamma,Fail
 kms_color at pipe-B-legacy-gamma,Fail
+kms_cursor_crc at cursor-alpha-opaque,Fail
+kms_cursor_crc at cursor-alpha-transparent,Fail
+kms_cursor_crc at cursor-dpms,Fail
+kms_cursor_crc at cursor-offscreen-32x10,Fail
+kms_cursor_crc at cursor-offscreen-32x32,Fail
+kms_cursor_crc at cursor-offscreen-64x64,Fail
+kms_cursor_crc at cursor-onscreen-32x10,Fail
+kms_cursor_crc at cursor-onscreen-32x32,Fail
+kms_cursor_crc at cursor-onscreen-64x21,Fail
+kms_cursor_crc at cursor-onscreen-64x64,Fail
+kms_cursor_crc at cursor-random-32x10,Fail
+kms_cursor_crc at cursor-random-32x32,Fail
+kms_cursor_crc at cursor-random-64x21,Fail
+kms_cursor_crc at cursor-random-64x64,Fail
+kms_cursor_crc at cursor-rapid-movement-32x32,Fail
+kms_cursor_crc at cursor-rapid-movement-64x21,Fail
+kms_cursor_crc at cursor-rapid-movement-64x64,Fail
+kms_cursor_crc at cursor-size-change,Fail
+kms_cursor_crc at cursor-sliding-32x10,Fail
+kms_cursor_crc at cursor-sliding-32x32,Fail
+kms_cursor_crc at cursor-sliding-64x21,Fail
+kms_cursor_crc at cursor-sliding-64x64,Fail
 kms_flip at basic-flip-vs-wf_vblank,Fail
 kms_flip at blocking-wf_vblank,Fail
 kms_flip at dpms-vs-vblank-race,Fail
 kms_flip at flip-vs-absolute-wf_vblank,Fail
 kms_flip at flip-vs-absolute-wf_vblank-interruptible,Fail
 kms_flip at flip-vs-blocking-wf-vblank,Fail
+kms_flip at flip-vs-modeset-vs-hang,Fail
 kms_flip at flip-vs-panning,Fail
 kms_flip at flip-vs-panning-interruptible,Fail
-kms_flip at flip-vs-wf_vblank-interruptible,Fail
+kms_flip at flip-vs-panning-vs-hang,Fail
+kms_flip at modeset-vs-vblank-race,Fail
 kms_flip at plain-flip-fb-recreate,Fail
 kms_flip at plain-flip-fb-recreate-interruptible,Fail
 kms_flip at plain-flip-ts-check,Fail
@@ -17,11 +42,21 @@ kms_flip at plain-flip-ts-check-interruptible,Fail
 kms_flip at wf_vblank-ts-check,Fail
 kms_flip at wf_vblank-ts-check-interruptible,Fail
 kms_invalid_mode at int-max-clock,Fail
+kms_pipe_crc_basic at compare-crc-sanitycheck-nv12,Fail
+kms_pipe_crc_basic at compare-crc-sanitycheck-xr24,Fail
+kms_pipe_crc_basic at disable-crc-after-crtc,Fail
+kms_pipe_crc_basic at nonblocking-crc,Fail
+kms_pipe_crc_basic at nonblocking-crc-frame-sequence,Fail
+kms_pipe_crc_basic at read-crc,Fail
+kms_pipe_crc_basic at read-crc-frame-sequence,Fail
 kms_plane at pixel-format,Fail
 kms_plane at pixel-format-source-clamping,Fail
 kms_plane at plane-panning-bottom-right,Fail
 kms_plane at plane-panning-top-left,Fail
 kms_plane at plane-position-covered,Fail
+kms_plane at plane-position-hole,Fail
+kms_plane at plane-position-hole-dpms,Fail
+kms_plane_cursor at overlay,Fail
 kms_plane_cursor at pipe-B-overlay-size-128,Fail
 kms_plane_cursor at pipe-B-overlay-size-256,Fail
 kms_plane_cursor at pipe-B-overlay-size-64,Fail
@@ -31,7 +66,10 @@ kms_plane_cursor at pipe-B-primary-size-64,Fail
 kms_plane_cursor at pipe-B-viewport-size-128,Fail
 kms_plane_cursor at pipe-B-viewport-size-256,Fail
 kms_plane_cursor at pipe-B-viewport-size-64,Fail
+kms_plane_cursor at primary,Fail
+kms_plane_cursor at viewport,Fail
 kms_plane_multiple at atomic-pipe-B-tiling-none,Fail
 kms_plane_multiple at tiling-none,Fail
 kms_prime at basic-crc,Fail
 kms_rmfb at close-fd,Fail
+kms_universal_plane at universal-plane-pipe-B-functional,Fail
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
index 4c0539b4beaf..c9fdc623ab91 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
@@ -1,23 +1,7 @@
-
-kms_cursor_crc at .*
+kms_bw at linear-tiling-2-displays-1920x1080p
+kms_cursor_crc at cursor-offscreen-64x21
 kms_flip at dpms-vs-vblank-race-interruptible
-kms_flip at flip-vs-expired-vblank
-kms_flip at modeset-vs-vblank-race-interruptible
-kms_pipe_crc_basic at .*
-kms_pipe_crc_basic at compare-crc-sanitycheck-pipe-A
-kms_pipe_crc_basic at compare-crc-sanitycheck-pipe-B
-kms_plane at plane-position-hole
-kms_plane_multiple at atomic-pipe-A-tiling-none
-kms_plane_multiple at atomic-pipe-B-tiling-none
-kms_sequence at get-forked
-kms_sequence at get-forked-busy
-kms_setmode at basic
-kms_universal_plane at universal-plane-pipe-B-functional,UnexpectedPass
-kms_vblank at pipe-A-accuracy-idle
-kms_vblank at pipe-A-query-busy
-kms_vblank at pipe-A-query-forked-busy
-kms_vblank at pipe-A-wait-idle
-kms_vblank at pipe-B-accuracy-idle
-kms_vblank at pipe-B-query-busy
-kms_vblank at pipe-B-query-forked-busy
-kms_vblank at pipe-B-wait-idle
+kms_flip at flip-vs-wf_vblank-interruptible
+kms_plane_cursor at overlay
+kms_plane_cursor at primary
+kms_plane_cursor at viewport
diff --git a/drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
-- 
2.39.2