drm/ci: add tests on vkms
Subsystems (4)
Vignesh Raman
maintainerPATCH v3 1/1 drm/ci: add tests on vkms
From: Helen Koike <[email protected]>
Add job that runs igt on top of vkms.
---
v2:
- do not mv modules to /lib/modules in the job definition, leave it to crosvm-runner.sh
v3:
- Enable CONFIG_DRM_VKMS in x86_64.config and update xfails
--- MAINTAINERS | 1 + drivers/gpu/drm/ci/gitlab-ci.yml | 1 + drivers/gpu/drm/ci/image-tags.yml | 4 +-- drivers/gpu/drm/ci/test.yml | 22 +++++++++++++ drivers/gpu/drm/ci/x86_64.config | 1 + drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 33 +++++++++++++++++++ .../gpu/drm/ci/xfails/vkms-none-flakes.txt | 9 +++++ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 14 ++++++++ 8 files changed, 83 insertions(+), 2 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
MAINTAINERS +1 -0
@@ -6922,6 +6922,7 @@ L: [email protected] S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/gpu/vkms.rst +F: drivers/gpu/drm/ci/xfails/vkms* F: drivers/gpu/drm/vkms/ DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
drivers/gpu/drm/ci/gitlab-ci.yml +1 -0
@@ -108,6 +108,7 @@ stages: - rockchip - virtio-gpu - lint + - software-driver # YAML anchors for rule conditions # --------------------------------
drivers/gpu/drm/ci/image-tags.yml +2 -2
@@ -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-02-vkms" KERNEL_ROOTFS_TAG: "2023-10-06-amd"
@@ -12,4 +12,4 @@ variables: DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl" DEBIAN_X86_64_TEST_GL_TAG: "${CONTAINER_TAG}" - ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}" + ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}"
drivers/gpu/drm/ci/test.yml +22 -0
@@ -337,3 +337,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
drivers/gpu/drm/ci/x86_64.config +1 -0
@@ -24,6 +24,7 @@ CONFIG_DRM=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_PWM_CROS_EC=y CONFIG_BACKLIGHT_PWM=y +CONFIG_DRM_VKMS=y # Strip out some stuff we don't need for graphics testing, to reduce # the build.
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt new file +33 -0
@@ -0,0 +1,33 @@ +kms_cursor_crc@cursor-rapid-movement-128x128,Fail +kms_cursor_crc@cursor-rapid-movement-128x42,Fail +kms_cursor_crc@cursor-rapid-movement-256x256,Fail +kms_cursor_crc@cursor-rapid-movement-256x85,Fail +kms_cursor_crc@cursor-rapid-movement-32x10,Fail +kms_cursor_crc@cursor-rapid-movement-32x32,Fail +kms_cursor_crc@cursor-rapid-movement-512x170,Fail +kms_cursor_crc@cursor-rapid-movement-512x512,Fail +kms_cursor_crc@cursor-rapid-movement-64x21,Fail +kms_cursor_crc@cursor-rapid-movement-64x64,Fail +kms_cursor_legacy@basic-flip-before-cursor-atomic,Fail +kms_cursor_legacy@basic-flip-before-cursor-legacy,Fail +kms_cursor_legacy@cursor-vs-flip-atomic,Fail +kms_cursor_legacy@cursor-vs-flip-legacy,Fail +kms_cursor_legacy@cursor-vs-flip-toggle,Fail +kms_cursor_legacy@cursor-vs-flip-varying-size,Fail +kms_cursor_legacy@cursorA-vs-flipA-legacy,Fail +kms_cursor_legacy@flip-vs-cursor-atomic,Fail +kms_cursor_legacy@flip-vs-cursor-crc-atomic,Fail +kms_cursor_legacy@flip-vs-cursor-crc-legacy,Fail +kms_cursor_legacy@flip-vs-cursor-legacy,Fail +kms_flip@flip-vs-modeset-vs-hang,Fail +kms_flip@flip-vs-panning-vs-hang,Fail +kms_pipe_crc_basic@nonblocking-crc,Fail +kms_pipe_crc_basic@nonblocking-crc-frame-sequence,Fail +kms_pipe_crc_basic@suspend-read-crc,Fail +kms_plane@plane-panning-bottom-right-suspend,Fail +kms_universal_plane@universal-plane-pipe-A-sanity,Fail +kms_vblank@pipe-A-ts-continuation-dpms-suspend,Fail +kms_writeback@writeback-check-output,Fail +kms_writeback@writeback-fb-id,Fail +kms_writeback@writeback-invalid-parameters,Fail +kms_writeback@writeback-pixel-formats,Fail
drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt new file +9 -0
@@ -0,0 +1,9 @@ +# Board Name: vkms +# Bug Report: https://lore.kernel.org/dri-devel/[email protected]/T/#u +# IGT Version: 1.28-gd2af13d9f +# Linux Version: 6.7.0-rc3 +# Failure Rate: 50 + +# Reported by deqp-runner +kms_cursor_legacy@cursorA-vs-flipA-legacy +kms_cursor_legacy@cursorA-vs-flipA-varying-size
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt new file +14 -0
@@ -0,0 +1,14 @@ +# 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@invalid-get-prop + +# keeps printing vkms_vblank_simulate: vblank timer overrun and never ends +kms_invalid_mode@int-max-clock + +# Suspend seems to be broken +.*suspend.* + +# Hangs machine and timeout occurs +kms_flip@flip-vs-absolute-wf_vblank-interruptible +kms_invalid_mode@zero-hdisplay
Signature · 1 line
2.40.1
Hi,
Thanks for picking this up.
Quoted 49 lines · Vignesh Raman
From: Helen Koike <[email protected]>
Add job that runs igt on top of vkms.
Signed-off-by Vignesh Raman <[email protected]>Acked-by Jessica Zhang <[email protected]>Tested-by Jessica Zhang <[email protected]>Acked-by Maxime Ripard <[email protected]>Signed-off-by Helen Koike <[email protected]>---
v2:
- do not mv modules to/lib/modulesin the job definition, leave it tocrosvm-runner.shv3:
- EnableCONFIG_DRM_VKMSin x86_64.config and update xfails--- MAINTAINERS | 1 + drivers/gpu/drm/ci/gitlab-ci.yml | 1 + drivers/gpu/drm/ci/image-tags.yml | 4 +-- drivers/gpu/drm/ci/test.yml | 22 +++++++++++++ drivers/gpu/drm/ci/x86_64.config | 1 + drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 33 +++++++++++++++++++ .../gpu/drm/ci/xfails/vkms-none-flakes.txt | 9 +++++ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 14 ++++++++ 8 files changed, 83 insertions(+), 2 deletions(-)create mode 100644
drivers/gpu/drm/ci/xfails/vkms-none-fails.txtcreate mode 100644drivers/gpu/drm/ci/xfails/vkms-none-flakes.txtcreate mode 100644drivers/gpu/drm/ci/xfails/vkms-none-skips.txtMAINTAINERS +1
-0@@ -6922,6 +6922,7 @@ L: [email protected] S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/gpu/vkms.rst +F: drivers/gpu/drm/ci/xfails/vkms* F: drivers/gpu/drm/vkms/ DRM DRIVER FOR VIRTUALBOX VIRTUAL GPUdrivers/gpu/drm/ci/gitlab-ci.yml +0
-0
drivers/gpu/drm/ci/gitlab-ci.yml stages: · line 111
Quoted 4 lines
drivers/gpu/drm/ci/gitlab-ci.yml +1
-0@@ -108,6 +108,7 @@ stages: - rockchip - virtio-gpu - lint + - software-driver
I had created this new stage with the intention to also move virtio-gpu to it, so we can patch all "non-real" hardware, what do you think?
Quoted 58 lines
drivers/gpu/drm/ci/gitlab-ci.yml +0
-0# YAML anchors for rule conditions # --------------------------------drivers/gpu/drm/ci/image-tags.yml +2
-2@@ -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-02-vkms" KERNEL_ROOTFS_TAG: "2023-10-06-amd"@@ -12,4 +12,4 @@ variables: DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl" DEBIAN_X86_64_TEST_GL_TAG: "${CONTAINER_TAG}" - ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}" + ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}"drivers/gpu/drm/ci/test.yml +22
-0@@ -337,3 +337,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_64drivers/gpu/drm/ci/x86_64.config +0
-0
drivers/gpu/drm/ci/x86_64.config CONFIG_DRM=y · line 27
Quoted 4 lines
drivers/gpu/drm/ci/x86_64.config +1
-0@@ -24,6 +24,7 @@ CONFIG_DRM=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_PWM_CROS_EC=y CONFIG_BACKLIGHT_PWM=y +CONFIG_DRM_VKMS=y
I was wondering if this wouldn't get in the way of other tests, but I guess IGT_FORCE_DRIVER can handle, we just need to make sure it is set and we are testing the correct one.
Thanks
Helen
Quoted 77 lines
drivers/gpu/drm/ci/x86_64.config +0
-0# Strip out some stuff we don't need for graphics testing, to reduce # the build.drivers/gpu/drm/ci/xfails/vkms-none-fails.txt new file +33
-0@@ -0,0 +1,33 @@ +kms_cursor_crc@cursor-rapid-movement-128x128,Fail +kms_cursor_crc@cursor-rapid-movement-128x42,Fail +kms_cursor_crc@cursor-rapid-movement-256x256,Fail +kms_cursor_crc@cursor-rapid-movement-256x85,Fail +kms_cursor_crc@cursor-rapid-movement-32x10,Fail +kms_cursor_crc@cursor-rapid-movement-32x32,Fail +kms_cursor_crc@cursor-rapid-movement-512x170,Fail +kms_cursor_crc@cursor-rapid-movement-512x512,Fail +kms_cursor_crc@cursor-rapid-movement-64x21,Fail +kms_cursor_crc@cursor-rapid-movement-64x64,Fail +kms_cursor_legacy@basic-flip-before-cursor-atomic,Fail +kms_cursor_legacy@basic-flip-before-cursor-legacy,Fail +kms_cursor_legacy@cursor-vs-flip-atomic,Fail +kms_cursor_legacy@cursor-vs-flip-legacy,Fail +kms_cursor_legacy@cursor-vs-flip-toggle,Fail +kms_cursor_legacy@cursor-vs-flip-varying-size,Fail +kms_cursor_legacy@cursorA-vs-flipA-legacy,Fail +kms_cursor_legacy@flip-vs-cursor-atomic,Fail +kms_cursor_legacy@flip-vs-cursor-crc-atomic,Fail +kms_cursor_legacy@flip-vs-cursor-crc-legacy,Fail +kms_cursor_legacy@flip-vs-cursor-legacy,Fail +kms_flip@flip-vs-modeset-vs-hang,Fail +kms_flip@flip-vs-panning-vs-hang,Fail +kms_pipe_crc_basic@nonblocking-crc,Fail +kms_pipe_crc_basic@nonblocking-crc-frame-sequence,Fail +kms_pipe_crc_basic@suspend-read-crc,Fail +kms_plane@plane-panning-bottom-right-suspend,Fail +kms_universal_plane@universal-plane-pipe-A-sanity,Fail +kms_vblank@pipe-A-ts-continuation-dpms-suspend,Fail +kms_writeback@writeback-check-output,Fail +kms_writeback@writeback-fb-id,Fail +kms_writeback@writeback-invalid-parameters,Fail +kms_writeback@writeback-pixel-formats,Faildrivers/gpu/drm/ci/xfails/vkms-none-flakes.txt new file +9
-0@@ -0,0 +1,9 @@ +# Board Name: vkms +# Bug Report: https://lore.kernel.org/dri-devel/[email protected]/T/#u +# IGT Version: 1.28-gd2af13d9f +# Linux Version: 6.7.0-rc3 +# Failure Rate: 50 + +# Reported by deqp-runner +kms_cursor_legacy@cursorA-vs-flipA-legacy +kms_cursor_legacy@cursorA-vs-flipA-varying-sizedrivers/gpu/drm/ci/xfails/vkms-none-skips.txt new file +14
-0@@ -0,0 +1,14 @@ +# 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@invalid-get-prop + +# keeps printing vkms_vblank_simulate: vblank timer overrun and never ends +kms_invalid_mode@int-max-clock + +# Suspend seems to be broken +.*suspend.* + +# Hangs machine and timeout occurs +kms_flip@flip-vs-absolute-wf_vblank-interruptible +kms_invalid_mode@zero-hdisplay
Vignesh Raman
maintainerHi Helen,
Quoted 11 lines · Helen Koike
Quoted 9 lines
drivers/gpu/drm/ci/gitlab-ci.yml +0
-0@@ -108,6 +108,7 @@ stages:- rockchip
- virtio-gpu
- lint
+ - software-driverI had created this new stage with the intention to also move virtio-gpu to it, so we can patch all "non-real" hardware, what do you think?
Yes we can move virtio-gpu job also to software-driver stage.
Quoted 11 lines
Quoted 9 lines
drivers/gpu/drm/ci/x86_64.config +0
-0@@ -24,6 +24,7 @@ CONFIG_DRM=y
CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_PWM_CROS_EC=y
CONFIG_BACKLIGHT_PWM=y
+CONFIG_DRM_VKMS=yI was wondering if this wouldn't get in the way of other tests, but I guess
IGT_FORCE_DRIVERcan handle, we just need to make sure it is set and we are testing the correct one.
Yes, we need to skip the vkms tests for other drivers. I think we can go with your modprobe approach. We need kmod in debian/x86_64_test-gl container to get it working. I have created a MR in mesa for this.
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27088
Once this is merged, will uprev mesa in drm-ci and send updated vkms patch.
Thanks.
Regards,
Vignesh