Skip to content

Commit 16c9898

Browse files
vigneshramanHelen Koike
vigneshraman
authored and
Helen Koike
committed
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. Acked-by: Helen Koike <[email protected]> Reviewed-by: Daniel Stone <[email protected]> Signed-off-by: Vignesh Raman <[email protected]> Signed-off-by: Helen Koike <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent a0ac33c commit 16c9898

13 files changed

+249
-89
lines changed

‎drivers/gpu/drm/ci/igt_runner.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ cat /sys/kernel/debug/dri/*/state
2020
set -e
2121

2222
case "$DRIVER_NAME" in
23-
rockchip)
24-
export IGT_FORCE_DRIVER="panfrost"
25-
;;
2623
amdgpu|vkms)
2724
# Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib
2825
mv /install/modules/lib/modules/* /lib/modules/. || true

‎drivers/gpu/drm/ci/test.yml‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,33 +160,57 @@ msm:sdm845:
160160
script:
161161
- ./install/bare-metal/cros-servo.sh
162162

163-
rockchip:rk3288:
164-
extends:
165-
- .lava-igt:arm32
163+
.rockchip-device:
164+
variables:
165+
DTB: ${DEVICE_TYPE}
166+
BOOT_METHOD: depthcharge
167+
168+
.rockchip-display:
166169
stage: rockchip
167170
variables:
168171
DRIVER_NAME: rockchip
172+
173+
.rk3288:
174+
extends:
175+
- .lava-igt:arm32
176+
- .rockchip-device
177+
variables:
169178
DEVICE_TYPE: rk3288-veyron-jaq
170-
DTB: ${DEVICE_TYPE}
171-
BOOT_METHOD: depthcharge
172-
KERNEL_IMAGE_TYPE: "zimage"
173179
GPU_VERSION: rk3288
180+
KERNEL_IMAGE_TYPE: "zimage"
174181
RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
175182

176-
rockchip:rk3399:
183+
.rk3399:
177184
extends:
178185
- .lava-igt:arm64
179-
stage: rockchip
186+
- .rockchip-device
180187
parallel: 2
181188
variables:
182-
DRIVER_NAME: rockchip
183189
DEVICE_TYPE: rk3399-gru-kevin
184-
DTB: ${DEVICE_TYPE}
185-
BOOT_METHOD: depthcharge
186-
KERNEL_IMAGE_TYPE: ""
187190
GPU_VERSION: rk3399
191+
KERNEL_IMAGE_TYPE: ""
188192
RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin
189193

194+
rockchip:rk3288:
195+
extends:
196+
- .rk3288
197+
- .rockchip-display
198+
199+
panfrost:rk3288:
200+
extends:
201+
- .rk3288
202+
- .panfrost-gpu
203+
204+
rockchip:rk3399:
205+
extends:
206+
- .rk3399
207+
- .rockchip-display
208+
209+
panfrost:rk3399:
210+
extends:
211+
- .rk3399
212+
- .panfrost-gpu
213+
190214
.i915:
191215
extends:
192216
- .lava-igt:x86_64

‎drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
panfrost/panfrost_prime@gem-prime-import,Crash

‎drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Suspend to RAM seems to be broken on this machine
2+
.*suspend.*
3+
4+
# Skip driver specific tests
5+
^amdgpu.*
6+
^msm.*
7+
nouveau_.*
8+
^v3d.*
9+
^vc4.*
10+
^vmwgfx*
11+
12+
# Skip intel specific tests
13+
gem_.*
14+
i915_.*
15+
tools_test.*
16+
17+
# Panfrost is not a KMS driver, so skip the KMS tests
18+
kms_.*
19+
20+
# Skip display functionality tests for GPU-only drivers
21+
dumb_buffer.*
22+
fbdev.*
23+
24+
# Currently fails and causes coverage loss for other tests
25+
# since core_getversion also fails.
26+
core_hotunplug.*

‎drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
panfrost/panfrost_prime@gem-prime-import,Fail

‎drivers/gpu/drm/ci/xfails/panfrost-rk3399-flakes.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Board Name: rk3399-gru-kevin
2+
# Bug Report: https://lore.kernel.org/dri-devel/[email protected]/T/#u
3+
# Failure Rate: 50
4+
# IGT Version: 1.28-g0df7b9b97
5+
# Linux Version: 6.9.0-rc7
6+
panfrost/panfrost_submit@pan-unhandled-pagefault

‎drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Suspend to RAM seems to be broken on this machine
2+
.*suspend.*
3+
4+
# Skip driver specific tests
5+
^amdgpu.*
6+
^msm.*
7+
nouveau_.*
8+
^v3d.*
9+
^vc4.*
10+
^vmwgfx*
11+
12+
# Skip intel specific tests
13+
gem_.*
14+
i915_.*
15+
tools_test.*
16+
17+
# Panfrost is not a KMS driver, so skip the KMS tests
18+
kms_.*
19+
20+
# Skip display functionality tests for GPU-only drivers
21+
dumb_buffer.*
22+
fbdev.*
23+
24+
# Currently fails and causes coverage loss for other tests
25+
# since core_getversion also fails.
26+
core_hotunplug.*

‎drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
core_setmaster@master-drop-set-root,Crash
2+
core_setmaster@master-drop-set-user,Crash
3+
core_setmaster_vs_auth,Crash
4+
device_reset@cold-reset-bound,Crash
5+
device_reset@reset-bound,Crash
6+
device_reset@unbind-cold-reset-rebind,Crash
7+
device_reset@unbind-reset-rebind,Crash
18
dumb_buffer@create-clear,Crash
2-
dumb_buffer@create-valid-dumb,Crash
39
dumb_buffer@invalid-bpp,Crash
4-
dumb_buffer@map-invalid-size,Crash
5-
dumb_buffer@map-uaf,Crash
6-
dumb_buffer@map-valid,Crash
7-
panfrost/panfrost_prime@gem-prime-import,Crash
10+
fbdev@pan,Crash
11+
kms_cursor_crc@cursor-onscreen-32x10,Crash
12+
kms_cursor_crc@cursor-onscreen-32x32,Crash
13+
kms_cursor_crc@cursor-random-32x10,Crash
14+
kms_cursor_crc@cursor-sliding-32x32,Crash
15+
kms_cursor_legacy@basic-flip-before-cursor-atomic,Fail
16+
kms_cursor_legacy@cursor-vs-flip-legacy,Fail
17+
kms_prop_blob@invalid-set-prop,Crash
18+
kms_prop_blob@invalid-set-prop-any,Crash

‎drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Board Name: rk3288-veyron-jaq
2+
# Bug Report: https://lore.kernel.org/linux-rockchip/[email protected]/T/#u
3+
# Failure Rate: 100
4+
# IGT Version: 1.28-gf13702b8e
5+
# Linux Version: 6.10.0-rc5
6+
kms_cursor_legacy@flip-vs-cursor-atomic

‎drivers/gpu/drm/ci/xfails/rockchip-rk3288-skips.txt‎

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,11 @@
11
# Suspend to RAM seems to be broken on this machine
22
.*suspend.*
33

4-
# Too unstable, machine ends up hanging after lots of Oopses
5-
kms_cursor_legacy.*
6-
7-
# Started hanging the machine on Linux 5.19-rc2:
8-
#
9-
# [IGT] kms_plane_lowres: executing
10-
# [IGT] kms_plane_lowres: starting subtest pipe-F-tiling-y
11-
# [IGT] kms_plane_lowres: exiting, ret=77
12-
# Console: switching to colour frame buffer device 170x48
13-
# rockchip-drm display-subsystem: [drm] *ERROR* flip_done timed out
14-
# rockchip-drm display-subsystem: [drm] *ERROR* [CRTC:35:crtc-0] commit wait timed out
15-
# BUG: spinlock bad magic on CPU#3, kms_plane_lowre/482
16-
# 8<--- cut here ---
17-
# Unable to handle kernel paging request at virtual address 7812078e
18-
# [7812078e] *pgd=00000000
19-
# Internal error: Oops: 5 [#1] SMP ARM
20-
# Modules linked in:
21-
# CPU: 3 PID: 482 Comm: kms_plane_lowre Tainted: G W 5.19.0-rc2-323596-g00535de92171 #1
22-
# Hardware name: Rockchip (Device Tree)
23-
# Process kms_plane_lowre (pid: 482, stack limit = 0x1193ac2b)
24-
# spin_dump from do_raw_spin_lock+0xa4/0xe8
25-
# do_raw_spin_lock from wait_for_completion_timeout+0x2c/0x120
26-
# wait_for_completion_timeout from drm_crtc_commit_wait+0x18/0x7c
27-
# drm_crtc_commit_wait from drm_atomic_helper_wait_for_dependencies+0x44/0x168
28-
# drm_atomic_helper_wait_for_dependencies from commit_tail+0x34/0x180
29-
# commit_tail from drm_atomic_helper_commit+0x164/0x18c
30-
# drm_atomic_helper_commit from drm_atomic_commit+0xac/0xe4
31-
# drm_atomic_commit from drm_client_modeset_commit_atomic+0x23c/0x284
32-
# drm_client_modeset_commit_atomic from drm_client_modeset_commit_locked+0x60/0x1c8
33-
# drm_client_modeset_commit_locked from drm_client_modeset_commit+0x24/0x40
34-
# drm_client_modeset_commit from drm_fbdev_client_restore+0x58/0x94
35-
# drm_fbdev_client_restore from drm_client_dev_restore+0x70/0xbc
36-
# drm_client_dev_restore from drm_release+0xf4/0x114
37-
# drm_release from __fput+0x74/0x240
38-
# __fput from task_work_run+0x84/0xb4
39-
# task_work_run from do_exit+0x34c/0xa20
40-
# do_exit from do_group_exit+0x34/0x98
41-
# do_group_exit from __wake_up_parent+0x0/0x18
42-
# Code: e595c008 12843d19 03e00000 03093168 (15940508)
43-
# ---[ end trace 0000000000000000 ]---
44-
# note: kms_plane_lowre[482] exited with preempt_count 1
45-
# Fixing recursive fault but reboot is needed!
46-
kms_plane_lowres@pipe-F-tiling-y
47-
48-
# Take too long, we have only two machines, and these are very flaky
49-
kms_cursor_crc.*
50-
51-
# Machine is hanging in this test, so skip it
52-
kms_pipe_crc_basic@disable-crc-after-crtc
53-
544
# Skip driver specific tests
555
^amdgpu.*
566
^msm.*
577
nouveau_.*
8+
^panfrost.*
589
^v3d.*
5910
^vc4.*
6011
^vmwgfx*
@@ -64,9 +15,6 @@ gem_.*
6415
i915_.*
6516
tools_test.*
6617

67-
# Panfrost is not a KMS driver, so skip the KMS tests
68-
kms_.*
69-
7018
# Currently fails and causes coverage loss for other tests
7119
# since core_getversion also fails.
7220
core_hotunplug.*

0 commit comments

Comments
 (0)