* [PATCH v2 0/2] drm/ci: Update Mesa and Introduce VKMS Support @ 2023-09-22 17:12 Helen Koike 2023-09-22 17:12 ` [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build Helen Koike 2023-09-22 17:12 ` [PATCH v2 2/2] drm/ci: add tests on vkms Helen Koike 0 siblings, 2 replies; 8+ messages in thread From: Helen Koike @ 2023-09-22 17:12 UTC (permalink / raw) To: dri-devel Cc: airlied, daniel, rodrigosiqueiramelo, melissa.srw, mairacanal, linux-kernel, robdclark, daniel, vignesh.raman, jani.nikula, mripard, michel.daenzer, quic_abhinavk, quic_jesszhan This patchset offers two enhancements to drm/ci: 1. Mesa Version Update. drm/ci re-uses components from Mesa project. A recent bug in MesaCI was fixed. The first patch updates drm/ci Mesa's version, re-allowing containers rebuilds when uncached, essencial for new runs. 2. VKMS Driver Testing, together with the -skips.txt and -fails.txt list that were found during the tests. See pipeline https://gitlab.freedesktop.org/helen.fornazier/linux/-/pipelines/992263 (there is a vgem job on top but it shouldn't affect the result) v2: - mesauprev: point to upstream mesa/mesa (solved the TODO and removed RFC tag) - vkms jov: do not mv modules to /lib/modules in the job definition, leave it to crosvm-runner.sh Helen Koike (2): drm/ci: uprev mesa version - fix container build drm/ci: add tests on vkms MAINTAINERS | 1 + drivers/gpu/drm/ci/build.sh | 1 - drivers/gpu/drm/ci/gitlab-ci.yml | 16 +++++++++- drivers/gpu/drm/ci/igt_runner.sh | 6 ++-- drivers/gpu/drm/ci/image-tags.yml | 2 +- drivers/gpu/drm/ci/lava-submit.sh | 2 +- drivers/gpu/drm/ci/test.yml | 23 ++++++++++++++- drivers/gpu/drm/ci/x86_64.config | 1 + .../drm/ci/xfails/virtio_gpu-none-flakes.txt | 0 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 29 +++++++++++++++++++ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 10 +++++++ 11 files changed, 83 insertions(+), 8 deletions(-) delete mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt -- 2.34.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build 2023-09-22 17:12 [PATCH v2 0/2] drm/ci: Update Mesa and Introduce VKMS Support Helen Koike @ 2023-09-22 17:12 ` Helen Koike 2023-09-27 20:52 ` Jessica Zhang 2023-10-09 0:58 ` Helen Koike 2023-09-22 17:12 ` [PATCH v2 2/2] drm/ci: add tests on vkms Helen Koike 1 sibling, 2 replies; 8+ messages in thread From: Helen Koike @ 2023-09-22 17:12 UTC (permalink / raw) To: dri-devel Cc: airlied, daniel, rodrigosiqueiramelo, melissa.srw, mairacanal, linux-kernel, robdclark, daniel, vignesh.raman, jani.nikula, mripard, michel.daenzer, quic_abhinavk, quic_jesszhan When building containers, some rust packages were installed without locking the dependencies version, which got updated and started giving errors like: error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf` Caused by: package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0 A patch to Mesa was recently added fixing this error, so update it. Signed-off-by: Helen Koike <helen.koike@collabora.com> --- v2: - point to upstream mesa/mesa (solved the TODO and removed RFC tag) --- drivers/gpu/drm/ci/gitlab-ci.yml | 15 ++++++++++++++- drivers/gpu/drm/ci/lava-submit.sh | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 2c4df53f5dfe..522f83db1a07 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -1,6 +1,6 @@ variables: DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072 + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 1cdc4be14b66108ae0e8069686ac3efe52bef3cb UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next @@ -24,6 +24,8 @@ variables: PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID} # per-job artifact storage on MinIO JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID} + # default kernel for rootfs before injecting the current kernel tree + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d LAVA_JOB_PRIORITY: 30 @@ -86,6 +88,17 @@ include: - '/.gitlab-ci/container/gitlab-ci.yml' - '/.gitlab-ci/test/gitlab-ci.yml' - '/.gitlab-ci/lava/lava-gitlab-ci.yml' + - '/src/microsoft/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml' + - '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml' + - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml' + - '/src/intel/ci/gitlab-ci-inc.yml' + - '/src/freedreno/ci/gitlab-ci-inc.yml' + - '/src/amd/ci/gitlab-ci-inc.yml' - drivers/gpu/drm/ci/image-tags.yml - drivers/gpu/drm/ci/container.yml - drivers/gpu/drm/ci/static-checks.yml diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh index 0c4456b21b0f..379f26ea87cc 100755 --- a/drivers/gpu/drm/ci/lava-submit.sh +++ b/drivers/gpu/drm/ci/lava-submit.sh @@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/ # Prepare env vars for upload. section_start variables "Variables passed through:" -KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \ +KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \ artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh section_end variables -- 2.34.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build 2023-09-22 17:12 ` [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build Helen Koike @ 2023-09-27 20:52 ` Jessica Zhang 2023-10-09 0:58 ` Helen Koike 1 sibling, 0 replies; 8+ messages in thread From: Jessica Zhang @ 2023-09-27 20:52 UTC (permalink / raw) To: Helen Koike, dri-devel Cc: airlied, daniel, rodrigosiqueiramelo, melissa.srw, mairacanal, linux-kernel, robdclark, daniel, vignesh.raman, jani.nikula, mripard, michel.daenzer, quic_abhinavk On 9/22/2023 10:12 AM, Helen Koike wrote: > When building containers, some rust packages were installed without > locking the dependencies version, which got updated and started giving > errors like: > > error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf` > Caused by: > package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0 > > A patch to Mesa was recently added fixing this error, so update it. > > Signed-off-by: Helen Koike <helen.koike@collabora.com> Tested-by: Jessica Zhang <quic_jesszhan@quicinc.com> Acked-by: Jessica Zhang <quic_jesszhan@quicinc.com> > > --- > > v2: > - point to upstream mesa/mesa (solved the TODO and removed RFC tag) > --- > drivers/gpu/drm/ci/gitlab-ci.yml | 15 ++++++++++++++- > drivers/gpu/drm/ci/lava-submit.sh | 2 +- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml > index 2c4df53f5dfe..522f83db1a07 100644 > --- a/drivers/gpu/drm/ci/gitlab-ci.yml > +++ b/drivers/gpu/drm/ci/gitlab-ci.yml > @@ -1,6 +1,6 @@ > variables: > DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa > - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072 > + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 1cdc4be14b66108ae0e8069686ac3efe52bef3cb > > UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm > TARGET_BRANCH: drm-next > @@ -24,6 +24,8 @@ variables: > PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID} > # per-job artifact storage on MinIO > JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID} > + # default kernel for rootfs before injecting the current kernel tree > + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d > > LAVA_JOB_PRIORITY: 30 > > @@ -86,6 +88,17 @@ include: > - '/.gitlab-ci/container/gitlab-ci.yml' > - '/.gitlab-ci/test/gitlab-ci.yml' > - '/.gitlab-ci/lava/lava-gitlab-ci.yml' > + - '/src/microsoft/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml' > + - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml' > + - '/src/intel/ci/gitlab-ci-inc.yml' > + - '/src/freedreno/ci/gitlab-ci-inc.yml' > + - '/src/amd/ci/gitlab-ci-inc.yml' > - drivers/gpu/drm/ci/image-tags.yml > - drivers/gpu/drm/ci/container.yml > - drivers/gpu/drm/ci/static-checks.yml > diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh > index 0c4456b21b0f..379f26ea87cc 100755 > --- a/drivers/gpu/drm/ci/lava-submit.sh > +++ b/drivers/gpu/drm/ci/lava-submit.sh > @@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/ > > # Prepare env vars for upload. > section_start variables "Variables passed through:" > -KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \ > +KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \ > artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh > section_end variables > > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build 2023-09-22 17:12 ` [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build Helen Koike 2023-09-27 20:52 ` Jessica Zhang @ 2023-10-09 0:58 ` Helen Koike 1 sibling, 0 replies; 8+ messages in thread From: Helen Koike @ 2023-10-09 0:58 UTC (permalink / raw) To: dri-devel Cc: mripard, rodrigosiqueiramelo, michel.daenzer, vignesh.raman, linux-kernel, quic_abhinavk, melissa.srw, mairacanal, quic_jesszhan Dear maintainers, Do not pick this patch, I re-sent it as part of the series [PATCH 0/9] drm/ci: fixes and improvements https://lists.freedesktop.org/archives/dri-devel/2023-October/425909.html Thanks Regards, Helen On 22/09/2023 14:12, Helen Koike wrote: > When building containers, some rust packages were installed without > locking the dependencies version, which got updated and started giving > errors like: > > error: failed to compile `bindgen-cli v0.62.0`, intermediate artifacts can be found at `/tmp/cargo-installkNKRwf` > Caused by: > package `rustix v0.38.13` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.60.0 > > A patch to Mesa was recently added fixing this error, so update it. > > Signed-off-by: Helen Koike <helen.koike@collabora.com> > > --- > > v2: > - point to upstream mesa/mesa (solved the TODO and removed RFC tag) > --- > drivers/gpu/drm/ci/gitlab-ci.yml | 15 ++++++++++++++- > drivers/gpu/drm/ci/lava-submit.sh | 2 +- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml > index 2c4df53f5dfe..522f83db1a07 100644 > --- a/drivers/gpu/drm/ci/gitlab-ci.yml > +++ b/drivers/gpu/drm/ci/gitlab-ci.yml > @@ -1,6 +1,6 @@ > variables: > DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa > - DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 0dc961645c4f0241f8512cb0ec3ad59635842072 > + DRM_CI_COMMIT_SHA: &drm-ci-commit-sha 1cdc4be14b66108ae0e8069686ac3efe52bef3cb > > UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm > TARGET_BRANCH: drm-next > @@ -24,6 +24,8 @@ variables: > PIPELINE_ARTIFACTS_BASE: ${S3_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID} > # per-job artifact storage on MinIO > JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID} > + # default kernel for rootfs before injecting the current kernel tree > + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/gfx-ci/linux/v6.4.12-for-mesa-ci-f6b4ad45f48d > > LAVA_JOB_PRIORITY: 30 > > @@ -86,6 +88,17 @@ include: > - '/.gitlab-ci/container/gitlab-ci.yml' > - '/.gitlab-ci/test/gitlab-ci.yml' > - '/.gitlab-ci/lava/lava-gitlab-ci.yml' > + - '/src/microsoft/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml' > + - '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml' > + - '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml' > + - '/src/intel/ci/gitlab-ci-inc.yml' > + - '/src/freedreno/ci/gitlab-ci-inc.yml' > + - '/src/amd/ci/gitlab-ci-inc.yml' > - drivers/gpu/drm/ci/image-tags.yml > - drivers/gpu/drm/ci/container.yml > - drivers/gpu/drm/ci/static-checks.yml > diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-submit.sh > index 0c4456b21b0f..379f26ea87cc 100755 > --- a/drivers/gpu/drm/ci/lava-submit.sh > +++ b/drivers/gpu/drm/ci/lava-submit.sh > @@ -22,7 +22,7 @@ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/ > > # Prepare env vars for upload. > section_start variables "Variables passed through:" > -KERNEL_IMAGE_BASE_URL="https://${BASE_SYSTEM_HOST_PATH}" \ > +KERNEL_IMAGE_BASE="https://${BASE_SYSTEM_HOST_PATH}" \ > artifacts/ci-common/generate-env.sh | tee results/job-rootfs-overlay/set-job-env-vars.sh > section_end variables > ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] drm/ci: add tests on vkms 2023-09-22 17:12 [PATCH v2 0/2] drm/ci: Update Mesa and Introduce VKMS Support Helen Koike 2023-09-22 17:12 ` [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build Helen Koike @ 2023-09-22 17:12 ` Helen Koike 2023-09-25 9:03 ` Maxime Ripard 2023-09-27 20:52 ` Jessica Zhang 1 sibling, 2 replies; 8+ messages in thread From: Helen Koike @ 2023-09-22 17:12 UTC (permalink / raw) To: dri-devel Cc: airlied, daniel, rodrigosiqueiramelo, melissa.srw, mairacanal, linux-kernel, robdclark, daniel, vignesh.raman, jani.nikula, mripard, michel.daenzer, quic_abhinavk, quic_jesszhan Add job that runs igt on top of vkms. Signed-off-by: Helen Koike <helen.koike@collabora.com> --- See pipeline: https://gitlab.freedesktop.org/helen.fornazier/linux/-/pipelines/990494 v2: - do not mv modules to /lib/modules in the job definition, leave it to crosvm-runner.sh --- MAINTAINERS | 1 + drivers/gpu/drm/ci/build.sh | 1 - drivers/gpu/drm/ci/gitlab-ci.yml | 1 + drivers/gpu/drm/ci/igt_runner.sh | 6 ++-- drivers/gpu/drm/ci/image-tags.yml | 2 +- drivers/gpu/drm/ci/test.yml | 23 ++++++++++++++- drivers/gpu/drm/ci/x86_64.config | 1 + .../drm/ci/xfails/virtio_gpu-none-flakes.txt | 0 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 29 +++++++++++++++++++ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 10 +++++++ 10 files changed, 68 insertions(+), 6 deletions(-) delete mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt diff --git a/MAINTAINERS b/MAINTAINERS index 740a2ce2689c..e47dbe31d221 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6813,6 +6813,7 @@ L: dri-devel@lists.freedesktop.org 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 diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 7b014287a041..9e510e77098b 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -146,7 +146,6 @@ fi mkdir -p artifacts/install/lib mv install/* artifacts/install/. -rm -rf artifacts/install/modules ln -s common artifacts/install/ci-common for image in ${KERNEL_IMAGE_NAME}; do diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 522f83db1a07..c86ee5a51012 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -120,6 +120,7 @@ stages: - rockchip - virtio-gpu - lint + - software-driver # YAML anchors for rule conditions # -------------------------------- diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index 2bb759165063..c7f83d1b72e9 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -21,9 +21,9 @@ cat /sys/kernel/debug/dri/*/state set -e # Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib -if [ "$IGT_FORCE_DRIVER" = "amdgpu" ]; then - mv /install/modules/lib/modules/* /lib/modules/. - modprobe amdgpu +if [ "$IGT_FORCE_DRIVER" = "amdgpu" || "$IGT_FORCE_DRIVER" = "vkms" ]; then + mv /install/modules/lib/modules/* /lib/modules/. || true + modprobe --first-time "$IGT_FORCE_DRIVER" fi if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" ]; then diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml index f051b6c547c5..e05077ee29d2 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: "${CONTAINER_TAG}" + DEBIAN_BUILD_TAG: "2023-09-20-vkms-module-2" KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}" diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 6473cddaa7a9..69a5337fd989 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -332,4 +332,25 @@ virtio_gpu:none: - igt:x86_64 rules: # TODO: current issue: malloc(): corrupted top size. Fix and remove this rule. - - when: never \ No newline at end of file + - when: never + +vkms:none: + stage: software-driver + variables: + DRIVER_NAME: vkms + GPU_VERSION: none + extends: + - .test-gl + 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 \ No newline at end of file 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-flakes.txt b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt deleted file mode 100644 index e69de29bb2d1..000000000000 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..a65196a19222 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt @@ -0,0 +1,29 @@ +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-toggle,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-expired-vblank-interruptible,Fail +kms_flip@plain-flip-fb-recreate,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 \ No newline at end of file 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..07aa62cff108 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt @@ -0,0 +1,10 @@ +# 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.* \ No newline at end of file -- 2.34.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] drm/ci: add tests on vkms 2023-09-22 17:12 ` [PATCH v2 2/2] drm/ci: add tests on vkms Helen Koike @ 2023-09-25 9:03 ` Maxime Ripard 2023-09-27 20:52 ` Jessica Zhang 1 sibling, 0 replies; 8+ messages in thread From: Maxime Ripard @ 2023-09-25 9:03 UTC (permalink / raw) To: Helen Koike Cc: airlied, daniel, daniel, dri-devel, jani.nikula, linux-kernel, mairacanal, melissa.srw, michel.daenzer, mripard, quic_abhinavk, quic_jesszhan, robdclark, rodrigosiqueiramelo, vignesh.raman, Maxime Ripard On Fri, 22 Sep 2023 14:12:37 -0300, Helen Koike wrote: > Add job that runs igt on top of vkms. > > Signed-off-by: Helen Koike <helen.koike@collabora.com> > Acked-by: Maxime Ripard <mripard@kernel.org> Thanks! Maxime ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] drm/ci: add tests on vkms 2023-09-22 17:12 ` [PATCH v2 2/2] drm/ci: add tests on vkms Helen Koike 2023-09-25 9:03 ` Maxime Ripard @ 2023-09-27 20:52 ` Jessica Zhang 2023-10-09 1:00 ` Helen Koike 1 sibling, 1 reply; 8+ messages in thread From: Jessica Zhang @ 2023-09-27 20:52 UTC (permalink / raw) To: Helen Koike, dri-devel Cc: airlied, daniel, rodrigosiqueiramelo, melissa.srw, mairacanal, linux-kernel, robdclark, daniel, vignesh.raman, jani.nikula, mripard, michel.daenzer, quic_abhinavk On 9/22/2023 10:12 AM, Helen Koike wrote: > Add job that runs igt on top of vkms. > > Signed-off-by: Helen Koike <helen.koike@collabora.com> Tested-by: Jessica Zhang <quic_jesszhan@quicinc.com> Acked-by: Jessica Zhang <quic_jesszhan@quicinc.com> > > --- > > See pipeline: https://gitlab.freedesktop.org/helen.fornazier/linux/-/pipelines/990494 > > v2: > - do not mv modules to /lib/modules in the job definition, leave it to > crosvm-runner.sh > --- > MAINTAINERS | 1 + > drivers/gpu/drm/ci/build.sh | 1 - > drivers/gpu/drm/ci/gitlab-ci.yml | 1 + > drivers/gpu/drm/ci/igt_runner.sh | 6 ++-- > drivers/gpu/drm/ci/image-tags.yml | 2 +- > drivers/gpu/drm/ci/test.yml | 23 ++++++++++++++- > drivers/gpu/drm/ci/x86_64.config | 1 + > .../drm/ci/xfails/virtio_gpu-none-flakes.txt | 0 > drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 29 +++++++++++++++++++ > drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 10 +++++++ > 10 files changed, 68 insertions(+), 6 deletions(-) > delete mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt > create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt > create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt > > diff --git a/MAINTAINERS b/MAINTAINERS > index 740a2ce2689c..e47dbe31d221 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -6813,6 +6813,7 @@ L: dri-devel@lists.freedesktop.org > 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 > diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh > index 7b014287a041..9e510e77098b 100644 > --- a/drivers/gpu/drm/ci/build.sh > +++ b/drivers/gpu/drm/ci/build.sh > @@ -146,7 +146,6 @@ fi > > mkdir -p artifacts/install/lib > mv install/* artifacts/install/. > -rm -rf artifacts/install/modules > ln -s common artifacts/install/ci-common > > for image in ${KERNEL_IMAGE_NAME}; do > diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml > index 522f83db1a07..c86ee5a51012 100644 > --- a/drivers/gpu/drm/ci/gitlab-ci.yml > +++ b/drivers/gpu/drm/ci/gitlab-ci.yml > @@ -120,6 +120,7 @@ stages: > - rockchip > - virtio-gpu > - lint > + - software-driver > > # YAML anchors for rule conditions > # -------------------------------- > diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh > index 2bb759165063..c7f83d1b72e9 100755 > --- a/drivers/gpu/drm/ci/igt_runner.sh > +++ b/drivers/gpu/drm/ci/igt_runner.sh > @@ -21,9 +21,9 @@ cat /sys/kernel/debug/dri/*/state > set -e > > # Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib > -if [ "$IGT_FORCE_DRIVER" = "amdgpu" ]; then > - mv /install/modules/lib/modules/* /lib/modules/. > - modprobe amdgpu > +if [ "$IGT_FORCE_DRIVER" = "amdgpu" || "$IGT_FORCE_DRIVER" = "vkms" ]; then > + mv /install/modules/lib/modules/* /lib/modules/. || true > + modprobe --first-time "$IGT_FORCE_DRIVER" > fi > > if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" ]; then > diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml > index f051b6c547c5..e05077ee29d2 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: "${CONTAINER_TAG}" > + DEBIAN_BUILD_TAG: "2023-09-20-vkms-module-2" > > KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}" > > diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml > index 6473cddaa7a9..69a5337fd989 100644 > --- a/drivers/gpu/drm/ci/test.yml > +++ b/drivers/gpu/drm/ci/test.yml > @@ -332,4 +332,25 @@ virtio_gpu:none: > - igt:x86_64 > rules: > # TODO: current issue: malloc(): corrupted top size. Fix and remove this rule. > - - when: never > \ No newline at end of file > + - when: never > + > +vkms:none: > + stage: software-driver > + variables: > + DRIVER_NAME: vkms > + GPU_VERSION: none > + extends: > + - .test-gl > + 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 > \ No newline at end of file > 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-flakes.txt b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt > deleted file mode 100644 > index e69de29bb2d1..000000000000 > 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..a65196a19222 > --- /dev/null > +++ b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt > @@ -0,0 +1,29 @@ > +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-toggle,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-expired-vblank-interruptible,Fail > +kms_flip@plain-flip-fb-recreate,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 > \ No newline at end of file > 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..07aa62cff108 > --- /dev/null > +++ b/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt > @@ -0,0 +1,10 @@ > +# 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.* > \ No newline at end of file > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] drm/ci: add tests on vkms 2023-09-27 20:52 ` Jessica Zhang @ 2023-10-09 1:00 ` Helen Koike 0 siblings, 0 replies; 8+ messages in thread From: Helen Koike @ 2023-10-09 1:00 UTC (permalink / raw) To: Jessica Zhang, dri-devel Cc: mripard, rodrigosiqueiramelo, michel.daenzer, vignesh.raman, linux-kernel, quic_abhinavk, melissa.srw, mairacanal On 27/09/2023 17:52, Jessica Zhang wrote: > > > On 9/22/2023 10:12 AM, Helen Koike wrote: >> Add job that runs igt on top of vkms. >> >> Signed-off-by: Helen Koike <helen.koike@collabora.com> > > Tested-by: Jessica Zhang <quic_jesszhan@quicinc.com> > Acked-by: Jessica Zhang <quic_jesszhan@quicinc.com> Thanks for the tests and reviews. For some reason this is broken with the latest kernel, there is a memory issue with crosvm which is under investigation, so, maintainers, please do not pick this patch for now. Thanks Helen > >> >> --- >> >> See pipeline: >> https://gitlab.freedesktop.org/helen.fornazier/linux/-/pipelines/990494 >> >> v2: >> - do not mv modules to /lib/modules in the job definition, leave it to >> crosvm-runner.sh >> --- >> MAINTAINERS | 1 + >> drivers/gpu/drm/ci/build.sh | 1 - >> drivers/gpu/drm/ci/gitlab-ci.yml | 1 + >> drivers/gpu/drm/ci/igt_runner.sh | 6 ++-- >> drivers/gpu/drm/ci/image-tags.yml | 2 +- >> drivers/gpu/drm/ci/test.yml | 23 ++++++++++++++- >> drivers/gpu/drm/ci/x86_64.config | 1 + >> .../drm/ci/xfails/virtio_gpu-none-flakes.txt | 0 >> drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 29 +++++++++++++++++++ >> drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 10 +++++++ >> 10 files changed, 68 insertions(+), 6 deletions(-) >> delete mode 100644 drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt >> create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt >> create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 740a2ce2689c..e47dbe31d221 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -6813,6 +6813,7 @@ L: dri-devel@lists.freedesktop.org >> 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 >> diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh >> index 7b014287a041..9e510e77098b 100644 >> --- a/drivers/gpu/drm/ci/build.sh >> +++ b/drivers/gpu/drm/ci/build.sh >> @@ -146,7 +146,6 @@ fi >> mkdir -p artifacts/install/lib >> mv install/* artifacts/install/. >> -rm -rf artifacts/install/modules >> ln -s common artifacts/install/ci-common >> for image in ${KERNEL_IMAGE_NAME}; do >> diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml >> b/drivers/gpu/drm/ci/gitlab-ci.yml >> index 522f83db1a07..c86ee5a51012 100644 >> --- a/drivers/gpu/drm/ci/gitlab-ci.yml >> +++ b/drivers/gpu/drm/ci/gitlab-ci.yml >> @@ -120,6 +120,7 @@ stages: >> - rockchip >> - virtio-gpu >> - lint >> + - software-driver >> # YAML anchors for rule conditions >> # -------------------------------- >> diff --git a/drivers/gpu/drm/ci/igt_runner.sh >> b/drivers/gpu/drm/ci/igt_runner.sh >> index 2bb759165063..c7f83d1b72e9 100755 >> --- a/drivers/gpu/drm/ci/igt_runner.sh >> +++ b/drivers/gpu/drm/ci/igt_runner.sh >> @@ -21,9 +21,9 @@ cat /sys/kernel/debug/dri/*/state >> set -e >> # Cannot use HWCI_KERNEL_MODULES as at that point we don't have the >> module in /lib >> -if [ "$IGT_FORCE_DRIVER" = "amdgpu" ]; then >> - mv /install/modules/lib/modules/* /lib/modules/. >> - modprobe amdgpu >> +if [ "$IGT_FORCE_DRIVER" = "amdgpu" || "$IGT_FORCE_DRIVER" = "vkms" >> ]; then >> + mv /install/modules/lib/modules/* /lib/modules/. || true >> + modprobe --first-time "$IGT_FORCE_DRIVER" >> fi >> if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" ]; then >> diff --git a/drivers/gpu/drm/ci/image-tags.yml >> b/drivers/gpu/drm/ci/image-tags.yml >> index f051b6c547c5..e05077ee29d2 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: "${CONTAINER_TAG}" >> + DEBIAN_BUILD_TAG: "2023-09-20-vkms-module-2" >> KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}" >> diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml >> index 6473cddaa7a9..69a5337fd989 100644 >> --- a/drivers/gpu/drm/ci/test.yml >> +++ b/drivers/gpu/drm/ci/test.yml >> @@ -332,4 +332,25 @@ virtio_gpu:none: >> - igt:x86_64 >> rules: >> # TODO: current issue: malloc(): corrupted top size. Fix and >> remove this rule. >> - - when: never >> \ No newline at end of file >> + - when: never >> + >> +vkms:none: >> + stage: software-driver >> + variables: >> + DRIVER_NAME: vkms >> + GPU_VERSION: none >> + extends: >> + - .test-gl >> + 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 >> \ No newline at end of file >> 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-flakes.txt >> b/drivers/gpu/drm/ci/xfails/virtio_gpu-none-flakes.txt >> deleted file mode 100644 >> index e69de29bb2d1..000000000000 >> 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..a65196a19222 >> --- /dev/null >> +++ b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt >> @@ -0,0 +1,29 @@ >> +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-toggle,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-expired-vblank-interruptible,Fail >> +kms_flip@plain-flip-fb-recreate,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 >> \ No newline at end of file >> 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..07aa62cff108 >> --- /dev/null >> +++ b/drivers/gpu/drm/ci/xfails/vkms-none-skips.txt >> @@ -0,0 +1,10 @@ >> +# 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.* >> \ No newline at end of file >> -- >> 2.34.1 >> ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-10-09 1:01 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-09-22 17:12 [PATCH v2 0/2] drm/ci: Update Mesa and Introduce VKMS Support Helen Koike 2023-09-22 17:12 ` [PATCH v2 1/2] drm/ci: uprev mesa version - fix container build Helen Koike 2023-09-27 20:52 ` Jessica Zhang 2023-10-09 0:58 ` Helen Koike 2023-09-22 17:12 ` [PATCH v2 2/2] drm/ci: add tests on vkms Helen Koike 2023-09-25 9:03 ` Maxime Ripard 2023-09-27 20:52 ` Jessica Zhang 2023-10-09 1:00 ` Helen Koike
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®