Skip to content

Commit 7583099

Browse files
vigneshramanHelen Koike
authored andcommitted
drm/ci: mediatek: add tests for mediatek display driver
For mediatek mt8183, the display driver is mediatek, while the gpu driver is panfrost. Currently, in drm-ci for mt8183, only the gpu driver is tested. Refactor the existing mediatek jobs and add support in drm-ci to test both display and gpu driver for mt8183 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 mediatek jobs. Update the MAINTAINERS file to include xfails for panfrost driver. 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 0b8778a commit 7583099

File tree

9 files changed

+99
-24
lines changed

9 files changed

+99
-24
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,6 +1748,7 @@ L: [email protected]
17481748
S: Supported
17491749
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
17501750
F: Documentation/gpu/panfrost.rst
1751+
F: drivers/gpu/drm/ci/xfails/panfrost*
17511752
F: drivers/gpu/drm/panfrost/
17521753
F: include/uapi/drm/panfrost_drm.h
17531754

drivers/gpu/drm/ci/gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ stages:
121121
- mediatek
122122
- meson
123123
- msm
124+
- panfrost
124125
- rockchip
125-
- virtio-gpu
126126
- software-driver
127127

128128
# YAML anchors for rule conditions

drivers/gpu/drm/ci/igt_runner.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ case "$DRIVER_NAME" in
2323
rockchip|meson)
2424
export IGT_FORCE_DRIVER="panfrost"
2525
;;
26-
mediatek)
27-
if [ "$GPU_VERSION" = "mt8173" ]; then
28-
export IGT_FORCE_DRIVER=${DRIVER_NAME}
29-
elif [ "$GPU_VERSION" = "mt8183" ]; then
30-
export IGT_FORCE_DRIVER="panfrost"
31-
fi
32-
;;
3326
amdgpu|vkms)
3427
# Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib
3528
mv /install/modules/lib/modules/* /lib/modules/. || true

drivers/gpu/drm/ci/test.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,38 +280,62 @@ amdgpu:stoney:
280280
GPU_VERSION: stoney
281281
RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
282282

283-
.mediatek:
283+
.mediatek-device:
284284
extends:
285285
- .lava-igt:arm64
286286
stage: mediatek
287287
variables:
288-
DRIVER_NAME: mediatek
289288
DTB: ${DEVICE_TYPE}
290289
BOOT_METHOD: depthcharge
291290
KERNEL_IMAGE_TYPE: ""
292291

293-
mediatek:mt8173:
292+
.mediatek-display:
293+
stage: mediatek
294+
variables:
295+
DRIVER_NAME: mediatek
296+
297+
.panfrost-gpu:
298+
stage: panfrost
299+
variables:
300+
DRIVER_NAME: panfrost
301+
302+
.mt8173:
294303
extends:
295-
- .mediatek
304+
- .mediatek-device
296305
parallel: 4
297306
variables:
298307
DEVICE_TYPE: mt8173-elm-hana
299308
GPU_VERSION: mt8173
300309
RUNNER_TAG: mesa-ci-x86-64-lava-mt8173-elm-hana
301310

302-
mediatek:mt8183:
311+
.mt8183:
303312
extends:
304-
- .mediatek
313+
- .mediatek-device
305314
parallel: 3
306315
variables:
307316
DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16
308317
GPU_VERSION: mt8183
309318
RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
310319

320+
mediatek:mt8173:
321+
extends:
322+
- .mt8173
323+
- .mediatek-display
324+
325+
mediatek:mt8183:
326+
extends:
327+
- .mt8183
328+
- .mediatek-display
329+
330+
panfrost:mt8183:
331+
extends:
332+
- .mt8183
333+
- .panfrost-gpu
334+
311335
# drm-mtk doesn't even probe yet in mainline for mt8192
312336
.mediatek:mt8192:
313337
extends:
314-
- .mediatek
338+
- .mediatek-device
315339
parallel: 3
316340
variables:
317341
DEVICE_TYPE: mt8192-asurada-spherion-r0
Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
1-
dumb_buffer@create-clear,Fail
2-
dumb_buffer@create-valid-dumb,Fail
1+
core_setmaster@master-drop-set-shared-fd,Fail
2+
device_reset@cold-reset-bound,Fail
3+
device_reset@reset-bound,Fail
4+
device_reset@unbind-cold-reset-rebind,Fail
5+
device_reset@unbind-reset-rebind,Fail
6+
dumb_buffer@create-clear,Crash
37
dumb_buffer@invalid-bpp,Fail
4-
dumb_buffer@map-invalid-size,Fail
5-
dumb_buffer@map-uaf,Fail
6-
dumb_buffer@map-valid,Fail
7-
panfrost/panfrost_prime@gem-prime-import,Fail
8+
fbdev@eof,Fail
9+
fbdev@pan,Fail
10+
fbdev@read,Fail
11+
fbdev@unaligned-read,Fail
12+
kms_bw@connected-linear-tiling-1-displays-1920x1080p,Fail
13+
kms_bw@connected-linear-tiling-1-displays-2160x1440p,Fail
14+
kms_bw@connected-linear-tiling-1-displays-2560x1440p,Fail
15+
kms_bw@linear-tiling-1-displays-1920x1080p,Fail
16+
kms_bw@linear-tiling-1-displays-3840x2160p,Fail
17+
kms_color@invalid-gamma-lut-sizes,Fail
18+
kms_flip@flip-vs-panning-vs-hang,Fail
19+
kms_flip@flip-vs-suspend,Fail
20+
kms_lease@lease-uevent,Fail
21+
kms_properties@plane-properties-atomic,Fail
22+
kms_rmfb@close-fd,Fail
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Board Name: mt8183-kukui-jacuzzi-juniper-sku16
2+
# Bug Report: https://lore.kernel.org/linux-mediatek/[email protected]/T/#u
3+
# Failure Rate: 100
4+
# IGT Version: 1.28-gf13702b8e
5+
# Linux Version: 6.10.0-rc5
6+
kms_bw@linear-tiling-1-displays-2560x1440p
7+
8+
# Board Name: mt8183-kukui-jacuzzi-juniper-sku16
9+
# Bug Report: https://lore.kernel.org/linux-mediatek/[email protected]/T/#u
10+
# Failure Rate: 100
11+
# IGT Version: 1.28-gf13702b8e
12+
# Linux Version: 6.10.0-rc5
13+
kms_cursor_legacy@cursor-vs-flip-atomic-transitions
14+
15+
# Board Name: mt8183-kukui-jacuzzi-juniper-sku16
16+
# Bug Report: https://lore.kernel.org/linux-mediatek/[email protected]/T/#u
17+
# Failure Rate: 100
18+
# IGT Version: 1.28-gf13702b8e
19+
# Linux Version: 6.10.0-rc5
20+
fbdev@write

drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
^amdgpu.*
33
^msm.*
44
nouveau_.*
5+
^panfrost.*
56
^v3d.*
67
^vc4.*
78
^vmwgfx*
@@ -11,9 +12,6 @@ gem_.*
1112
i915_.*
1213
tools_test.*
1314

14-
# Panfrost is not a KMS driver, so skip the KMS tests
15-
kms_.*
16-
1715
# Currently fails and causes coverage loss for other tests
1816
# since core_getversion also fails.
1917
core_hotunplug.*
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
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Skip driver specific tests
2+
^amdgpu.*
3+
^msm.*
4+
nouveau_.*
5+
^v3d.*
6+
^vc4.*
7+
^vmwgfx*
8+
9+
# Skip intel specific tests
10+
gem_.*
11+
i915_.*
12+
tools_test.*
13+
14+
# Panfrost is not a KMS driver, so skip the KMS tests
15+
kms_.*
16+
17+
# Skip display functionality tests for GPU-only drivers
18+
dumb_buffer.*
19+
fbdev.*
20+
21+
# Currently fails and causes coverage loss for other tests
22+
# since core_getversion also fails.
23+
core_hotunplug.*

0 commit comments

Comments
 (0)