[PATCH v4 11/11] drm/ci: add tests on vkms
Vignesh Raman
vignesh.raman at collabora.com
Tue Mar 5 19:06:49 PST 2024
Add job that runs igt on top of vkms.
Signed-off-by: Vignesh Raman <vignesh.raman at collabora.com>
Acked-by: Jessica Zhang <quic_jesszhan at quicinc.com>
Tested-by: Jessica Zhang <quic_jesszhan at quicinc.com>
Acked-by: Maxime Ripard <mripard at kernel.org>
Signed-off-by: Helen Koike <helen.koike at collabora.com>
---
v4:
- New patch in the series.
https://lore.kernel.org/lkml/20240201065346.801038-1-vignesh.raman@collabora.com/
---
MAINTAINERS | 2 ++
drivers/gpu/drm/ci/build.sh | 1 -
drivers/gpu/drm/ci/gitlab-ci.yml | 3 +-
drivers/gpu/drm/ci/igt_runner.sh | 6 ++--
drivers/gpu/drm/ci/image-tags.yml | 2 +-
drivers/gpu/drm/ci/test.yml | 24 +++++++++++++-
drivers/gpu/drm/ci/x86_64.config | 1 +
.../drm/ci/xfails/virtio_gpu-none-fails.txt | 1 -
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 33 +++++++++++++++++++
.../gpu/drm/ci/xfails/vkms-none-flakes.txt | 20 +++++++++++
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 16 +++++++++
11 files changed, 101 insertions(+), 8 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt
create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt
create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt
diff --git a/MAINTAINERS b/MAINTAINERS
index 264b23108847..c38d2555cedc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6964,6 +6964,8 @@ L: dri-devel at lists.freedesktop.org
S: Maintained
T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/gpu/vkms.rst
+F: drivers/gpu/drm/ci/testlist.txt
+F: drivers/gpu/drm/ci/xfails/vkms*
F: drivers/gpu/drm/vkms/
DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 106f2d40d222..4342872de45f 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -155,7 +155,6 @@ fi
mkdir -p artifacts/install/lib
mv install/* artifacts/install/.
-rm -rf artifacts/install/modules
ln -s common artifacts/install/ci-common
cp .config artifacts/${CI_JOB_NAME}_config
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 9dae74465ce1..b98e56170561 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -110,6 +110,7 @@ stages:
- panfrost
- powervr
- virtio-gpu
+ - software-driver
# YAML anchors for rule conditions
# --------------------------------
@@ -264,4 +265,4 @@ sanity:
# Jobs that need to pass before spending hardware resources on further testing
.required-for-hardware-jobs:
- needs: []
\ No newline at end of file
+ needs: []
diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index 711f32772e48..81f66f1687a4 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -20,10 +20,10 @@ cat /sys/kernel/debug/dri/*/state
set -e
case "$DRIVER_NAME" in
- amdgpu)
+ 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/.
- modprobe amdgpu
+ mv /install/modules/lib/modules/* /lib/modules/. || true
+ modprobe --first-time $DRIVER_NAME
;;
esac
diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml
index cf07c3e09b8c..bf861ab8b9c2 100644
--- a/drivers/gpu/drm/ci/image-tags.yml
+++ b/drivers/gpu/drm/ci/image-tags.yml
@@ -4,7 +4,7 @@ variables:
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
- DEBIAN_BUILD_TAG: "2023-10-08-config"
+ DEBIAN_BUILD_TAG: "2024-01-29-vkms"
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
PKG_REPO_REV: "67f2c46b"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index ac8e974723a5..f517f8ee248e 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -407,7 +407,7 @@ panfrost:g12b:
DRIVER_NAME: panfrost
virtio_gpu:none:
- stage: virtio-gpu
+ stage: software-driver
variables:
CROSVM_GALLIUM_DRIVER: llvmpipe
DRIVER_NAME: virtio_gpu
@@ -427,3 +427,25 @@ virtio_gpu:none:
- debian/x86_64_test-gl
- testing:x86_64
- igt:x86_64
+
+vkms:none:
+ stage: software-driver
+ variables:
+ DRIVER_NAME: vkms
+ GPU_VERSION: none
+ extends:
+ - .test-gl
+ - .test-rules
+ tags:
+ - kvm
+ script:
+ - ln -sf $CI_PROJECT_DIR/install /install
+ - mv install/bzImage /lava-files/bzImage
+ - mkdir -p /lib/modules
+ - mkdir -p $CI_PROJECT_DIR/results
+ - ln -sf $CI_PROJECT_DIR/results /results
+ - ./install/crosvm-runner.sh ./install/igt_runner.sh
+ needs:
+ - debian/x86_64_test-gl
+ - testing:x86_64
+ - igt:x86_64
diff --git a/drivers/gpu/drm/ci/x86_64.config b/drivers/gpu/drm/ci/x86_64.config
index 1cbd49a5b23a..8eaba388b141 100644
--- a/drivers/gpu/drm/ci/x86_64.config
+++ b/drivers/gpu/drm/ci/x86_64.config
@@ -24,6 +24,7 @@ CONFIG_DRM=y
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_PWM_CROS_EC=y
CONFIG_BACKLIGHT_PWM=y
+CONFIG_DRM_VKMS=m
# Strip out some stuff we don't need for graphics testing, to reduce
# the build.
diff --git a/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
index 007f21e56d89..f82d437909b5 100644
--- a/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt
@@ -41,7 +41,6 @@ kms_flip at flip-vs-absolute-wf_vblank,Fail
kms_flip at flip-vs-absolute-wf_vblank-interruptible,Fail
kms_flip at flip-vs-blocking-wf-vblank,Fail
kms_flip at flip-vs-expired-vblank,Fail
-kms_flip at flip-vs-expired-vblank-interruptible,Fail
kms_flip at flip-vs-modeset-vs-hang,Fail
kms_flip at flip-vs-panning-vs-hang,Fail
kms_flip at flip-vs-wf_vblank-interruptible,Fail
diff --git a/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt
new file mode 100644
index 000000000000..ef6101d2c356
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt
@@ -0,0 +1,33 @@
+kms_cursor_crc at cursor-rapid-movement-128x128,Fail
+kms_cursor_crc at cursor-rapid-movement-128x42,Fail
+kms_cursor_crc at cursor-rapid-movement-256x256,Fail
+kms_cursor_crc at cursor-rapid-movement-256x85,Fail
+kms_cursor_crc at cursor-rapid-movement-32x10,Fail
+kms_cursor_crc at cursor-rapid-movement-32x32,Fail
+kms_cursor_crc at cursor-rapid-movement-512x170,Fail
+kms_cursor_crc at cursor-rapid-movement-512x512,Fail
+kms_cursor_crc at cursor-rapid-movement-64x21,Fail
+kms_cursor_crc at cursor-rapid-movement-64x64,Fail
+kms_cursor_legacy at basic-flip-before-cursor-atomic,Fail
+kms_cursor_legacy at basic-flip-before-cursor-legacy,Fail
+kms_cursor_legacy at cursor-vs-flip-atomic,Fail
+kms_cursor_legacy at cursor-vs-flip-legacy,Fail
+kms_cursor_legacy at cursor-vs-flip-toggle,Fail
+kms_cursor_legacy at cursor-vs-flip-varying-size,Fail
+kms_cursor_legacy at flip-vs-cursor-atomic,Fail
+kms_cursor_legacy at flip-vs-cursor-crc-atomic,Fail
+kms_cursor_legacy at flip-vs-cursor-crc-legacy,Fail
+kms_cursor_legacy at flip-vs-cursor-legacy,Fail
+kms_flip at flip-vs-modeset-vs-hang,Fail
+kms_flip at flip-vs-panning-vs-hang,Fail
+kms_pipe_crc_basic at nonblocking-crc,Fail
+kms_pipe_crc_basic at nonblocking-crc-frame-sequence,Fail
+kms_pipe_crc_basic at suspend-read-crc,Fail
+kms_plane at plane-panning-bottom-right-suspend,Fail
+kms_universal_plane at universal-plane-pipe-A-sanity,Fail
+kms_universal_plane at universal-plane-sanity,Fail
+kms_vblank at pipe-A-ts-continuation-dpms-suspend,Fail
+kms_writeback at writeback-check-output,Fail
+kms_writeback at writeback-fb-id,Fail
+kms_writeback at writeback-invalid-parameters,Fail
+kms_writeback at writeback-pixel-formats,Fail
diff --git a/drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt b/drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt
new file mode 100644
index 000000000000..7b52dab45457
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt
@@ -0,0 +1,20 @@
+# Board Name: vkms
+# Bug Report: https://lore.kernel.org/dri-devel/005da8f1-8050-bffd-653c-2a87ae6376f7@collabora.com/T/#u
+# IGT Version: 1.28-gb0cc8160e
+# Linux Version: 6.7.0-rc3
+# Failure Rate: 50
+
+# Reported by deqp-runner
+kms_cursor_legacy at cursorA-vs-flipA-legacy
+kms_cursor_legacy at cursorA-vs-flipA-varying-size
+kms_flip at flip-vs-expired-vblank-interruptible
+kms_flip at flip-vs-expired-vblank
+kms_flip at plain-flip-fb-recreate
+kms_flip at plain-flip-fb-recreate-interruptible
+kms_flip at plain-flip-ts-check-interruptible
+
+# The below test shows inconsistency across multiple runs,
+# giving results of Pass and Fail alternately.
+kms_cursor_legacy at cursorA-vs-flipA-toggle
+kms_pipe_crc_basic at nonblocking-crc
+kms_flip at plain-flip-ts-check
diff --git a/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt b/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt
new file mode 100644
index 000000000000..524e7972c75a
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt
@@ -0,0 +1,16 @@
+# Hits:
+# rcu: INFO: rcu_preempt detected stalls on CPUs/tasks:
+# rcu: Tasks blocked on level-0 rcu_node (CPUs 0-1): P749/1:b..l
+kms_prop_blob at invalid-get-prop
+
+# keeps printing vkms_vblank_simulate: vblank timer overrun and never ends
+kms_invalid_mode at int-max-clock
+
+# Suspend seems to be broken
+.*suspend.*
+
+# Hangs machine and timeout occurs
+kms_flip at flip-vs-absolute-wf_vblank-interruptible
+kms_invalid_mode at zero-hdisplay
+kms_invalid_mode at bad-vtotal
+kms_cursor_crc.*
--
2.40.1
More information about the Linux-rockchip
mailing list