Message-Id: <20240409081329.472463-8-vignesh.raman@collabora.com>
Date: Tue,  9 Apr 2024 13:43:28 +0530
From: Vignesh Raman <vignesh.raman@...labora.com>
To: dri-devel@...ts.freedesktop.org
Cc: daniels@...labora.com,
	helen.koike@...labora.com,
	airlied@...il.com,
	daniel@...ll.ch,
	emma@...olt.net,
	robdclark@...il.com,
	david.heidelberg@...labora.com,
	guilherme.gallo@...labora.com,
	sergi.blanch.torne@...labora.com,
	hamohammed.sa@...il.com,
	rodrigosiqueiramelo@...il.com,
	melissa.srw@...il.com,
	mairacanal@...eup.net,
	mcanal@...lia.com,
	linux-mediatek@...ts.infradead.org,
	linux-amlogic@...ts.infradead.org,
	linux-rockchip@...ts.infradead.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH v6 7/8] drm/ci: rockchip: add tests for rockchip display driver

For rockchip rk3288 and rk3399, the display driver is rockchip
and gpu driver is panfrost. Currently, in drm-ci for rockchip
rk3288 and rk3399, only the gpu driver is tested. Refactor
the existing rockchip jobs to test both display and gpu driver
and update xfails.

Since the correct driver name is passed from the job to test gpu
and display driver, remove the check to set IGT_FORCE_DRIVER
based on driver name for rockchip jobs.

Skip kms tests for panfrost driver since it is not a kms driver and
skip driver-specific tests.

Signed-off-by: Vignesh Raman <vignesh.raman@...labora.com>
---

v2:
  - Refactor the patch to rename job to indicate display driver testing,
    rename the existing xfail files.

v3:
  - Add the job name in GPU_VERSION and use it for xfail file names
    instead of using DRIVER_NAME. Also update xfails.

v4:
  - Remove the display suffix in job and rename xfails accordingly.
    Remove the change adding job name in GPU_VERSION.

v5:
  - Add rockchip-display job and skip driver-specfic tests.

v6:
  - Squash commits for display and gpu driver testing. Reword the commit message.

---
 drivers/gpu/drm/ci/igt_runner.sh              |  3 --
 drivers/gpu/drm/ci/test.yml                   | 48 ++++++++++++++-----
 .../drm/ci/xfails/panfrost-rk3288-fails.txt   |  1 +
 .../drm/ci/xfails/panfrost-rk3288-skips.txt   |  8 ++++
 .../drm/ci/xfails/panfrost-rk3399-fails.txt   |  1 +
 .../drm/ci/xfails/panfrost-rk3399-skips.txt   |  8 ++++
 .../drm/ci/xfails/rockchip-rk3288-fails.txt   | 35 --------------
 .../drm/ci/xfails/rockchip-rk3288-flakes.txt  | 21 ++++++++
 .../drm/ci/xfails/rockchip-rk3288-skips.txt   |  7 +++
 .../drm/ci/xfails/rockchip-rk3399-fails.txt   | 30 ++----------
 .../drm/ci/xfails/rockchip-rk3399-flakes.txt  | 28 +++++++++--
 .../drm/ci/xfails/rockchip-rk3399-skips.txt   |  5 ++
 12 files changed, 115 insertions(+), 80 deletions(-)
 create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt
 create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt

diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index 1762b8870948..ce6e22369d4d 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -20,9 +20,6 @@ cat /sys/kernel/debug/dri/*/state
 set -e
 
 case "$DRIVER_NAME" in
-    rockchip)
-        export IGT_FORCE_DRIVER="panfrost"
-        ;;
     amdgpu)
         # Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib
         mv /install/modules/lib/modules/* /lib/modules/.
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index a453876509e9..02d6779c456d 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -155,33 +155,57 @@ msm:sdm845:
   script:
     - ./install/bare-metal/cros-servo.sh
 
-rockchip:rk3288:
-  extends:
-    - .lava-igt:arm32
+.rockchip-device:
+  variables:
+    DTB: ${DEVICE_TYPE}
+    BOOT_METHOD: depthcharge
+
+.rockchip-display:
   stage: rockchip
   variables:
     DRIVER_NAME: rockchip
+
+.rk3288:
+  extends:
+    - .lava-igt:arm32
+    - .rockchip-device
+  variables:
     DEVICE_TYPE: rk3288-veyron-jaq
-    DTB: ${DEVICE_TYPE}
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: "zimage"
     GPU_VERSION: rk3288
+    KERNEL_IMAGE_TYPE: "zimage"
     RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
 
-rockchip:rk3399:
+.rk3399:
   extends:
     - .lava-igt:arm64
-  stage: rockchip
+    - .rockchip-device
   parallel: 2
   variables:
-    DRIVER_NAME: rockchip
     DEVICE_TYPE: rk3399-gru-kevin
-    DTB: ${DEVICE_TYPE}
-    BOOT_METHOD: depthcharge
-    KERNEL_IMAGE_TYPE: ""
     GPU_VERSION: rk3399
+    KERNEL_IMAGE_TYPE: ""
     RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin
 
+rockchip:rk3288:
+  extends:
+    - .rk3288
+    - .rockchip-display
+
+panfrost:rk3288:
+  extends:
+    - .rk3288
+    - .panfrost-gpu
+
+rockchip:rk3399:
+  extends:
+    - .rk3399
+    - .rockchip-display
+
+panfrost:rk3399:
+  extends:
+    - .rk3399
+    - .panfrost-gpu
+
 .i915:
   extends:
     - .lava-igt:x86_64
diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt
new file mode 100644
index 000000000000..abd35a8ef6f4
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt
@@ -0,0 +1 @@
+panfrost_prime@...-prime-import,Crash
diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt
new file mode 100644
index 000000000000..41a846a59644
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt
@@ -0,0 +1,8 @@
+# Panfrost is not a KMS driver, so skip the KMS tests
+kms_.*
+
+# Skip driver specific tests
+msm_.*
+^amdgpu.*
+v3d_.*
+vc4_.*
diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt
new file mode 100644
index 000000000000..6f5e760d5ec0
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt
@@ -0,0 +1 @@
+panfrost_prime@...-prime-import,Fail
diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt
new file mode 100644
index 000000000000..41a846a59644
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt
@@ -0,0 +1,8 @@
+# Panfrost is not a KMS driver, so skip the KMS tests
+kms_.*
+
+# Skip driver specific tests
+msm_.*
+^amdgpu.*
+v3d_.*
+vc4_.*
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
index 282817a22cf8..80c23ca3d79d 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
@@ -1,55 +1,20 @@
 kms_3d,Crash
 kms_bw@...ear-tiling-2-displays-1920x1080p,Fail
 kms_bw@...ear-tiling-2-displays-2560x1440p,Fail
-kms_bw@...ear-tiling-2-displays-3840x2160p,Fail
 kms_bw@...ear-tiling-3-displays-1920x1080p,Fail
-kms_bw@...ear-tiling-3-displays-2560x1440p,Fail
-kms_bw@...ear-tiling-3-displays-3840x2160p,Fail
 kms_flip@...p-vs-modeset-vs-hang,Crash
 kms_flip@...p-vs-panning-vs-hang,Crash
-kms_force_connector_basic@...ce-load-detect,Fail
 kms_invalid_mode@...-max-clock,Crash
 kms_pipe_crc_basic@...pare-crc-sanitycheck-nv12,Crash
 kms_pipe_crc_basic@...blocking-crc-frame-sequence,Crash
 kms_pipe_crc_basic@...d-crc-frame-sequence,Crash
 kms_plane@...el-format,Crash
 kms_plane@...el-format-source-clamping,Crash
-kms_plane@...ne-position-hole,Crash
-kms_plane@...ne-position-hole-dpms,Crash
 kms_plane_cursor@...rlay,Crash
-kms_plane_cursor@...e-A-overlay-size-128,Fail
-kms_plane_cursor@...e-A-overlay-size-256,Fail
-kms_plane_cursor@...e-A-overlay-size-64,Fail
-kms_plane_cursor@...e-A-primary-size-128,Fail
-kms_plane_cursor@...e-A-primary-size-256,Fail
-kms_plane_cursor@...e-A-primary-size-64,Fail
-kms_plane_cursor@...e-A-viewport-size-128,Fail
-kms_plane_cursor@...e-A-viewport-size-256,Fail
-kms_plane_cursor@...e-A-viewport-size-64,Fail
-kms_plane_cursor@...e-B-overlay-size-128,Fail
-kms_plane_cursor@...e-B-overlay-size-256,Fail
-kms_plane_cursor@...e-B-overlay-size-64,Fail
-kms_plane_cursor@...e-B-primary-size-128,Fail
-kms_plane_cursor@...e-B-primary-size-256,Fail
-kms_plane_cursor@...e-B-primary-size-64,Fail
-kms_plane_cursor@...e-B-viewport-size-128,Fail
-kms_plane_cursor@...e-B-viewport-size-256,Fail
-kms_plane_cursor@...e-B-viewport-size-64,Fail
 kms_plane_cursor@...mary,Crash
 kms_plane_cursor@...wport,Crash
-kms_plane_lowres@...ing-none,Fail
-kms_plane_scaling@...nscale-with-modifier-factor-0-25,Fail
-kms_plane_scaling@...nscale-with-rotation-factor-0-25,Fail
-kms_plane_scaling@...cale-with-modifier-20x20,Fail
-kms_plane_scaling@...cale-with-modifier-factor-0-25,Fail
-kms_plane_scaling@...cale-with-pixel-format-20x20,Fail
-kms_plane_scaling@...cale-with-pixel-format-factor-0-25,Fail
-kms_plane_scaling@...cale-with-rotation-20x20,Fail
-kms_prime@...ic-crc,Fail
 kms_properties@...nector-properties-atomic,Crash
 kms_properties@...nector-properties-legacy,Crash
 kms_properties@..._properties-sanity-atomic,Crash
 kms_properties@..._properties-sanity-non-atomic,Crash
 kms_rmfb@...se-fd,Crash
-kms_setmode@...alid-clone-single-crtc,Crash
-panfrost_prime@...-prime-import,Crash
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
new file mode 100644
index 000000000000..f1f22e8aecd3
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
@@ -0,0 +1,21 @@
+# Board Name: rk3288-veyron-jaq.dtb
+# Bug Report: https://lore.kernel.org/dri-devel/bdb53650-1888-30b8-93ee-2290d020af4a@collabora.com/T/#u
+# Failure Rate: 50
+# IGT Version: 1.28-gd2af13d9f
+# Linux Version: 6.7.0-rc3
+
+# Reported by deqp-runner
+kms_cursor_crc@...sor-offscreen-64x21
+kms_cursor_legacy@...p-vs-cursor-legacy
+kms_cursor_legacy@...p-vs-cursor-atomic
+kms_plane@...ne-panning-top-left
+kms_cursor_crc@...sor-alpha-opaque
+kms_flip@...s-vs-vblank-race-interruptible
+kms_flip@...in-flip-ts-check-interruptible
+kms_universal_plane@...versal-plane-functional
+
+# The below test shows inconsistency across multiple runs, giving
+# results of Pass and Crash alternately.
+kms_cursor_crc@...sor-size-change
+core_setmaster_vs_auth
+kms_flip@...eset-vs-vblank-race
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt
index 3e99106e50e0..0866028d095c 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt
@@ -54,5 +54,12 @@ kms_pipe_crc_basic@...able-crc-after-crtc
 # Skip driver specific tests
 msm_.*
 ^amdgpu.*
+panfrost_.*
 v3d_.*
 vc4_.*
+
+# Machine is hanging in this test with linux kernel version 6.7.0-rc4, so skip it
+kms_cursor_crc@...sor-onscreen-32x32
+kms_pipe_crc_basic@...able-crc-after-crtc
+kms_pipe_crc_basic@...e-A-eDP-1
+kms_bw@...ear-tiling-3-displays-2560x1440
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
index 32ca7f29472e..cbb5d4a88cba 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
@@ -1,12 +1,12 @@
-kms_color@...ma,Fail
+kms_atomic_transition@...eset-transition,Fail
+kms_atomic_transition@...eset-transition-fencing,Fail
+kms_atomic_transition@...ne-toggle-modeset-transition,Fail
 kms_color@...acy-gamma,Fail
-kms_color@...e-A-legacy-gamma,Fail
-kms_color@...e-B-legacy-gamma,Fail
 kms_cursor_crc@...sor-alpha-opaque,Fail
 kms_cursor_crc@...sor-alpha-transparent,Fail
 kms_cursor_crc@...sor-dpms,Fail
 kms_cursor_crc@...sor-offscreen-32x10,Fail
-kms_cursor_crc@...sor-offscreen-32x32,Fail
+kms_cursor_crc@...sor-offscreen-64x21,Fail
 kms_cursor_crc@...sor-offscreen-64x64,Fail
 kms_cursor_crc@...sor-onscreen-32x10,Fail
 kms_cursor_crc@...sor-onscreen-32x32,Fail
@@ -26,9 +26,7 @@ kms_cursor_crc@...sor-sliding-64x21,Fail
 kms_cursor_crc@...sor-sliding-64x64,Fail
 kms_flip@...ic-flip-vs-wf_vblank,Fail
 kms_flip@...cking-wf_vblank,Fail
-kms_flip@...s-vs-vblank-race,Fail
 kms_flip@...p-vs-absolute-wf_vblank,Fail
-kms_flip@...p-vs-absolute-wf_vblank-interruptible,Fail
 kms_flip@...p-vs-blocking-wf-vblank,Fail
 kms_flip@...p-vs-modeset-vs-hang,Fail
 kms_flip@...p-vs-panning,Fail
@@ -40,10 +38,8 @@ kms_flip@...in-flip-fb-recreate-interruptible,Fail
 kms_flip@...in-flip-ts-check,Fail
 kms_flip@...in-flip-ts-check-interruptible,Fail
 kms_flip@...vblank-ts-check,Fail
-kms_flip@...vblank-ts-check-interruptible,Fail
 kms_invalid_mode@...-max-clock,Fail
 kms_pipe_crc_basic@...pare-crc-sanitycheck-nv12,Fail
-kms_pipe_crc_basic@...pare-crc-sanitycheck-xr24,Fail
 kms_pipe_crc_basic@...able-crc-after-crtc,Fail
 kms_pipe_crc_basic@...blocking-crc,Fail
 kms_pipe_crc_basic@...blocking-crc-frame-sequence,Fail
@@ -56,21 +52,5 @@ kms_plane@...ne-panning-top-left,Fail
 kms_plane@...ne-position-covered,Fail
 kms_plane@...ne-position-hole,Fail
 kms_plane@...ne-position-hole-dpms,Fail
-kms_plane_cursor@...rlay,Fail
-kms_plane_cursor@...e-B-overlay-size-128,Fail
-kms_plane_cursor@...e-B-overlay-size-256,Fail
-kms_plane_cursor@...e-B-overlay-size-64,Fail
-kms_plane_cursor@...e-B-primary-size-128,Fail
-kms_plane_cursor@...e-B-primary-size-256,Fail
-kms_plane_cursor@...e-B-primary-size-64,Fail
-kms_plane_cursor@...e-B-viewport-size-128,Fail
-kms_plane_cursor@...e-B-viewport-size-256,Fail
-kms_plane_cursor@...e-B-viewport-size-64,Fail
-kms_plane_cursor@...mary,Fail
-kms_plane_cursor@...wport,Fail
-kms_plane_multiple@...mic-pipe-B-tiling-none,Fail
-kms_plane_multiple@...ing-none,Fail
-kms_prime@...ic-crc,Fail
 kms_rmfb@...se-fd,Fail
-kms_universal_plane@...versal-plane-pipe-B-functional,Fail
-panfrost_prime@...-prime-import,Fail
+kms_universal_plane@...versal-plane-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 c9fdc623ab91..5126a849bf4a 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt
@@ -1,7 +1,25 @@
-kms_bw@...ear-tiling-2-displays-1920x1080p
-kms_cursor_crc@...sor-offscreen-64x21
+# Board Name: rk3399-gru-kevin.dtb
+# Bug Report: https://lore.kernel.org/dri-devel/bdb53650-1888-30b8-93ee-2290d020af4a@collabora.com/T/#u
+# IGT Version: 1.28-gd2af13d9f
+# Failure Rate: 50
+# Linux Version: 6.7.0-rc3
+
+# Reported by deqp-runner
+kms_bw@...ear-tiling-1-displays-1920x1080p
+kms_color@...ma
+kms_cursor_legacy@...sorA-vs-flipA-toggle
+kms_cursor_legacy@...blocking-modeset-vs-cursor-atomic
+kms_flip@...s-vs-vblank-race
 kms_flip@...s-vs-vblank-race-interruptible
+kms_flip@...p-vs-absolute-wf_vblank-interruptible
 kms_flip@...p-vs-wf_vblank-interruptible
-kms_plane_cursor@...rlay
-kms_plane_cursor@...mary
-kms_plane_cursor@...wport
+kms_flip@...eset-vs-vblank-race-interruptible
+kms_pipe_crc_basic@...pare-crc-sanitycheck-xr24
+kms_setmode@...ic
+
+# The below test shows inconsistency across multiple runs, giving
+# results of Pass and Crash alternately.
+kms_bw@...ear-tiling-2-displays-1920x1080p
+kms_bw@...ear-tiling-3-displays-2560x1440p
+kms_cursor_crc@...sor-rapid-movement-32x10
+kms_flip@...vblank-ts-check-interruptible
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt
index bd0bba0d8477..f309aeca857a 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt
@@ -7,5 +7,10 @@ kms_cursor_legacy.*
 # Skip driver specific tests
 msm_.*
 ^amdgpu.*
+panfrost_.*
 v3d_.*
 vc4_.*
+
+# Machine ends up hanging after lots of Oopses with linux version 6.7.0-rc4
+# rockchip-dp ff970000.dp: AUX CH error happened: 0x2
+kms_plane_multiple.*
-- 
2.40.1

Powered by blists - more mailing lists