[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240306030649.60269-10-vignesh.raman@collabora.com>
Date: Wed, 6 Mar 2024 08:36:47 +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 v4 09/11] drm/ci: rockchip: Refactor existing rockchip jobs
For rockchip rk3288 and rk3399, the display driver is rockchip.
Currently, in drm-ci for rockchip, only the display driver is
tested. Refactor the existing rockchip jobs so that gpu driver
testing jobs can be added later and update xfails accordingly.
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.
---
drivers/gpu/drm/ci/test.yml | 36 ++++++++----
.../drm/ci/xfails/rockchip-rk3288-fails.txt | 58 ++++++-------------
.../drm/ci/xfails/rockchip-rk3288-flakes.txt | 20 +++++++
.../drm/ci/xfails/rockchip-rk3288-skips.txt | 54 ++---------------
.../drm/ci/xfails/rockchip-rk3399-fails.txt | 38 ++++++------
.../drm/ci/xfails/rockchip-rk3399-flakes.txt | 28 +++++++--
.../drm/ci/xfails/rockchip-rk3399-skips.txt | 5 +-
7 files changed, 110 insertions(+), 129 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 6ae6398b3d88..831e580e6dfd 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -153,33 +153,45 @@ msm:sdm845:
script:
- ./install/bare-metal/cros-servo.sh
-rockchip:rk3288:
- extends:
- - .lava-igt:arm32
+.rockchip:
stage: rockchip
variables:
- DRIVER_NAME: rockchip
- DEVICE_TYPE: rk3288-veyron-jaq
DTB: ${DEVICE_TYPE}
BOOT_METHOD: depthcharge
+
+.rk3288:
+ extends:
+ - .lava-igt:arm32
+ - .rockchip
+ variables:
+ DEVICE_TYPE: rk3288-veyron-jaq
KERNEL_IMAGE_TYPE: "zimage"
- GPU_VERSION: rk3288
RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
-rockchip:rk3399:
+.rk3399:
extends:
- .lava-igt:arm64
- stage: rockchip
+ - .rockchip
parallel: 2
variables:
- DRIVER_NAME: rockchip
DEVICE_TYPE: rk3399-gru-kevin
- DTB: ${DEVICE_TYPE}
- BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
- GPU_VERSION: rk3399
RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin
+rockchip:rk3288:
+ extends:
+ - .rk3288
+ variables:
+ GPU_VERSION: rk3288
+ DRIVER_NAME: rockchip
+
+rockchip:rk3399:
+ extends:
+ - .rk3399
+ variables:
+ GPU_VERSION: rk3399
+ DRIVER_NAME: rockchip
+
.i915:
extends:
- .lava-igt:x86_64
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
index 90c63f519e9e..c16e0a06cc8f 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
@@ -1,54 +1,30 @@
-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_cursor_crc@...sor-onscreen-32x10,Crash
+kms_cursor_crc@...sor-onscreen-64x21,Crash
+kms_cursor_crc@...sor-onscreen-64x64,Crash
+kms_cursor_crc@...sor-random-32x10,Crash
+kms_cursor_crc@...sor-random-64x21,Crash
+kms_cursor_crc@...sor-random-64x64,Crash
+kms_cursor_crc@...sor-sliding-32x10,Crash
+kms_cursor_crc@...sor-sliding-32x32,Crash
+kms_cursor_crc@...sor-sliding-64x64,Crash
+kms_cursor_legacy@...ic-flip-before-cursor-atomic,Fail
+kms_cursor_legacy@...ic-flip-before-cursor-legacy,Fail
+kms_cursor_legacy@...sor-vs-flip-atomic,Fail
+kms_cursor_legacy@...sor-vs-flip-atomic-transitions,Fail
+kms_cursor_legacy@...sor-vs-flip-toggle,Fail
+kms_cursor_legacy@...p-vs-cursor-crc-atomic,Crash
+kms_cursor_legacy@...p-vs-cursor-crc-legacy,Crash
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_prop_blob@...alid-set-prop,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
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..de13bac3a5bc
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
@@ -0,0 +1,20 @@
+# 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_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 f20c3574b75a..627bf03f3c78 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt
@@ -1,52 +1,8 @@
# Suspend to RAM seems to be broken on this machine
.*suspend.*
-# Too unstable, machine ends up hanging after lots of Oopses
-kms_cursor_legacy.*
-
-# Started hanging the machine on Linux 5.19-rc2:
-#
-# [IGT] kms_plane_lowres: executing
-# [IGT] kms_plane_lowres: starting subtest pipe-F-tiling-y
-# [IGT] kms_plane_lowres: exiting, ret=77
-# Console: switching to colour frame buffer device 170x48
-# rockchip-drm display-subsystem: [drm] *ERROR* flip_done timed out
-# rockchip-drm display-subsystem: [drm] *ERROR* [CRTC:35:crtc-0] commit wait timed out
-# BUG: spinlock bad magic on CPU#3, kms_plane_lowre/482
-# 8<--- cut here ---
-# Unable to handle kernel paging request at virtual address 7812078e
-# [7812078e] *pgd=00000000
-# Internal error: Oops: 5 [#1] SMP ARM
-# Modules linked in:
-# CPU: 3 PID: 482 Comm: kms_plane_lowre Tainted: G W 5.19.0-rc2-323596-g00535de92171 #1
-# Hardware name: Rockchip (Device Tree)
-# Process kms_plane_lowre (pid: 482, stack limit = 0x1193ac2b)
-# spin_dump from do_raw_spin_lock+0xa4/0xe8
-# do_raw_spin_lock from wait_for_completion_timeout+0x2c/0x120
-# wait_for_completion_timeout from drm_crtc_commit_wait+0x18/0x7c
-# drm_crtc_commit_wait from drm_atomic_helper_wait_for_dependencies+0x44/0x168
-# drm_atomic_helper_wait_for_dependencies from commit_tail+0x34/0x180
-# commit_tail from drm_atomic_helper_commit+0x164/0x18c
-# drm_atomic_helper_commit from drm_atomic_commit+0xac/0xe4
-# drm_atomic_commit from drm_client_modeset_commit_atomic+0x23c/0x284
-# drm_client_modeset_commit_atomic from drm_client_modeset_commit_locked+0x60/0x1c8
-# drm_client_modeset_commit_locked from drm_client_modeset_commit+0x24/0x40
-# drm_client_modeset_commit from drm_fbdev_client_restore+0x58/0x94
-# drm_fbdev_client_restore from drm_client_dev_restore+0x70/0xbc
-# drm_client_dev_restore from drm_release+0xf4/0x114
-# drm_release from __fput+0x74/0x240
-# __fput from task_work_run+0x84/0xb4
-# task_work_run from do_exit+0x34c/0xa20
-# do_exit from do_group_exit+0x34/0x98
-# do_group_exit from __wake_up_parent+0x0/0x18
-# Code: e595c008 12843d19 03e00000 03093168 (15940508)
-# ---[ end trace 0000000000000000 ]---
-# note: kms_plane_lowre[482] exited with preempt_count 1
-# Fixing recursive fault but reboot is needed!
-kms_plane_lowres@...e-F-tiling-y
-
-# Take too long, we have only two machines, and these are very flaky
-kms_cursor_crc.*
-
-# Machine is hanging in this test, so skip it
-kms_pipe_crc_basic@...able-crc-after-crtc
\ No newline at end of file
+# 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 d516d9c1d546..ace0d6ed6f2f 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt
@@ -1,12 +1,13 @@
-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
@@ -16,6 +17,7 @@ kms_cursor_crc@...sor-random-32x10,Fail
kms_cursor_crc@...sor-random-32x32,Fail
kms_cursor_crc@...sor-random-64x21,Fail
kms_cursor_crc@...sor-random-64x64,Fail
+kms_cursor_crc@...sor-rapid-movement-32x10,Fail
kms_cursor_crc@...sor-rapid-movement-32x32,Fail
kms_cursor_crc@...sor-rapid-movement-64x21,Fail
kms_cursor_crc@...sor-rapid-movement-64x64,Fail
@@ -24,23 +26,33 @@ kms_cursor_crc@...sor-sliding-32x10,Fail
kms_cursor_crc@...sor-sliding-32x32,Fail
kms_cursor_crc@...sor-sliding-64x21,Fail
kms_cursor_crc@...sor-sliding-64x64,Fail
+kms_cursor_legacy@...ic-flip-before-cursor-atomic,Fail
+kms_cursor_legacy@...ic-flip-before-cursor-legacy,Fail
+kms_cursor_legacy@...sor-vs-flip-atomic,Fail
+kms_cursor_legacy@...sor-vs-flip-legacy,Fail
+kms_cursor_legacy@...sor-vs-flip-toggle,Fail
+kms_cursor_legacy@...p-vs-cursor-atomic,Fail
+kms_cursor_legacy@...p-vs-cursor-crc-atomic,Fail
+kms_cursor_legacy@...p-vs-cursor-crc-legacy,Fail
+kms_cursor_legacy@...p-vs-cursor-legacy,Fail
+kms_cursor_legacy@...g-nonblocking-modeset-vs-cursor-atomic,Fail
kms_flip@...ic-flip-vs-wf_vblank,Fail
kms_flip@...cking-wf_vblank,Fail
kms_flip@...s-vs-vblank-race,Fail
+kms_flip@...s-vs-vblank-race-interruptible,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
kms_flip@...p-vs-panning-interruptible,Fail
kms_flip@...p-vs-panning-vs-hang,Fail
kms_flip@...eset-vs-vblank-race,Fail
+kms_flip@...eset-vs-vblank-race-interruptible,Fail
kms_flip@...in-flip-fb-recreate,Fail
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
@@ -56,20 +68,6 @@ 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
+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 10c3d81a919a..cf5577b7720c 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-skips.txt
@@ -1,5 +1,6 @@
# Suspend to RAM seems to be broken on this machine
.*suspend.*
-# Too unstable, machine ends up hanging after lots of Oopses
-kms_cursor_legacy.*
+# 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