[PATCH v7 4/5] drm/ci: meson: add tests for meson display driver

Fri Jul 12 03:14:24 PDT 2024

On 12/07/2024 11:15, Vignesh Raman wrote:
> 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.
> 
> Signed-off-by: Vignesh Raman <vignesh.raman at collabora.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.
> 
> v4:
>    - Remove the display suffix in job and rename xfails accordingly.
>      Remove the change adding job name in GPU_VERSION.
> 
> v5:
>    - Add meson-display job.
> 
> v6:
>    - Squash commits for display and gpu driver testing. Reword the commit message.
> 
> v7:
>    - Rebase with recent drm-ci fixes and retest with latest IGT.
> 
> ---
>   drivers/gpu/drm/ci/igt_runner.sh              |  2 +-
>   drivers/gpu/drm/ci/test.yml                   | 23 +++++++++++++++----
>   .../gpu/drm/ci/xfails/meson-g12b-fails.txt    | 18 ++++++++++-----
>   .../gpu/drm/ci/xfails/meson-g12b-skips.txt    |  4 +---
>   .../gpu/drm/ci/xfails/panfrost-g12b-fails.txt |  8 +++++++
>   .../gpu/drm/ci/xfails/panfrost-g12b-skips.txt | 18 +++++++++++++++
>   6 files changed, 58 insertions(+), 15 deletions(-)
>   create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt
>   create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt
> 
> diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
> index 6193865f23a3..1578a2a47a54 100755
> --- a/drivers/gpu/drm/ci/igt_runner.sh
> +++ b/drivers/gpu/drm/ci/igt_runner.sh
> @@ -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)
> diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
> index 86875fb96eb5..5ccf57b3bf91 100644
> --- a/drivers/gpu/drm/ci/test.yml
> +++ b/drivers/gpu/drm/ci/test.yml
> @@ -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:
> diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
> index 5b7d623f404b..53c5c91db5bb 100644
> --- a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
> +++ b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
> @@ -1,8 +1,14 @@
> -dumb_buffer at create-clear,Fail
> -dumb_buffer at create-valid-dumb,Fail
>   dumb_buffer at invalid-bpp,Fail
> -dumb_buffer at map-invalid-size,Fail
> -dumb_buffer at map-uaf,Fail
> -dumb_buffer at map-valid,Fail
> -panfrost/panfrost_prime at gem-prime-import,Fail
> +kms_3d,Fail
> +kms_cursor_legacy at forked-bo,Fail
> +kms_cursor_legacy at forked-move,Fail
> +kms_cursor_legacy at single-bo,Fail
> +kms_cursor_legacy at single-move,Fail
> +kms_cursor_legacy at torture-bo,Fail
> +kms_cursor_legacy at torture-move,Fail
> +kms_lease at lease-uevent,Fail
> +kms_properties at connector-properties-atomic,Fail
> +kms_properties at connector-properties-legacy,Fail
> +kms_properties at get_properties-sanity-atomic,Fail
> +kms_properties at get_properties-sanity-non-atomic,Fail
>   tools_test at tools_test,Fail
> diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt b/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
> index 03eefa518afa..562662eff802 100644
> --- a/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
> +++ b/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
> @@ -2,6 +2,7 @@
>   ^amdgpu.*
>   ^msm.*
>   nouveau_.*
> +^panfrost.*
>   ^v3d.*
>   ^vc4.*
>   ^vmwgfx*
> @@ -10,9 +11,6 @@ nouveau_.*
>   gem_.*
>   i915_.*
>   
> -# 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.*
> diff --git a/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt
> new file mode 100644
> index 000000000000..5b7d623f404b
> --- /dev/null
> +++ b/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt
> @@ -0,0 +1,8 @@
> +dumb_buffer at create-clear,Fail
> +dumb_buffer at create-valid-dumb,Fail
> +dumb_buffer at invalid-bpp,Fail
> +dumb_buffer at map-invalid-size,Fail
> +dumb_buffer at map-uaf,Fail
> +dumb_buffer at map-valid,Fail
> +panfrost/panfrost_prime at gem-prime-import,Fail
> +tools_test at tools_test,Fail
> diff --git a/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt
> new file mode 100644
> index 000000000000..03eefa518afa
> --- /dev/null
> +++ b/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt
> @@ -0,0 +1,18 @@
> +# Skip driver specific tests
> +^amdgpu.*
> +^msm.*
> +nouveau_.*
> +^v3d.*
> +^vc4.*
> +^vmwgfx*
> +
> +# Skip intel specific tests
> +gem_.*
> +i915_.*
> +
> +# 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.*

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>