Skip to content

Commit a0ac33c

Browse files
vigneshramanHelen Koike
authored andcommitted
drm/ci: meson: add tests for meson display driver
For Amlogic Meson G12B (A311D) SOC the display driver is meson and gpu driver is panfrost. Currently, in drm-ci for Meson G12B (A311D), only the gpu driver is tested. Refactor the existing meson jobs and add support in drm-ci to test both display and gpu driver for Amlogic Meson G12B (A311D) 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 meson 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 d7683c4 commit a0ac33c

File tree

6 files changed

+56
-15
lines changed

6 files changed

+56
-15
lines changed

drivers/gpu/drm/ci/igt_runner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cat /sys/kernel/debug/dri/*/state
2020
set -e
2121

2222
case "$DRIVER_NAME" in
23-
rockchip|meson)
23+
rockchip)
2424
export IGT_FORCE_DRIVER="panfrost"
2525
;;
2626
amdgpu|vkms)

drivers/gpu/drm/ci/test.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,25 +356,38 @@ panfrost:mt8183:
356356
GPU_VERSION: mt8192
357357
RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0
358358

359-
.meson:
359+
.meson-device:
360360
extends:
361361
- .lava-igt:arm64
362-
stage: meson
363362
variables:
364-
DRIVER_NAME: meson
365363
DTB: ${DEVICE_TYPE}
366364
BOOT_METHOD: u-boot
367365
KERNEL_IMAGE_TYPE: "image"
368366

369-
meson:g12b:
367+
.meson-display:
368+
stage: meson
369+
variables:
370+
DRIVER_NAME: meson
371+
372+
.g12b:
370373
extends:
371-
- .meson
374+
- .meson-device
372375
parallel: 3
373376
variables:
374377
DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
375378
GPU_VERSION: g12b
376379
RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
377380

381+
meson:g12b:
382+
extends:
383+
- .g12b
384+
- .meson-display
385+
386+
panfrost:g12b:
387+
extends:
388+
- .g12b
389+
- .panfrost-gpu
390+
378391
virtio_gpu:none:
379392
stage: software-driver
380393
variables:
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
dumb_buffer@create-clear,Fail
2-
dumb_buffer@create-valid-dumb,Fail
31
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
2+
kms_3d,Fail
3+
kms_cursor_legacy@forked-bo,Fail
4+
kms_cursor_legacy@forked-move,Fail
5+
kms_cursor_legacy@single-bo,Fail
6+
kms_cursor_legacy@single-move,Fail
7+
kms_cursor_legacy@torture-bo,Fail
8+
kms_cursor_legacy@torture-move,Fail
9+
kms_lease@lease-uevent,Fail
10+
kms_properties@connector-properties-atomic,Fail
11+
kms_properties@connector-properties-legacy,Fail
12+
kms_properties@get_properties-sanity-atomic,Fail
13+
kms_properties@get_properties-sanity-non-atomic,Fail

drivers/gpu/drm/ci/xfails/meson-g12b-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)