Commit a0ac33cb authored by Vignesh Raman's avatar Vignesh Raman Committed by Helen Koike
Browse files

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: default avatarHelen Koike <helen.koike@collabora.com>
Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
Signed-off-by: default avatarVignesh Raman <vignesh.raman@collabora.com>
Signed-off-by: default avatarHelen Koike <helen.koike@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240730021545.912271-6-vignesh.raman@collabora.com
parent d7683c49

drivers/gpu/drm/ci/igt_runner.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cat /sys/kernel/debug/dri/*/state 
set -e



case "$DRIVER_NAME" in

    rockchip|meson)

    rockchip)

        export IGT_FORCE_DRIVER="panfrost"

        ;;

    amdgpu|vkms)

drivers/gpu/drm/ci/test.yml

+18 −5
Original line number Diff line number Diff line
@@ -356,25 +356,38 @@ panfrost:mt8183: 
    GPU_VERSION: mt8192

    RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0



.meson:

.meson-device:

  extends:

    - .lava-igt:arm64

  stage: meson

  variables:

    DRIVER_NAME: meson

    DTB: ${DEVICE_TYPE}

    BOOT_METHOD: u-boot

    KERNEL_IMAGE_TYPE: "image"



meson:g12b:

.meson-display:

  stage: meson

  variables:

    DRIVER_NAME: meson



.g12b:

  extends:

    - .meson

    - .meson-device

  parallel: 3

  variables:

    DEVICE_TYPE: meson-g12b-a311d-khadas-vim3

    GPU_VERSION: g12b

    RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3



meson:g12b:

  extends:

    - .g12b

    - .meson-display



panfrost:g12b:

  extends:

    - .g12b

    - .panfrost-gpu



virtio_gpu:none:

  stage: software-driver

  variables:

drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt

+12 −6
Original line number Diff line number Diff line 
dumb_buffer@create-clear,Fail

dumb_buffer@create-valid-dumb,Fail

dumb_buffer@invalid-bpp,Fail

dumb_buffer@map-invalid-size,Fail

dumb_buffer@map-uaf,Fail

dumb_buffer@map-valid,Fail

panfrost/panfrost_prime@gem-prime-import,Fail
 
kms_3d,Fail

kms_cursor_legacy@forked-bo,Fail

kms_cursor_legacy@forked-move,Fail

kms_cursor_legacy@single-bo,Fail

kms_cursor_legacy@single-move,Fail

kms_cursor_legacy@torture-bo,Fail

kms_cursor_legacy@torture-move,Fail

kms_lease@lease-uevent,Fail

kms_properties@connector-properties-atomic,Fail

kms_properties@connector-properties-legacy,Fail

kms_properties@get_properties-sanity-atomic,Fail

kms_properties@get_properties-sanity-non-atomic,Fail

drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt

+1 −3
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
^amdgpu.*

^msm.*

nouveau_.*

^panfrost.*

^v3d.*

^vc4.*

^vmwgfx*
@@ -11,9 +12,6 @@ gem_.* 
i915_.*

tools_test.*



# Panfrost is not a KMS driver, so skip the KMS tests

kms_.*



# Currently fails and causes coverage loss for other tests

# since core_getversion also fails.

core_hotunplug.*

drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
panfrost/panfrost_prime@gem-prime-import,Fail