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

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: 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-7-vignesh.raman@collabora.com
parent a0ac33cb

drivers/gpu/drm/ci/igt_runner.sh

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ cat /sys/kernel/debug/dri/*/state 
set -e



case "$DRIVER_NAME" in

    rockchip)

        export IGT_FORCE_DRIVER="panfrost"

        ;;

    amdgpu|vkms)

        # Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib

        mv /install/modules/lib/modules/* /lib/modules/. || true

drivers/gpu/drm/ci/test.yml

+36 −12
Original line number Diff line number Diff line
@@ -160,33 +160,57 @@ msm:sdm845: 
  script:

    - ./install/bare-metal/cros-servo.sh



rockchip:rk3288:

  extends:

    - .lava-igt:arm32

.rockchip-device:

  variables:

    DTB: ${DEVICE_TYPE}

    BOOT_METHOD: depthcharge



.rockchip-display:

  stage: rockchip

  variables:

    DRIVER_NAME: rockchip



.rk3288:

  extends:

    - .lava-igt:arm32

    - .rockchip-device

  variables:

    DEVICE_TYPE: rk3288-veyron-jaq

    DTB: ${DEVICE_TYPE}

    BOOT_METHOD: depthcharge

    KERNEL_IMAGE_TYPE: "zimage"

    GPU_VERSION: rk3288

    KERNEL_IMAGE_TYPE: "zimage"

    RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq



rockchip:rk3399:

.rk3399:

  extends:

    - .lava-igt:arm64

  stage: rockchip

    - .rockchip-device

  parallel: 2

  variables:

    DRIVER_NAME: rockchip

    DEVICE_TYPE: rk3399-gru-kevin

    DTB: ${DEVICE_TYPE}

    BOOT_METHOD: depthcharge

    KERNEL_IMAGE_TYPE: ""

    GPU_VERSION: rk3399

    KERNEL_IMAGE_TYPE: ""

    RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin



rockchip:rk3288:

  extends:

    - .rk3288

    - .rockchip-display



panfrost:rk3288:

  extends:

    - .rk3288

    - .panfrost-gpu



rockchip:rk3399:

  extends:

    - .rk3399

    - .rockchip-display



panfrost:rk3399:

  extends:

    - .rk3399

    - .panfrost-gpu



.i915:

  extends:

    - .lava-igt:x86_64

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

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

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
# Suspend to RAM seems to be broken on this machine

.*suspend.*



# Skip driver specific tests

^amdgpu.*

^msm.*

nouveau_.*

^v3d.*

^vc4.*

^vmwgfx*



# Skip intel specific tests

gem_.*

i915_.*

tools_test.*



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

kms_.*



# Skip display functionality tests for GPU-only drivers

dumb_buffer.*

fbdev.*



# Currently fails and causes coverage loss for other tests

# since core_getversion also fails.

core_hotunplug.*

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

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