Skip to contentSkip to conversation

drm/ci: add tests on vkms

PATCH Superseded Vignesh Raman 3 participants 5 messages Feb 1, 2024 – Feb 19, 2024

Subsystems (5)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Vignesh Raman

author maintainer
#0 lore raw

PATCH v4 1/1 drm/ci: add tests on vkms

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

v3:
- Build vkms as module and test with latest IGT.
This patch depends on https://lore.kernel.org/dri-devel/[email protected]/

---
 MAINTAINERS                                   |  1 +
 drivers/gpu/drm/ci/build.sh                   |  1 -
 drivers/gpu/drm/ci/gitlab-ci.yml              |  2 +-
 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 | 32 +++++++++++++++++++
 .../gpu/drm/ci/xfails/vkms-none-flakes.txt    | 19 +++++++++++
 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 16 ++++++++++
 11 files changed, 97 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
MAINTAINERS +1 -0
index bcdc17d1aa26..09310a6f4b5f 100644
@@ -6923,6 +6923,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/build.sh +0 -1
index 331a61e0d25a..2e089e03f061 100644
@@ -152,7 +152,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
 
drivers/gpu/drm/ci/gitlab-ci.yml +1 -1
index e2b021616a8e..c69fb6af4cf8 100644
@@ -107,7 +107,7 @@ stages:
   - meson
   - msm
   - rockchip
-  - virtio-gpu
+  - software-driver
 
 # YAML anchors for rule conditions
 # --------------------------------
drivers/gpu/drm/ci/igt_runner.sh +3 -3
index 2fd09b9b7cf6..3c7f000805e5 100755
@@ -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
 
drivers/gpu/drm/ci/image-tags.yml +1 -1
index cf07c3e09b8c..bf861ab8b9c2 100644
@@ -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"
drivers/gpu/drm/ci/test.yml +23 -1
index 8ab8a8f56d6a..58c3cf4b18e0 100644
@@ -399,7 +399,7 @@ meson:g12b-display:
     DRIVER_NAME: meson
 
 virtio_gpu:none:
-  stage: virtio-gpu
+  stage: software-driver
   variables:
     CROSVM_GALLIUM_DRIVER: llvmpipe
     DRIVER_NAME: virtio_gpu
@@ -419,3 +419,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: vkms-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
index 1cbd49a5b23a..8eaba388b141 100644
@@ -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.
drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt +0 -1
index 007f21e56d89..f82d437909b5 100644
@@ -41,7 +41,6 @@ kms_flip@flip-vs-absolute-wf_vblank,Fail
 kms_flip@flip-vs-absolute-wf_vblank-interruptible,Fail
 kms_flip@flip-vs-blocking-wf-vblank,Fail
 kms_flip@flip-vs-expired-vblank,Fail
-kms_flip@flip-vs-expired-vblank-interruptible,Fail
 kms_flip@flip-vs-modeset-vs-hang,Fail
 kms_flip@flip-vs-panning-vs-hang,Fail
 kms_flip@flip-vs-wf_vblank-interruptible,Fail
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt new file +32 -0
new file mode 100644
index 000000000000..a8b9d79d9a16
@@ -0,0 +1,32 @@
+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@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 +19 -0
new file mode 100644
index 000000000000..18afbfcc1c52
@@ -0,0 +1,19 @@
+# Board Name: vkms
+# Bug Report: https://lore.kernel.org/dri-devel/[email protected]/T/#u
+# IGT Version: 1.28-gb0cc8160e
+# 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
+kms_flip@flip-vs-expired-vblank-interruptible
+kms_flip@flip-vs-expired-vblank
+kms_flip@plain-flip-fb-recreate
+kms_flip@plain-flip-fb-recreate-interruptible
+kms_flip@plain-flip-ts-check-interruptible
+
+# The below test shows inconsistency across multiple runs,
+# giving results of Pass and Fail alternately.
+kms_cursor_legacy@cursorA-vs-flipA-toggle
+kms_pipe_crc_basic@nonblocking-crc
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt new file +16 -0
new file mode 100644
index 000000000000..524e7972c75a
@@ -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@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
+kms_invalid_mode@bad-vtotal
+kms_cursor_crc.*
Signature · 1 line
2.40.1
#1 lore raw
Quoted 13 lines · Vignesh Raman

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

Quoted 7 lines

v3:
- Enable CONFIG_DRM_VKMS in x86_64.config and update xfails

v3:
- Build vkms as module and test with latest IGT.
This patch depends on https://lore.kernel.org/dri-devel/[email protected]/

Do you have a link of a pipeline with this job passing?

Thanks
Helen

Quoted 233 lines
---
  MAINTAINERS                                   |  1 +
  drivers/gpu/drm/ci/build.sh                   |  1 -
  drivers/gpu/drm/ci/gitlab-ci.yml              |  2 +-
  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 | 32 +++++++++++++++++++
  .../gpu/drm/ci/xfails/vkms-none-flakes.txt    | 19 +++++++++++
  drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 16 ++++++++++
  11 files changed, 97 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

MAINTAINERS +1 -0
index bcdc17d1aa26..09310a6f4b5f 100644
@@ -6923,6 +6923,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/build.sh +0 -1
index 331a61e0d25a..2e089e03f061 100644
@@ -152,7 +152,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
 
drivers/gpu/drm/ci/gitlab-ci.yml +1 -1
index e2b021616a8e..c69fb6af4cf8 100644
@@ -107,7 +107,7 @@ stages:
    - meson
    - msm
    - rockchip
-  - virtio-gpu
+  - software-driver
 
  # YAML anchors for rule conditions
  # --------------------------------
drivers/gpu/drm/ci/igt_runner.sh +3 -3
index 2fd09b9b7cf6..3c7f000805e5 100755
@@ -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
 
drivers/gpu/drm/ci/image-tags.yml +1 -1
index cf07c3e09b8c..bf861ab8b9c2 100644
@@ -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"
drivers/gpu/drm/ci/test.yml +23 -1
index 8ab8a8f56d6a..58c3cf4b18e0 100644
@@ -399,7 +399,7 @@ meson:g12b-display:
      DRIVER_NAME: meson
 
  virtio_gpu:none:
-  stage: virtio-gpu
+  stage: software-driver
    variables:
      CROSVM_GALLIUM_DRIVER: llvmpipe
      DRIVER_NAME: virtio_gpu
@@ -419,3 +419,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: vkms-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
index 1cbd49a5b23a..8eaba388b141 100644
@@ -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.
drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt +0 -1
index 007f21e56d89..f82d437909b5 100644
@@ -41,7 +41,6 @@ kms_flip@flip-vs-absolute-wf_vblank,Fail
  kms_flip@flip-vs-absolute-wf_vblank-interruptible,Fail
  kms_flip@flip-vs-blocking-wf-vblank,Fail
  kms_flip@flip-vs-expired-vblank,Fail
-kms_flip@flip-vs-expired-vblank-interruptible,Fail
  kms_flip@flip-vs-modeset-vs-hang,Fail
  kms_flip@flip-vs-panning-vs-hang,Fail
  kms_flip@flip-vs-wf_vblank-interruptible,Fail
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt new file +32 -0
new file mode 100644
index 000000000000..a8b9d79d9a16
@@ -0,0 +1,32 @@
+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@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 +19 -0
new file mode 100644
index 000000000000..18afbfcc1c52
@@ -0,0 +1,19 @@
+# Board Name: vkms
+# Bug Report: https://lore.kernel.org/dri-devel/[email protected]/T/#u
+# IGT Version: 1.28-gb0cc8160e
+# 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
+kms_flip@flip-vs-expired-vblank-interruptible
+kms_flip@flip-vs-expired-vblank
+kms_flip@plain-flip-fb-recreate
+kms_flip@plain-flip-fb-recreate-interruptible
+kms_flip@plain-flip-ts-check-interruptible
+
+# The below test shows inconsistency across multiple runs,
+# giving results of Pass and Fail alternately.
+kms_cursor_legacy@cursorA-vs-flipA-toggle
+kms_pipe_crc_basic@nonblocking-crc
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt new file +16 -0
new file mode 100644
index 000000000000..524e7972c75a
@@ -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@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
+kms_invalid_mode@bad-vtotal
+kms_cursor_crc.*
author maintainer
#2 lore raw

Hi Helen,

Quoted 19 lines · Helen Koike
Quoted 16 lines · Vignesh Raman

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

Quoted 6 lines
Quoted 4 lines

v3:
- Build vkms as module and test with latest IGT.
   This patch depends on https://lore.kernel.org/dri-devel/[email protected]/

Do you have a link of a pipeline with this job passing?

Here is the pipeline with the job passing,
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1092194

Regards,
Vignesh

#3 lore raw
In reply to Vignesh Raman

Hi Vignesh,

Quoted 13 lines · Vignesh Raman

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

Quoted 6 lines

v3:
- Enable CONFIG_DRM_VKMS in x86_64.config and update xfails

v3:
- Build vkms as module and test with latest IGT.
This patch depends on https://lore.kernel.org/dri-devel/[email protected]/

Considering that this patch depends on that series, I believe you could include this patch as part of that series. It will be easier for us to review and land it.

Thanks for all the great work with the CI!

Best Regards,
- Maíra

Quoted 234 lines
---
  MAINTAINERS                                   |  1 +
  drivers/gpu/drm/ci/build.sh                   |  1 -
  drivers/gpu/drm/ci/gitlab-ci.yml              |  2 +-
  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 | 32 +++++++++++++++++++
  .../gpu/drm/ci/xfails/vkms-none-flakes.txt    | 19 +++++++++++
  drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 16 ++++++++++
  11 files changed, 97 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

MAINTAINERS +1 -0
index bcdc17d1aa26..09310a6f4b5f 100644
@@ -6923,6 +6923,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/build.sh +0 -1
index 331a61e0d25a..2e089e03f061 100644
@@ -152,7 +152,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
 
drivers/gpu/drm/ci/gitlab-ci.yml +1 -1
index e2b021616a8e..c69fb6af4cf8 100644
@@ -107,7 +107,7 @@ stages:
    - meson
    - msm
    - rockchip
-  - virtio-gpu
+  - software-driver
 
  # YAML anchors for rule conditions
  # --------------------------------
drivers/gpu/drm/ci/igt_runner.sh +3 -3
index 2fd09b9b7cf6..3c7f000805e5 100755
@@ -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
 
drivers/gpu/drm/ci/image-tags.yml +1 -1
index cf07c3e09b8c..bf861ab8b9c2 100644
@@ -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"
drivers/gpu/drm/ci/test.yml +23 -1
index 8ab8a8f56d6a..58c3cf4b18e0 100644
@@ -399,7 +399,7 @@ meson:g12b-display:
      DRIVER_NAME: meson
 
  virtio_gpu:none:
-  stage: virtio-gpu
+  stage: software-driver
    variables:
      CROSVM_GALLIUM_DRIVER: llvmpipe
      DRIVER_NAME: virtio_gpu
@@ -419,3 +419,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: vkms-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
index 1cbd49a5b23a..8eaba388b141 100644
@@ -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.
drivers/gpu/drm/ci/xfails/virtio_gpu-none-fails.txt +0 -1
index 007f21e56d89..f82d437909b5 100644
@@ -41,7 +41,6 @@ kms_flip@flip-vs-absolute-wf_vblank,Fail
  kms_flip@flip-vs-absolute-wf_vblank-interruptible,Fail
  kms_flip@flip-vs-blocking-wf-vblank,Fail
  kms_flip@flip-vs-expired-vblank,Fail
-kms_flip@flip-vs-expired-vblank-interruptible,Fail
  kms_flip@flip-vs-modeset-vs-hang,Fail
  kms_flip@flip-vs-panning-vs-hang,Fail
  kms_flip@flip-vs-wf_vblank-interruptible,Fail
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt new file +32 -0
new file mode 100644
index 000000000000..a8b9d79d9a16
@@ -0,0 +1,32 @@
+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@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 +19 -0
new file mode 100644
index 000000000000..18afbfcc1c52
@@ -0,0 +1,19 @@
+# Board Name: vkms
+# Bug Report: https://lore.kernel.org/dri-devel/[email protected]/T/#u
+# IGT Version: 1.28-gb0cc8160e
+# 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
+kms_flip@flip-vs-expired-vblank-interruptible
+kms_flip@flip-vs-expired-vblank
+kms_flip@plain-flip-fb-recreate
+kms_flip@plain-flip-fb-recreate-interruptible
+kms_flip@plain-flip-ts-check-interruptible
+
+# The below test shows inconsistency across multiple runs,
+# giving results of Pass and Fail alternately.
+kms_cursor_legacy@cursorA-vs-flipA-toggle
+kms_pipe_crc_basic@nonblocking-crc
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt new file +16 -0
new file mode 100644
index 000000000000..524e7972c75a
@@ -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@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
+kms_invalid_mode@bad-vtotal
+kms_cursor_crc.*
author maintainer
#4 lore raw

Hi Maíra,

Quoted 23 lines · Maíra Canal

Hi Vignesh,

Quoted 13 lines · Vignesh Raman

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

Quoted 6 lines

v3:
- Enable CONFIG_DRM_VKMS in x86_64.config and update xfails

v3:
- Build vkms as module and test with latest IGT.
   This patch depends on https://lore.kernel.org/dri-devel/[email protected]/

Quoted 5 lines

Considering that this patch depends on that series, I believe you could include this patch as part of that series. It will be easier for us to review and land it.

Thanks for all the great work with the CI!

Sure. Will add this patch as part of that series. Thank you.

Regards,
Vignesh