Re: [PATCH v9 0/6] drm/ci: Add support for GPU and display testing
On 05/08/2024 10:11, Daniel Stone wrote: Hi Vignesh, On Tue, 30 Jul 2024 at 03:16, Vignesh Raman wrote: Some ARM SOCs have a separate display controller and GPU, each with different drivers. For mediatek mt8173, the GPU driver is powervr, and the display driver is mediatek. In the case of mediatek mt8183, the GPU driver is panfrost, and the display driver is mediatek. With rockchip rk3288/rk3399, the GPU driver is panfrost, while the display driver is rockchip. For amlogic meson G12B (A311D) SOC, the GPU driver is panfrost, and the display driver is meson. IGT tests run various tests with different xfails and can test both GPU devices and KMS/display devices. Currently, in drm-ci for MediaTek, Rockchip, and Amlogic Meson platforms, only the GPU driver is tested. This leads to incomplete coverage since the display is never tested on these platforms. This commit series adds support in drm-ci to run tests for both GPU and display drivers for MediaTek mt8173/mt8183, Rockchip rk3288/rk3399, and Amlogic Meson G12B (A311D) platforms. Update the expectations file, and skip driver-specific tests and tools_test on non-intel platforms. Thanks, series looks sensible and is: Reviewed-by: Daniel Stone Cheers, Daniel Applied to drm-misc-next Thanks Helen
Re: [PATCH] drm/ci: update link to Gitlab server
On 18/07/2024 08:16, Helen Koike wrote: On 17/07/2024 20:52, Deborah Brouwer wrote: Before building an image, the build script looks to see if there are fixes to apply from an upstream repository. The link for the upstream repository git://anongit.freedesktop.org/drm/drm became obsolete with the move to Gitlab server in March 2024. Until recently, this obsolete link was harmless because anongit would at least respond that there were no such fixes available. In the last few days anongit has stopped responding to requests causing the build script to hang indefinitely. Update the link from anongit to the Gitlab server to prevent the build script from hanging indefinitely. Signed-off-by: Deborah Brouwer Acked-by: Helen Koike Thanks Helen Applied to drm-misc-next Thanks Helen --- Link to pipeline for this change: https://gitlab.freedesktop.org/dbrouwer/kernel/-/pipelines/1226742 drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/ gitlab-ci.yml index b09976c3d2c2..259fb1c9a855 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -2,7 +2,7 @@ variables: DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa DRM_CI_COMMIT_SHA: &drm-ci-commit-sha e2b9c5a9e3e4f9b532067af8022eaef8d6fc6c00 - UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm + UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git TARGET_BRANCH: drm-next IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5
Re: [PATCH v7 5/5] drm/ci: rockchip: add tests for rockchip display driver
On 12/07/2024 06:15, Vignesh Raman wrote:
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.
Signed-off-by: Vignesh Raman
lgtm
Acked-by: Helen Koike
Thanks
Helen
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names
instead of using DRIVER_NAME. Also update xfails.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
v5:
- Add rockchip-display job and skip driver-specfic tests.
v6:
- Squash commits for display and gpu driver testing. Reword the commit
message.
v7:
- Rebase with recent drm-ci fixes and retest with latest IGT.
---
drivers/gpu/drm/ci/igt_runner.sh | 3 -
drivers/gpu/drm/ci/test.yml | 48 +++---
.../drm/ci/xfails/mediatek-mt8183-fails.txt | 1 -
.../drm/ci/xfails/panfrost-rk3288-fails.txt | 8 ++
.../drm/ci/xfails/panfrost-rk3288-skips.txt | 71 +++
.../drm/ci/xfails/panfrost-rk3399-fails.txt | 8 ++
.../drm/ci/xfails/panfrost-rk3399-flakes.txt | 6 ++
.../drm/ci/xfails/panfrost-rk3399-skips.txt | 24 +
.../drm/ci/xfails/rockchip-rk3288-fails.txt | 21 +++--
.../drm/ci/xfails/rockchip-rk3288-flakes.txt | 6 ++
.../drm/ci/xfails/rockchip-rk3288-skips.txt | 54 +--
.../drm/ci/xfails/rockchip-rk3399-fails.txt | 90 +--
.../drm/ci/xfails/rockchip-rk3399-flakes.txt | 13 ++-
.../drm/ci/xfails/rockchip-rk3399-skips.txt | 7 +-
14 files changed, 270 insertions(+), 90 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-flakes.txt
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt
create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index 1578a2a47a54..f38836ec837c 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -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
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 5ccf57b3bf91..b22b2cf8f06f 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -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
diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
index cf3a747f7cec..826cca5efbff 100644
--- a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-fails.txt
@@ -13,7 +13,6 @@ kms_bw@connected-linear-tiling-1-displays-1920x
Re: [PATCH v7 4/5] drm/ci: meson: add tests for meson display driver
On 12/07/2024 06:15, Vignesh Raman wrote:
For Amlogic Meson G12B (A311D) SOC the display driver is meson and
gpu driver is panfrost. Currently, in drm-ci for Meson G12B (A311D),
only the gpu driver is tested. Refactor the existing meson jobs
and add support in drm-ci to test both display and gpu driver for
Amlogic Meson G12B (A311D) 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 meson jobs.
Signed-off-by: Vignesh Raman
lgtm
Acked-by: Helen Koike
Thanks
Helen
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names instead
of using DRIVER_NAME.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
v5:
- Add meson-display job.
v6:
- Squash commits for display and gpu driver testing. Reword the commit
message.
v7:
- Rebase with recent drm-ci fixes and retest with latest IGT.
---
drivers/gpu/drm/ci/igt_runner.sh | 2 +-
drivers/gpu/drm/ci/test.yml | 23 +++
.../gpu/drm/ci/xfails/meson-g12b-fails.txt| 18 ++-
.../gpu/drm/ci/xfails/meson-g12b-skips.txt| 4 +---
.../gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 8 +++
.../gpu/drm/ci/xfails/panfrost-g12b-skips.txt | 18 +++
6 files changed, 58 insertions(+), 15 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt
diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index 6193865f23a3..1578a2a47a54 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -20,7 +20,7 @@ cat /sys/kernel/debug/dri/*/state
set -e
case "$DRIVER_NAME" in
-rockchip|meson)
+rockchip)
export IGT_FORCE_DRIVER="panfrost"
;;
amdgpu|vkms)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 86875fb96eb5..5ccf57b3bf91 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -356,25 +356,38 @@ panfrost:mt8183:
GPU_VERSION: mt8192
RUNNER_TAG: mesa-ci-x86-64-lava-mt8192-asurada-spherion-r0
-.meson:
+.meson-device:
extends:
- .lava-igt:arm64
- stage: meson
variables:
-DRIVER_NAME: meson
DTB: ${DEVICE_TYPE}
BOOT_METHOD: u-boot
KERNEL_IMAGE_TYPE: "image"
-meson:g12b:
+.meson-display:
+ stage: meson
+ variables:
+DRIVER_NAME: meson
+
+.g12b:
extends:
-- .meson
+- .meson-device
parallel: 3
variables:
DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
GPU_VERSION: g12b
RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
+meson:g12b:
+ extends:
+- .g12b
+- .meson-display
+
+panfrost:g12b:
+ extends:
+- .g12b
+- .panfrost-gpu
+
virtio_gpu:none:
stage: software-driver
variables:
diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
index 5b7d623f404b..53c5c91db5bb 100644
--- a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
@@ -1,8 +1,14 @@
-dumb_buffer@create-clear,Fail
-dumb_buffer@create-valid-dumb,Fail
dumb_buffer@invalid-bpp,Fail
-dumb_buffer@map-invalid-size,Fail
-dumb_buffer@map-uaf,Fail
-dumb_buffer@map-valid,Fail
-panfrost/panfrost_prime@gem-prime-import,Fail
+kms_3d,Fail
+kms_cursor_legacy@forked-bo,Fail
+kms_cursor_legacy@forked-move,Fail
+kms_cursor_legacy@single-bo,Fail
+kms_cursor_legacy@single-move,Fail
+kms_cursor_legacy@torture-bo,Fail
+kms_cursor_legacy@torture-move,Fail
+kms_lease@lease-uevent,Fail
+kms_properties@connector-properties-atomic,Fail
+kms_properties@connector-properties-legacy,Fail
+kms_properties@get_properties-sanity-atomic,Fail
+kms_properties@get_properties-sanity-non-atomic,Fail
tools_test@tools_test,Fail
diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
b/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
index 03eefa518afa..562662eff802 100644
--- a/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
+++ b/drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt
@@ -2,6 +2,7 @@
^amdgpu.*
^msm.*
nouveau_.*
+^panfrost.*
^v3d.*
^vc4.*
^vmwgfx*
@@ -10,9 +11,6 @@ nouveau_.*
gem_.*
i915_.*
-# Panfrost is not a KMS driver, so skip the KMS tests
-kms_.*
-
# Currently fails and causes coverage loss for other tests
# since core_getversion also fails.
core_hotunplug.*
diff --git a/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt
b/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt
new file mode 100644
index ..5b7d623f404b
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/panfro
Re: [PATCH v7 3/5] drm/ci: mediatek: add tests for powervr gpu driver
On 12/07/2024 06:15, Vignesh Raman wrote: For mediatek mt8173, the display driver is mediatek, while the gpu driver is powervr. Currently, in drm-ci for mt8173, only the display driver is tested. Add support in drm-ci to test powervr driver for mt8173. Powervr driver was merged in linux kernel, but there's no mediatek support yet. So disable the powervr:mt8173 job which uses powervr driver. Also update the MAINTAINERS file to include xfails for powervr driver. Signed-off-by: Vignesh Raman --- v6: - New patch in the series. Split powervr changes into a new commit. v7: - No changes. --- MAINTAINERS | 1 + drivers/gpu/drm/ci/gitlab-ci.yml | 1 + drivers/gpu/drm/ci/test.yml | 14 ++ 3 files changed, 16 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f3783f2269ff..05f72eaf5267 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10778,6 +10778,7 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F:Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml F:Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml F:Documentation/gpu/imagination/ +F: drivers/gpu/drm/ci/xfails/powervr* F:drivers/gpu/drm/imagination/ F:include/uapi/drm/pvr_drm.h diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 9d800f629f08..ca7f873bc2d4 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -122,6 +122,7 @@ stages: - meson - msm - panfrost + - powervr - rockchip - software-driver diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 219eca5ef24c..86875fb96eb5 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -294,6 +294,11 @@ amdgpu:stoney: variables: DRIVER_NAME: mediatek +.powervr-gpu: + stage: powervr + variables: +DRIVER_NAME: powervr + .panfrost-gpu: stage: panfrost variables: @@ -322,6 +327,15 @@ mediatek:mt8173: - .mt8173 - .mediatek-display +powervr:mt8173: + extends: +- .mt8173 +- .powervr-gpu + rules: +# TODO: powervr driver was merged in linux kernel, but there's no mediatek support yet +# Remove the rule once mediatek support is added for powervr +- when: never well, we could leave to add it later, but I don't mind adding like this for now. Acked-by: Helen Koike Thanks Helen + mediatek:mt8183: extends: - .mt8183
Re: [PATCH v7 2/5] drm/ci: mediatek: add tests for mediatek display driver
On 12/07/2024 06:15, Vignesh Raman wrote:
For mediatek mt8183, the display driver is mediatek, while the
gpu driver is panfrost. Currently, in drm-ci for mt8183, only
the gpu driver is tested. Refactor the existing mediatek jobs
and add support in drm-ci to test both display and gpu driver
for mt8183 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 mediatek jobs.
Update the MAINTAINERS file to include xfails for panfrost driver.
Signed-off-by: Vignesh Raman
lgtm
Acked-by: Helen Koike
Thanks
Helen
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files, and remove IGT_FORCE_DRIVER from the
script since it's now set by the job.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names instead
of using DRIVER_NAME. Also update xfails.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
v5:
- Add mediatek-display job.
v6:
- Squash commits for display and gpu driver testing. Reword the commit
message.
v7:
- Rebase with recent drm-ci fixes and retest with latest IGT.
---
MAINTAINERS | 1 +
drivers/gpu/drm/ci/gitlab-ci.yml | 2 +-
drivers/gpu/drm/ci/igt_runner.sh | 7
drivers/gpu/drm/ci/test.yml | 38 +++
.../drm/ci/xfails/mediatek-mt8183-fails.txt | 28 +++---
.../drm/ci/xfails/mediatek-mt8183-flakes.txt | 7
.../drm/ci/xfails/mediatek-mt8183-skips.txt | 4 +-
.../drm/ci/xfails/panfrost-mt8183-fails.txt | 11 ++
.../drm/ci/xfails/panfrost-mt8183-skips.txt | 18 +
9 files changed, 92 insertions(+), 24 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt
create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt
diff --git a/MAINTAINERS b/MAINTAINERS
index cb8355f20b36..f3783f2269ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1741,6 +1741,7 @@ L:dri-devel@lists.freedesktop.org
S:Supported
T:git https://gitlab.freedesktop.org/drm/misc/kernel.git
F:Documentation/gpu/panfrost.rst
+F: drivers/gpu/drm/ci/xfails/panfrost*
F:drivers/gpu/drm/panfrost/
F:include/uapi/drm/panfrost_drm.h
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index b09976c3d2c2..9d800f629f08 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -121,8 +121,8 @@ stages:
- mediatek
- meson
- msm
+ - panfrost
- rockchip
- - virtio-gpu
- 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 37c724dba8cb..6193865f23a3 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -23,13 +23,6 @@ case "$DRIVER_NAME" in
rockchip|meson)
export IGT_FORCE_DRIVER="panfrost"
;;
-mediatek)
-if [ "$GPU_VERSION" = "mt8173" ]; then
-export IGT_FORCE_DRIVER=${DRIVER_NAME}
-elif [ "$GPU_VERSION" = "mt8183" ]; then
-export IGT_FORCE_DRIVER="panfrost"
-fi
-;;
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
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index ee908b66aad2..219eca5ef24c 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -280,38 +280,62 @@ amdgpu:stoney:
GPU_VERSION: stoney
RUNNER_TAG: mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
-.mediatek:
+.mediatek-device:
extends:
- .lava-igt:arm64
stage: mediatek
variables:
-DRIVER_NAME: mediatek
DTB: ${DEVICE_TYPE}
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
-mediatek:mt8173:
+.mediatek-display:
+ stage: mediatek
+ variables:
+DRIVER_NAME: mediatek
+
+.panfrost-gpu:
+ stage: panfrost
+ variables:
+DRIVER_NAME: panfrost
+
+.mt8173:
extends:
-- .mediatek
+- .mediatek-device
parallel: 4
variables:
DEVICE_TYPE: mt8173-elm-hana
GPU_VERSION: mt8173
RUNNER_TAG: mesa-ci-x86-64-lava-mt8173-elm-hana
-mediatek:mt8183:
+.mt8183:
extends:
-- .mediatek
+- .mediatek-device
parallel: 3
variables:
DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16
GPU_VERSION: mt8183
RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
+mediatek:mt8173:
+ extends:
+- .mt8173
+- .mediatek-display
Re: [PATCH] drm/ci: update link to Gitlab server
On 17/07/2024 20:52, Deborah Brouwer wrote: Before building an image, the build script looks to see if there are fixes to apply from an upstream repository. The link for the upstream repository git://anongit.freedesktop.org/drm/drm became obsolete with the move to Gitlab server in March 2024. Until recently, this obsolete link was harmless because anongit would at least respond that there were no such fixes available. In the last few days anongit has stopped responding to requests causing the build script to hang indefinitely. Update the link from anongit to the Gitlab server to prevent the build script from hanging indefinitely. Signed-off-by: Deborah Brouwer Acked-by: Helen Koike Thanks Helen --- Link to pipeline for this change: https://gitlab.freedesktop.org/dbrouwer/kernel/-/pipelines/1226742 drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index b09976c3d2c2..259fb1c9a855 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -2,7 +2,7 @@ variables: DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa DRM_CI_COMMIT_SHA: &drm-ci-commit-sha e2b9c5a9e3e4f9b532067af8022eaef8d6fc6c00 - UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm + UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git TARGET_BRANCH: drm-next IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5
Re: [PATCH] drm/ci: Upgrade setuptools requirement to 70.0.0
On 16/07/2024 05:37, WangYuli wrote: GitHub Dependabot has issued the following alert: "Upgrade setuptools to version 70.0.0 or later. A vulnerability in the package_index module of pypa/setuptools versions up to 69.1.1 allows for remote code execution via its download functions. These functions, which are used to download packages from URLs provided by users or retrieved from package index servers, are susceptible to code injection. If these functions are exposed to user-controlled inputs, such as package URLs, they can execute arbitrary commands on the system. The issue is fixed in version 70.0. Severity: 8.8 / 10 (High) Attack vector:Network Attack complexity:Low Privileges required: None User interaction:Required Scope: Unchanged Confidentiality: High Integrity: High Availability:High CVE ID: CVE-2024-6345" To avoid disturbing everyone with the kernel repo hosted on GitHub, I suggest we upgrade our python dependencies once again to appease GitHub Dependabot. Link: https://github.com/dependabot Signed-off-by: WangYuli Acked-by: Helen Koike Thanks Helen --- drivers/gpu/drm/ci/xfails/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ci/xfails/requirements.txt b/drivers/gpu/drm/ci/xfails/requirements.txt index e9994c9db799..5e6d48d98e4e 100644 --- a/drivers/gpu/drm/ci/xfails/requirements.txt +++ b/drivers/gpu/drm/ci/xfails/requirements.txt @@ -11,7 +11,7 @@ requests==2.31.0 requests-toolbelt==1.0.0 ruamel.yaml==0.17.32 ruamel.yaml.clib==0.2.7 -setuptools==68.0.0 +setuptools==70.0.0 tenacity==8.2.3 urllib3==2.0.7 wheel==0.41.1
Re: [PATCH v1] drm/ci: uprev IGT
On 04/07/2024 06:22, Vignesh Raman wrote: Uprev IGT to the latest version, which includes a fix for the writeback tests issue on MSM devices. Enable debugging for igt-runner to log output such as 'Begin test' and 'End test'. This will help identify which test causes system freeze or hangs. Update xfails and add metadata header for each flake test. Signed-off-by: Vignesh Raman Applied to drm-misc-next. Thanks Helen --- v1: - https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1216850 --- drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/igt_runner.sh | 1 + .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 1 + .../drm/ci/xfails/amdgpu-stoney-flakes.txt| 14 +- .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 4 +- drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 12 +- .../gpu/drm/ci/xfails/i915-amly-flakes.txt| 41 - drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 5 +- drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 2 +- drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 4 +- drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 14 +- drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 9 +- drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 5 +- drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 24 +-- drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 8 +- drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 4 +- drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 2 + drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 2 +- drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 4 +- drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 25 +-- drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 4 +- drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 17 +- drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 2 +- drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 5 +- .../drm/ci/xfails/mediatek-mt8173-fails.txt | 9 +- .../drm/ci/xfails/mediatek-mt8173-flakes.txt | 32 +++- .../drm/ci/xfails/mediatek-mt8173-skips.txt | 4 +- .../drm/ci/xfails/mediatek-mt8183-fails.txt | 2 +- .../drm/ci/xfails/mediatek-mt8183-skips.txt | 2 +- .../gpu/drm/ci/xfails/meson-g12b-fails.txt| 2 +- .../gpu/drm/ci/xfails/meson-g12b-skips.txt| 2 +- .../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 5 +- .../gpu/drm/ci/xfails/msm-apq8016-skips.txt | 2 +- .../gpu/drm/ci/xfails/msm-apq8096-flakes.txt | 2 +- .../gpu/drm/ci/xfails/msm-apq8096-skips.txt | 4 +- .../msm-sc7180-trogdor-kingoftown-fails.txt | 145 -- .../msm-sc7180-trogdor-kingoftown-flakes.txt | 18 ++- .../msm-sc7180-trogdor-kingoftown-skips.txt | 5 +- ...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 145 -- ...m-sc7180-trogdor-lazor-limozeen-flakes.txt | 11 +- ...sm-sc7180-trogdor-lazor-limozeen-skips.txt | 2 +- .../gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 105 - .../gpu/drm/ci/xfails/msm-sdm845-skips.txt| 4 +- .../drm/ci/xfails/rockchip-rk3288-fails.txt | 2 +- .../drm/ci/xfails/rockchip-rk3288-skips.txt | 2 +- .../drm/ci/xfails/rockchip-rk3399-fails.txt | 2 +- .../drm/ci/xfails/rockchip-rk3399-flakes.txt | 4 +- .../drm/ci/xfails/rockchip-rk3399-skips.txt | 2 +- .../drm/ci/xfails/virtio_gpu-none-fails.txt | 64 .../drm/ci/xfails/virtio_gpu-none-skips.txt | 4 +- drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 4 - .../gpu/drm/ci/xfails/vkms-none-flakes.txt| 21 +++ drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 105 - 53 files changed, 527 insertions(+), 395 deletions(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 80fb0f57ae46..b09976c3d2c2 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -5,7 +5,7 @@ variables: UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next - IGT_VERSION: 0df7b9b97f9da0e364f5ee30fe331004b8c86b56 + IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5 DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git DEQP_RUNNER_GIT_TAG: v0.15.0 diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index 79f41d7da772..37c724dba8cb 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -80,6 +80,7 @@ igt-runner \ --igt-folder /igt/libexec/igt-gpu-tools \ --caselist $TESTLIST \ --output /results \ +- \ $IGT_SKIPS \ $IGT_FLAKES \ $IGT_FAILS \ diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt index e8c2f4044a92..2f74880671ca 100644 --- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt +++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt @@ -30,6 +30,7 @@ kms_cursor_crc@cursor-random-64x64,Fail kms_cursor_crc@cursor-size-change,Fail kms_cursor_crc@curs
Re: [PATCH v9 27/52] selftests-dyndbg: check KCONFIG_CONFIG to avoid silly fails
On 02/07/2024 18:57, Jim Cromie wrote:
Several tests are dependent upon config choices. Lets avoid failing
where that is noise.
The KCONFIG_CONFIG var exists to convey the config-file around. If
the var names a file, read it and extract the relevant CONFIG items,
and use them to skip the dependent tests, thus avoiding the fails that
would follow, and the disruption to whatever CI is running these
selftests.
If the envar doesn't name a config-file, ".config" is assumed.
CONFIG_DYNAMIC_DEBUG=y:
basic-tests() and comma-terminator-tests() test for the presence of
the builtin pr_debugs in module/main.c, which I deemed stable and
therefore safe to count. That said, the test fails if only
CONFIG_DYNAMIC_DEBUG_CORE=y is set. It could be rewritten to test
against test-dynamic-debug.ko, but that just trades one config
dependence for another.
CONFIG_TEST_DYNAMIC_DEBUG=m
As written, test_percent_splitting() modprobes test_dynamic_debug,
enables several classes, and count them. It could be re-written to
work for the builtin module also, but builtin test modules are not a
common or desirable build/config.
CONFIG_TEST_DYNAMIC_DEBUG=m && CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m
test_mod_submod() recaps the bug found in DRM-CI where drivers werent
If this fixes any but listed in drm/ci/xfails folder, please update it too.
Regards,
Helen
enabled by drm.debug=. It modprobes both test_dynamic_debug &
test_dynamic_debug_submod, so it depends on a loadable modules config.
It could be rewritten to work in a builtin parent config; DRM=y is
common enough to be pertinent, but testing that config also wouldn't
really test anything more fully than all-loadable modules, since they
default together.
Signed-off-by: Jim Cromie
fixup-kconfig
---
.../dynamic_debug/dyndbg_selftest.sh | 45 ++-
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
index fccd2012b548..d09ef26b2308 100755
--- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
+++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
@@ -11,6 +11,30 @@ CYAN="\033[0;36m"
NC="\033[0;0m"
error_msg=""
+[ -e /proc/dynamic_debug/control ] || {
+echo -e "${RED}: this test requires CONFIG_DYNAMIC_DEBUG=y ${NC}"
+exit 0 # nothing to test here, no good reason to fail.
+}
+
+# need info to avoid failures due to untestable configs
+
+[ -f "$KCONFIG_CONFIG" ] || KCONFIG_CONFIG=".config"
+if [ -f "$KCONFIG_CONFIG" ]; then
+echo "# consulting KCONFIG_CONFIG: $KCONFIG_CONFIG"
+grep -q "CONFIG_DYNAMIC_DEBUG=y" $KCONFIG_CONFIG ; LACK_DD_BUILTIN=$?
+grep -q "CONFIG_TEST_DYNAMIC_DEBUG=m" $KCONFIG_CONFIG ; LACK_TMOD=$?
+grep -q "CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m" $KCONFIG_CONFIG ;
LACK_TMOD_SUBMOD=$?
+if [ $V -eq 1 ]; then
+ echo LACK_DD_BUILTIN: $LACK_DD_BUILTIN
+ echo LACK_TMOD: $LACK_TMOD
+ echo LACK_TMOD_SUBMOD: $LACK_TMOD_SUBMOD
+fi
+else
+LACK_DD_BUILTIN=0
+LACK_TMOD=0
+LACK_TMOD_SUBMOD=0
+fi
+
function vx () {
echo $1 > /sys/module/dynamic_debug/parameters/verbose
}
@@ -192,6 +216,10 @@ function check_err_msg() {
function basic_tests {
echo -e "${GREEN}# BASIC_TESTS ${NC}"
+if [ $LACK_DD_BUILTIN -eq 1 ]; then
+ echo "SKIP"
+ return
+fi
ddcmd =_ # zero everything (except class'd sites)
check_match_ct =p 0
# there are several main's :-/
@@ -214,6 +242,10 @@ EOF
function comma_terminator_tests {
echo -e "${GREEN}# COMMA_TERMINATOR_TESTS ${NC}"
+if [ $LACK_DD_BUILTIN -eq 1 ]; then
+ echo "SKIP"
+ return
+fi
# try combos of spaces & commas
check_match_ct '\[params\]' 4 -r
ddcmd module,params,=_# commas as spaces
@@ -226,9 +258,12 @@ function comma_terminator_tests {
ddcmd =_
}
-
function test_percent_splitting {
echo -e "${GREEN}# TEST_PERCENT_SPLITTING - multi-command splitting on %
${NC}"
+if [ $LACK_TMOD -eq 1 ]; then
+ echo "SKIP"
+ return
+fi
ifrmmod test_dynamic_debug_submod
ifrmmod test_dynamic_debug
ddcmd =_
@@ -248,6 +283,14 @@ function test_percent_splitting {
function test_mod_submod {
echo -e "${GREEN}# TEST_MOD_SUBMOD ${NC}"
+if [ $LACK_TMOD -eq 1 ]; then
+ echo "SKIP"
+ return
+fi
+if [ $LACK_TMOD_SUBMOD -eq 1 ]; then
+ echo "SKIP"
+ return
+fi
ifrmmod test_dynamic_debug_submod
ifrmmod test_dynamic_debug
ddcmd =_
Re: Time for drm-ci-next?
On 24/06/2024 02:34, Vignesh Raman wrote: Hi, On 15/03/24 22:50, Rob Clark wrote: On Fri, Mar 15, 2024 at 2:28 AM Jani Nikula wrote: On Thu, 14 Mar 2024, Rob Clark wrote: When we first merged drm/ci I was unsure if it would need it's own -next branch. But after using it for a couple releases, a few times I've found myself wanting to backmerge drm/ci changes without necessarily backmerging all of drm-misc-next. So, maybe it makes some sense to have a drm-ci-next branch that driver-maintainers could back-merge as-needed? That's a crossmerge instead of a backmerge, and I feel that could get messy. What if folks crossmerge drm-ci-next but it gets rejected for drm-next? Or the baselines are different, and the crossmerge pulls in way more stuff than it should? Yeah, it would defeat the point a bit of drm-ci-next was on too new of a baseline, the whole point is to be able to merge CI changes without pulling in unrelated changes. So drm-ci-next would need to base on something older, like the previous kernel release tag. IMO the route should be drm-ci-next -> pull request to drm-next -> backmerge drm-next to drivers and drm-misc-next. I'm not opposed to having drm-ci-next at all, mainly indifferent, but I question the merge flows. And then the question becomes, does my suggested merge flow complicate your original goal? I guess we could avoid merging drm-ci-next until it had been merged into drm-next? Basically, I often find myself needing to merge CI patches on top of msm-next in order to run CI, and then after a clean CI run, reset HEAD back before the merge and force-push. Which isn't really how things should work. There are many CI patches merged recently to drm-misc-next. With the GitLab 18.0 release, CI/CD pipeline configurations must transition from using the deprecated CI_JOB_JWT to the new id_tokens method, as the former will be removed. Without the below commit kernel-build job pipelines fail in drm-ci, https://gitlab.freedesktop.org/drm/misc/kernel/-/commit/cc806b74466672a9bbd4e9a04265d44eb506b686 We need to cherry pick only this commit to fix this issue. So it would be beneficial to have a drm-ci-next branch. Regards, Vignesh I don't mind using a drm-ci-next branch if it is created. Thanks Helen
Re: [PATCH v6] drm/ci: add tests on vkms
On 14/06/2024 13:54, Helen Koike wrote:
On 14/06/2024 13:18, Vignesh Raman wrote:
Add job that runs igt on top of vkms.
Acked-by: Maíra Canal
Acked-by: Helen Koike
Signed-off-by: Vignesh Raman
Acked-by: Jessica Zhang
Tested-by: Jessica Zhang
Acked-by: Maxime Ripard
Signed-off-by: Helen Koike
---
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
v4:
- Build vkms as module and test with latest IGT.
This patch depends on
https://lore.kernel.org/dri-devel/20240130150340.687871-1-vignesh.ra...@collabora.com/
v5:
- Test with the updated IGT and update xfails
v6:
- Add metadata header for each flake test. Update skips file.
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1201477
Thanks!
If there are no more comments until monday I'm applying this.
Thanks all for reviewing and testing.
Regards,
Helen
Applied to drm-misc-next.
Thanks
Helen
---
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 | 24 +++-
drivers/gpu/drm/ci/x86_64.config | 1 +
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 57 +
.../gpu/drm/ci/xfails/vkms-none-flakes.txt | 69 ++
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 119 ++
10 files changed, 275 insertions(+), 6 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 8aee861d18f9..94065f5028cf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7036,6 +7036,7 @@ L: dri-devel@lists.freedesktop.org
S: Maintained
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
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 a67871fdcd3f..e938074ac8e7 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -157,7 +157,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 1b29c3b6406b..80fb0f57ae46 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -123,6 +123,7 @@ stages:
- msm
- rockchip
- virtio-gpu
+ - 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 d49ad434b580..79f41d7da772 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -30,10 +30,10 @@ case "$DRIVER_NAME" in
export IGT_FORCE_DRIVER="panfrost"
fi
;;
- 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 60323ebc7304..13eda37bdf05 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-06-10-vkms"
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 322cce714657..ee908b66aad2 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -338,7 +338,7 @@ meson:g12b:
RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
virtio_gpu:none:
- stage: virtio-gpu
+ stage: software-driver
variables:
CROSVM_GALLIUM_DRIVER: llvmpipe
DRIVER_NAME: virtio_gpu
@@ -358,3 +358,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
Re: [PATCH] drm/ci: mark kms_addfb_basic@addfb25-bad-modifier as passing on msm
On 13/06/2024 14:55, Dmitry Baryshkov wrote:
On Thu, 13 Jun 2024 at 20:49, Abhinav Kumar wrote:
On 6/13/2024 9:33 AM, Dmitry Baryshkov wrote:
The commit b228501ff183 ("drm/msm: merge dpu format database to MDP
formats") made get_format take modifiers into account. This makes
kms_addfb_basic@addfb25-bad-modifier pass on MDP4 and MDP5 platforms.
Signed-off-by: Dmitry Baryshkov
---
drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 1 -
drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 1 -
2 files changed, 2 deletions(-)
Would be good to also give a link to the CI for the CI maintainers.
But otherwise, LGTM
Reviewed-by: Abhinav Kumar
Yes, good idea: https://gitlab.freedesktop.org/drm/msm/-/merge_requests/119
Nice to see new tests passing!
Acked-by: Helen Koike
I'm applying it to drm-misc-next
Thanks,
Helen
diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
index 3dfbabdf905e..6e7fd1ccd1e3 100644
--- a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt
@@ -4,7 +4,6 @@ device_reset@unbind-cold-reset-rebind,Fail
device_reset@unbind-reset-rebind,Fail
dumb_buffer@invalid-bpp,Fail
kms_3d,Fail
-kms_addfb_basic@addfb25-bad-modifier,Fail
kms_cursor_legacy@forked-move,Fail
kms_cursor_legacy@single-bo,Fail
kms_cursor_legacy@torture-bo,Fail
diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
index 23a5f6f9097f..46ca69ce2ffe 100644
--- a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt
@@ -4,6 +4,5 @@ device_reset@unbind-cold-reset-rebind,Fail
device_reset@unbind-reset-rebind,Fail
dumb_buffer@invalid-bpp,Fail
kms_3d,Fail
-kms_addfb_basic@addfb25-bad-modifier,Fail
kms_lease@lease-uevent,Fail
tools_test@tools_test,Fail
---
base-commit: 6b4468b0c6ba37a16795da567b58dc80bc7fb439
change-id: 20240613-msm-pass-addfb25-bad-modifier-c461fd9c02bb
Best regards,
Re: [PATCH v6] drm/ci: add tests on vkms
On 14/06/2024 13:18, Vignesh Raman wrote:
Add job that runs igt on top of vkms.
Acked-by: Maíra Canal
Acked-by: Helen Koike
Signed-off-by: Vignesh Raman
Acked-by: Jessica Zhang
Tested-by: Jessica Zhang
Acked-by: Maxime Ripard
Signed-off-by: Helen Koike
---
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
v4:
- Build vkms as module and test with latest IGT.
This patch depends on
https://lore.kernel.org/dri-devel/20240130150340.687871-1-vignesh.ra...@collabora.com/
v5:
- Test with the updated IGT and update xfails
v6:
- Add metadata header for each flake test. Update skips file.
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1201477
Thanks!
If there are no more comments until monday I'm applying this.
Thanks all for reviewing and testing.
Regards,
Helen
---
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 | 24 +++-
drivers/gpu/drm/ci/x86_64.config | 1 +
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 57 +
.../gpu/drm/ci/xfails/vkms-none-flakes.txt| 69 ++
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 119 ++
10 files changed, 275 insertions(+), 6 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 8aee861d18f9..94065f5028cf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7036,6 +7036,7 @@ L:dri-devel@lists.freedesktop.org
S:Maintained
T:git https://gitlab.freedesktop.org/drm/misc/kernel.git
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 a67871fdcd3f..e938074ac8e7 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -157,7 +157,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 1b29c3b6406b..80fb0f57ae46 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -123,6 +123,7 @@ stages:
- msm
- rockchip
- virtio-gpu
+ - 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 d49ad434b580..79f41d7da772 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -30,10 +30,10 @@ case "$DRIVER_NAME" in
export IGT_FORCE_DRIVER="panfrost"
fi
;;
-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 60323ebc7304..13eda37bdf05 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-06-10-vkms"
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 322cce714657..ee908b66aad2 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -338,7 +338,7 @@ meson:g12b:
RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
virtio_gpu:none:
- stage: virtio-gpu
+ stage: software-driver
variables:
CROSVM_GALLIUM_DRIVER: llvmpipe
DRIVER_NAME: virtio_gpu
@@ -358,3 +358,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 /l
Re: [PATCH v5] drm/ci: add tests on vkms
On 11/06/2024 07:47, Vignesh Raman wrote:
Hi,
Successful pipeline link,
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1198487
lgtm, I'm applying this tomorrow if there are no more comments.
Regards,
Helen
Regards,
Vignesh
On 11/06/24 14:40, Vignesh Raman wrote:
Add job that runs igt on top of vkms.
Acked-by: Maíra Canal
Acked-by: Helen Koike
Signed-off-by: Vignesh Raman
Acked-by: Jessica Zhang
Tested-by: Jessica Zhang
Acked-by: Maxime Ripard
Signed-off-by: Helen Koike
---
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
v4:
- Build vkms as module and test with latest IGT.
This patch depends on
https://lore.kernel.org/dri-devel/20240130150340.687871-1-vignesh.ra...@collabora.com/
v5:
- Test with the updated IGT and update xfails
---
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 | 24 ++-
drivers/gpu/drm/ci/x86_64.config | 1 +
drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 57
.../gpu/drm/ci/xfails/vkms-none-flakes.txt | 15 +
drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 67 +++
10 files changed, 169 insertions(+), 6 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 8aee861d18f9..94065f5028cf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7036,6 +7036,7 @@ L: dri-devel@lists.freedesktop.org
S: Maintained
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
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 a67871fdcd3f..e938074ac8e7 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -157,7 +157,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 1b29c3b6406b..80fb0f57ae46 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -123,6 +123,7 @@ stages:
- msm
- rockchip
- virtio-gpu
+ - 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 d49ad434b580..79f41d7da772 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -30,10 +30,10 @@ case "$DRIVER_NAME" in
export IGT_FORCE_DRIVER="panfrost"
fi
;;
- 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 60323ebc7304..13eda37bdf05 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-06-10-vkms"
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 322cce714657..ee908b66aad2 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -338,7 +338,7 @@ meson:g12b:
RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
virtio_gpu:none:
- stage: virtio-gpu
+ stage: software-driver
variables:
CROSVM_GALLIUM_DRIVER: llvmpipe
DRIVER_NAME: virtio_gpu
@@ -358,3 +358,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
Re: [PATCH v3 0/6] drm/ci: uprev mesa/IGT and generate testlist
On 28/05/2024 23:40, Vignesh Raman wrote: Uprev mesa and IGT to the latest version and stop vendoring the testlist into the kernel. Instead, use the testlist from the IGT build to ensure we do not miss renamed or newly added tests. Update the xfails with the latest testlist run. Add farm variable and update device type variable. https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1187556 Vignesh Raman (6): drm/ci: uprev mesa version drm/ci: add farm variable drm/ci: generate testlist from build drm/ci: uprev IGT drm/ci: skip driver specific tests drm/ci: update xfails for the new testlist drivers/gpu/drm/ci/build-igt.sh | 41 +- drivers/gpu/drm/ci/build.sh |6 +- drivers/gpu/drm/ci/container.yml | 12 +- drivers/gpu/drm/ci/gitlab-ci.yml | 46 +- drivers/gpu/drm/ci/igt_runner.sh |9 +- drivers/gpu/drm/ci/image-tags.yml |2 +- drivers/gpu/drm/ci/lava-submit.sh |4 +- drivers/gpu/drm/ci/test.yml | 17 +- drivers/gpu/drm/ci/testlist.txt | 2761 - .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 41 +- .../drm/ci/xfails/amdgpu-stoney-flakes.txt|7 + .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 33 +- drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 31 + .../gpu/drm/ci/xfails/i915-amly-flakes.txt|9 + drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 22 +- drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 46 +- drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt |6 + drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 26 +- drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 38 + drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt |6 + drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 23 + drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 41 +- drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt |7 + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 26 +- drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 42 +- drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt |7 +- drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 36 +- drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 77 +- drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 28 +- drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 63 +- drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt |6 + drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 22 +- .../drm/ci/xfails/mediatek-mt8173-fails.txt | 30 +- .../drm/ci/xfails/mediatek-mt8173-flakes.txt | 11 + .../drm/ci/xfails/mediatek-mt8173-skips.txt | 16 + .../drm/ci/xfails/mediatek-mt8183-fails.txt | 21 +- .../drm/ci/xfails/mediatek-mt8183-skips.txt | 18 + .../gpu/drm/ci/xfails/meson-g12b-fails.txt| 24 +- .../gpu/drm/ci/xfails/meson-g12b-skips.txt| 18 + .../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 12 +- .../gpu/drm/ci/xfails/msm-apq8016-skips.txt | 15 + .../gpu/drm/ci/xfails/msm-apq8096-fails.txt |7 + .../gpu/drm/ci/xfails/msm-apq8096-flakes.txt |6 + .../gpu/drm/ci/xfails/msm-apq8096-skips.txt | 26 +- .../msm-sc7180-trogdor-kingoftown-fails.txt | 175 +- .../msm-sc7180-trogdor-kingoftown-flakes.txt |8 + .../msm-sc7180-trogdor-kingoftown-skips.txt | 19 + ...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 175 +- ...m-sc7180-trogdor-lazor-limozeen-flakes.txt |6 + ...sm-sc7180-trogdor-lazor-limozeen-skips.txt | 16 + .../gpu/drm/ci/xfails/msm-sdm845-fails.txt| 38 +- .../gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 25 +- .../gpu/drm/ci/xfails/msm-sdm845-skips.txt| 19 + .../drm/ci/xfails/rockchip-rk3288-fails.txt | 62 +- .../drm/ci/xfails/rockchip-rk3288-skips.txt | 21 +- .../drm/ci/xfails/rockchip-rk3399-fails.txt | 83 +- .../drm/ci/xfails/rockchip-rk3399-flakes.txt | 13 +- .../drm/ci/xfails/rockchip-rk3399-skips.txt | 19 + drivers/gpu/drm/ci/xfails/update-xfails.py|4 +- .../drm/ci/xfails/virtio_gpu-none-fails.txt | 94 +- .../drm/ci/xfails/virtio_gpu-none-skips.txt | 20 +- 61 files changed, 1348 insertions(+), 3194 deletions(-) delete mode 100644 drivers/gpu/drm/ci/testlist.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt create mode 100644 drivers/gp
Re: [PATCH v3 6/6] drm/ci: update xfails for the new testlist
On 29/05/2024 06:49, Vignesh Raman wrote: Hi Dmitry, On 29/05/24 13:30, Dmitry Baryshkov wrote: On Wed, May 29, 2024 at 08:10:49AM +0530, Vignesh Raman wrote: Now the testlist is used from IGT build, so update xfails with the new testlist. Set the timeout of all i915 jobs to 1h30m since some jobs takes more than 1 hour to complete. Reviewed-by: Dmitry Baryshkov This had an explicit '# msm testlist' at the end. Please don't drop important parts of tags. I didn't review fails/flakes for other platforms. Sorry I missed it. Will ask Helen to add the tag back when she merges this. I'll add it Acked-by: Helen Koike Thanks. Helen Regards, Vignesh Signed-off-by: Vignesh Raman --- v2: - Set the timeout of all i915 jobs to 1h30m and updated expectations file. v3: - Add a link to the email reporting the flaky tests to the maintainers. --- drivers/gpu/drm/ci/test.yml | 6 +- .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 41 ++-- .../drm/ci/xfails/amdgpu-stoney-flakes.txt | 7 + .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 18 ++ drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 31 .../gpu/drm/ci/xfails/i915-amly-flakes.txt | 9 + drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 11 ++ drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 46 +++-- drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 6 + drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 15 ++ drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 38 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 6 + drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 14 ++ drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 41 +++- drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 7 + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 15 ++ drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 42 ++--- drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 7 +- drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 25 +++ drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 77 drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 17 ++ drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 63 --- drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 6 + drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 11 ++ .../drm/ci/xfails/mediatek-mt8173-fails.txt | 30 ++- .../drm/ci/xfails/mediatek-mt8173-flakes.txt | 11 ++ .../drm/ci/xfails/mediatek-mt8173-skips.txt | 4 + .../drm/ci/xfails/mediatek-mt8183-fails.txt | 21 +-- .../drm/ci/xfails/mediatek-mt8183-skips.txt | 4 + .../gpu/drm/ci/xfails/meson-g12b-fails.txt | 24 +-- .../gpu/drm/ci/xfails/meson-g12b-skips.txt | 4 + .../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 12 +- .../gpu/drm/ci/xfails/msm-apq8016-skips.txt | 4 + .../gpu/drm/ci/xfails/msm-apq8096-fails.txt | 7 + .../gpu/drm/ci/xfails/msm-apq8096-flakes.txt | 6 + .../gpu/drm/ci/xfails/msm-apq8096-skips.txt | 12 ++ .../msm-sc7180-trogdor-kingoftown-fails.txt | 175 +- .../msm-sc7180-trogdor-kingoftown-flakes.txt | 8 + .../msm-sc7180-trogdor-kingoftown-skips.txt | 7 + ...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 175 +- ...m-sc7180-trogdor-lazor-limozeen-flakes.txt | 6 + ...sm-sc7180-trogdor-lazor-limozeen-skips.txt | 4 + .../gpu/drm/ci/xfails/msm-sdm845-fails.txt | 38 +--- .../gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 25 ++- .../gpu/drm/ci/xfails/msm-sdm845-skips.txt | 7 + .../drm/ci/xfails/rockchip-rk3288-fails.txt | 62 +-- .../drm/ci/xfails/rockchip-rk3288-skips.txt | 4 + .../drm/ci/xfails/rockchip-rk3399-fails.txt | 83 + .../drm/ci/xfails/rockchip-rk3399-flakes.txt | 13 +- .../drm/ci/xfails/rockchip-rk3399-skips.txt | 4 + drivers/gpu/drm/ci/xfails/update-xfails.py | 4 +- .../drm/ci/xfails/virtio_gpu-none-fails.txt | 94 +++--- .../drm/ci/xfails/virtio_gpu-none-skips.txt | 4 + 53 files changed, 1023 insertions(+), 388 deletions(-) create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-flakes.txt diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 2615f67f6aa3..322cce714657 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -191,6 +191,7 @@ rockchip:rk3399: extends: - .lava-igt:x86_64 stage: i915 + timeo
Re: [PATCH v3 5/6] drm/ci: skip driver specific tests
On 28/05/2024 23:40, Vignesh Raman wrote: Skip driver specific tests and skip kms tests for panfrost driver since it is not a kms driver. Reviewed-by: Dmitry Baryshkov Signed-off-by: Vignesh Raman Acked-by: Helen Koike --- v2: - Skip xe tests for amdgpu and virtio. v3: - No changes. --- .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 15 ++- drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 11 ++- drivers/gpu/drm/ci/xfails/i915-apl-skips.txt| 11 ++- drivers/gpu/drm/ci/xfails/i915-cml-skips.txt| 9 + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt| 11 ++- drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt| 11 ++- drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt| 11 ++- drivers/gpu/drm/ci/xfails/i915-whl-skips.txt| 11 ++- .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 12 .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 14 ++ drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt | 14 ++ drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt | 11 +++ drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt | 14 +- .../msm-sc7180-trogdor-kingoftown-skips.txt | 12 .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 12 drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 12 .../gpu/drm/ci/xfails/rockchip-rk3288-skips.txt | 17 - .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 15 +++ .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 16 +++- 19 files changed, 229 insertions(+), 10 deletions(-) create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt index e2c538a0f954..21d26d5e67c2 100644 --- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt +++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt @@ -1,2 +1,15 @@ # Suspend to RAM seems to be broken on this machine -.*suspend.* \ No newline at end of file +.*suspend.* + +# Skip driver specific tests +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* + +# Skip intel specific tests +gem_.* +i915_.* +xe_.* diff --git a/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt b/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt index fe55540a3f9a..1e80987cf584 100644 --- a/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt @@ -1,4 +1,13 @@ # Suspend to RAM seems to be broken on this machine .*suspend.* # This is generating kernel oops with divide error -kms_plane_scaling@invalid-parameters \ No newline at end of file +kms_plane_scaling@invalid-parameters + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* diff --git a/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt b/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt index 3430b215c06e..0104f2ffa8ba 100644 --- a/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt @@ -3,4 +3,13 @@ # This is generating kernel oops with divide error kms_plane_scaling@invalid-parameters # This is cascading issues -kms_3d \ No newline at end of file +kms_3d + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt b/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt index 6d3d7ddc377f..398ebe163ad0 100644 --- a/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt @@ -1,2 +1,11 @@ # This is generating kernel oops with divide error kms_plane_scaling@invalid-parameters + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* diff --git a/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt b/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt index 4c7d00ce14bc..4f5419d62170 100644 --- a/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt @@ -2,4 +2,13 @@ .*suspend.* # This is generating kernel oops with divide error -kms_plane_scaling@invalid-parameters \ No newline at end of file +kms_plane_scaling@invalid-parameters + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* diff --git a/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt b/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt index 4c7d00ce14bc..4f5419d62170 100644 --- a/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt @@ -2,4 +2,13 @@ .*suspend.* # This is generating kernel oops with divide error -kms_plane_scaling@invalid-parameters
Re: [PATCH v3 4/6] drm/ci: uprev IGT
On 28/05/2024 23:40, Vignesh Raman wrote:
test-list.txt and test-list-full.txt are not generated for
cross-builds and they are required by drm-ci for testing
arm32 targets. This is fixed in igt-gpu-tools. So uprev
IGT to include the commit which fixes this issue. Also
disable building xe driver tests for non-intel platforms.
Reviewed-by: Dmitry Baryshkov
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
---
v2:
- Split IGT uprev to seperate patch.
v3:
- No changes.
---
drivers/gpu/drm/ci/build-igt.sh | 4
drivers/gpu/drm/ci/gitlab-ci.yml | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ci/build-igt.sh b/drivers/gpu/drm/ci/build-igt.sh
index b7d2a49a6db3..eddb5f782a5e 100644
--- a/drivers/gpu/drm/ci/build-igt.sh
+++ b/drivers/gpu/drm/ci/build-igt.sh
@@ -45,6 +45,10 @@ MESON_OPTIONS="-Doverlay=disabled\
-Dlibunwind=enabled \
-Dprefix=/igt"
+if [[ "$KERNEL_ARCH" = "arm64" ]] || [[ "$KERNEL_ARCH" = "arm" ]]; then
+MESON_OPTIONS="$MESON_OPTIONS -Dxe_driver=disabled"
+fi
+
mkdir -p /igt
meson build $MESON_OPTIONS $EXTRA_MESON_ARGS
ninja -C build -j${FDO_CI_CONCURRENT:-4} || ninja -C build -j 1
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 8f32de63d92e..1b29c3b6406b 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
TARGET_BRANCH: drm-next
- IGT_VERSION: d2af13d9f5be5ce23d996e4afd3e45990f5ab977
+ IGT_VERSION: 0df7b9b97f9da0e364f5ee30fe331004b8c86b56
DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git
DEQP_RUNNER_GIT_TAG: v0.15.0
Re: [PATCH v3 2/6] drm/ci: add farm variable
On 28/05/2024 23:40, Vignesh Raman wrote:
Mesa uses structured logs for logging and debug purpose,
https://mesa.pages.freedesktop.org/-/mesa/-/jobs/59165650/artifacts/results/job_detail.json
Since drm-ci uses the mesa scripts, add the farm variable
and update the device type for missing jobs.
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
---
v3:
- New commit to add farm variable and update device type variable.
---
drivers/gpu/drm/ci/test.yml | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 8bc63912fddb..2615f67f6aa3 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -24,6 +24,7 @@
variables:
HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
DEBIAN_ARCH: "armhf"
+FARM: collabora
dependencies:
- testing:arm32
needs:
@@ -39,6 +40,7 @@
variables:
HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
DEBIAN_ARCH: "arm64"
+FARM: collabora
dependencies:
- testing:arm64
needs:
@@ -54,6 +56,7 @@
variables:
HWCI_TEST_SCRIPT: "/install/igt_runner.sh"
DEBIAN_ARCH: "amd64"
+FARM: collabora
dependencies:
- testing:x86_64
needs:
@@ -74,6 +77,7 @@
S3_ARTIFACT_NAME: "arm64/kernel-files"
BM_KERNEL: https://${PIPELINE_ARTIFACTS_BASE}/arm64/Image.gz
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS
root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
+FARM: google
needs:
- debian/arm64_test
- job: testing:arm64
@@ -116,8 +120,9 @@ msm:apq8016:
- .baremetal-igt-arm64
stage: msm
variables:
+DEVICE_TYPE: apq8016-sbc-usb-host
DRIVER_NAME: msm
-BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/apq8016-sbc-usb-host.dtb
+BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/${DEVICE_TYPE}.dtb
GPU_VERSION: apq8016
# disabling unused clocks congests with the MDSS runtime PM trying to
# disable those clocks and causes boot to fail.
@@ -132,9 +137,10 @@ msm:apq8096:
- .baremetal-igt-arm64
stage: msm
variables:
+DEVICE_TYPE: apq8096-db820c
DRIVER_NAME: msm
BM_KERNEL_EXTRA_ARGS: maxcpus=2
-BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/apq8096-db820c.dtb
+BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/${DEVICE_TYPE}.dtb
GPU_VERSION: apq8096
RUNNER_TAG: google-freedreno-db820c
script:
@@ -146,6 +152,7 @@ msm:sdm845:
stage: msm
parallel: 6
variables:
+DEVICE_TYPE: sdm845-cheza-r3
DRIVER_NAME: msm
BM_KERNEL: https://${PIPELINE_ARTIFACTS_BASE}/arm64/cheza-kernel
GPU_VERSION: sdm845
Re: [PATCH v3 1/6] drm/ci: uprev mesa version
On 28/05/2024 23:40, Vignesh Raman wrote:
zlib.net is not allowing tarball download anymore and results
in below error in kernel+rootfs_arm32 container build,
urllib.error.HTTPError: HTTP Error 403: Forbidden
urllib.error.HTTPError: HTTP Error 415: Unsupported Media Type
Uprev mesa to latest version which includes a fix for this issue.
https://gitlab.freedesktop.org/mesa/mesa/-/commit/908f444e
Use id_tokens for JWT authentication. Since s3 bucket is migrated to
mesa-rootfs, update the variables accordingly. Also copy helper scripts
to install, so that the ci jobs can use these scripts for logging.
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
---
v2:
- Uprev to recent version and use id_tokens for JWT authentication
v3:
- Move adding farm variable and updating device type variable to seperate
commit
---
drivers/gpu/drm/ci/build-igt.sh | 2 +-
drivers/gpu/drm/ci/build.sh | 6 +++--
drivers/gpu/drm/ci/container.yml | 12 +++--
drivers/gpu/drm/ci/gitlab-ci.yml | 44 +--
drivers/gpu/drm/ci/image-tags.yml | 2 +-
drivers/gpu/drm/ci/lava-submit.sh | 4 +--
6 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/ci/build-igt.sh b/drivers/gpu/drm/ci/build-igt.sh
index 500fa4f5c30a..7859554756c4 100644
--- a/drivers/gpu/drm/ci/build-igt.sh
+++ b/drivers/gpu/drm/ci/build-igt.sh
@@ -32,4 +32,4 @@ tar -cf artifacts/igt.tar /igt
# Pass needed files to the test stage
S3_ARTIFACT_NAME="igt.tar.gz"
gzip -c artifacts/igt.tar > ${S3_ARTIFACT_NAME}
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${S3_ARTIFACT_NAME}
https://${PIPELINE_ARTIFACTS_BASE}/${KERNEL_ARCH}/${S3_ARTIFACT_NAME}
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_NAME}
https://${PIPELINE_ARTIFACTS_BASE}/${KERNEL_ARCH}/${S3_ARTIFACT_NAME}
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 106f2d40d222..a67871fdcd3f 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -128,6 +128,7 @@ fi
# Pass needed files to the test stage
mkdir -p install
cp -rfv .gitlab-ci/* install/.
+cp -rfv ci/* install/.
cp -rfv install/common install/ci-common
cp -rfv drivers/gpu/drm/ci/* install/.
@@ -141,14 +142,15 @@ if [[ "$UPLOAD_TO_MINIO" = "1" ]]; then
FILES_TO_UPLOAD="$FILES_TO_UPLOAD $(basename -a $DEVICE_TREES)"
fi
+ls -l "${S3_JWT_FILE}"
for f in $FILES_TO_UPLOAD; do
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" /lava-files/$f \
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" /lava-files/$f \
https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/$f
done
S3_ARTIFACT_NAME="kernel-files.tar.zst"
tar --zstd -cf $S3_ARTIFACT_NAME install
-ci-fairy s3cp --token-file "${CI_JOB_JWT_FILE}" ${S3_ARTIFACT_NAME}
https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/${S3_ARTIFACT_NAME}
+ci-fairy s3cp --token-file "${S3_JWT_FILE}" ${S3_ARTIFACT_NAME}
https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/${S3_ARTIFACT_NAME}
echo "Download vmlinux.xz from https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/vmlinux.xz";
fi
diff --git a/drivers/gpu/drm/ci/container.yml b/drivers/gpu/drm/ci/container.yml
index 9764e7921a4f..d6edf3635b23 100644
--- a/drivers/gpu/drm/ci/container.yml
+++ b/drivers/gpu/drm/ci/container.yml
@@ -36,15 +36,15 @@ debian/android_build:
rules:
- when: never
-debian/x86_64_test-android:
+.debian/x86_64_test-android:
rules:
- when: never
-windows_build_vs2019:
+windows_build_msvc:
rules:
- when: never
-windows_test_vs2019:
+windows_test_msvc:
rules:
- when: never
@@ -56,10 +56,6 @@ rustfmt:
rules:
- when: never
-windows_vs2019:
- rules:
-- when: never
-
-clang-format:
+windows_msvc:
rules:
- when: never
\ No newline at end of file
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 084e3ff8e3f4..8f32de63d92e 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
9d162de9a05155e1c4041857a5848842749164cf
+ DRM_CI_COMMIT_SHA: &drm-ci-commit-sha
e2b9c5a9e3e4f9b532067af8022eaef8d6fc6c00
UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
TARGET_BRANCH: drm-next
@@ -19,33 +19,47 @@ variables:
bash download-git-cache.sh
rm download-git-cache.sh
set +o xtrace
+ S3_JWT_FILE: /s3_jwt
S3_HOST: s3.freedesktop.org
+ # This bucket is used to fetch the kernel image
+ S3_KERNEL_BUCKET: mesa-rootfs
+ # Bucket for git cache
+ S3_GITCACHE_BUCKET: git-cache
+ # Bucket for the pipeline artifacts pushed to S3
+ S3_ARTIFACTS_BUC
Re: [PATCH v2 0/2] drm/msm/gen_header: allow skipping the validation
On 03/05/2024 17:23, Dmitry Baryshkov wrote: On Fri, 3 May 2024 at 21:15, Dmitry Baryshkov wrote: In order to remove pointless messages regarding missing lxml, skip validation of MSM register files against the schema. Only the driver developers really care and/or can fix the files. Keep the validation enabled during one of DRM CI stages, so that we still catch errors, introduced by mistake. Helen, could you please ack merging the second patch through drm/msm tree? Done. --- Dmitry Baryshkov (2): drm/msm/gen_header: allow skipping the validation drm/ci: validate drm/msm XML register files against schema
Re: [PATCH v2 2/2] drm/ci: validate drm/msm XML register files against schema
On 03/05/2024 21:07, Abhinav Kumar wrote: On 5/3/2024 5:02 PM, Dmitry Baryshkov wrote: On Sat, 4 May 2024 at 01:38, Abhinav Kumar wrote: On 5/3/2024 1:20 PM, Dmitry Baryshkov wrote: On Fri, 3 May 2024 at 22:42, Abhinav Kumar wrote: On 5/3/2024 11:15 AM, Dmitry Baryshkov wrote: In order to validate drm/msm register definition files against schema, reuse the nodebugfs build step. The validation entry is guarded by the EXPERT Kconfig option and we don't want to enable that option for all the builds. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/ci/build.sh | 3 +++ drivers/gpu/drm/ci/build.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 106f2d40d222..28a495c0c39c 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -12,6 +12,9 @@ rm -rf .git/rebase-apply apt-get update apt-get install -y libssl-dev +# for msm header validation +apt-get install -y python3-lxml + if [[ "$KERNEL_ARCH" = "arm64" ]]; then GCC_ARCH="aarch64-linux-gnu" DEBIAN_ARCH="arm64" diff --git a/drivers/gpu/drm/ci/build.yml b/drivers/gpu/drm/ci/build.yml index 17ab38304885..9c198239033d 100644 --- a/drivers/gpu/drm/ci/build.yml +++ b/drivers/gpu/drm/ci/build.yml @@ -106,6 +106,7 @@ build-nodebugfs:arm64: extends: .build:arm64 variables: DISABLE_KCONFIGS: "DEBUG_FS" + ENABLE_KCONFIGS: "EXPERT DRM_MSM_VALIDATE_XML" Wouldnt this end up enabling DRM_MSM_VALIDATE_XML for any arm64 device. Cant we make this build rule msm specific? No need to. We just need to validate the files at least once during the whole pipeline build. ah okay, today the arm64 config anyway sets all arm64 vendor drm configs to y. A couple of more questions: 1) Why is this enabled only for no-debugfs option? 2) Will there be any concerns from other vendors to enable CONFIG_EXPERT in their CI runs as the arm64 config is shared across all arm64 vendors. I don't get the second question. This option is only enabled for no-debugfs, which isn't used for execution. Ah I see, makes sense. I didn't want to add an extra build stage, just for the sake of validating regs against the schema, nor did I want EXPERT to find its way into the actual running kernels. This answered my second question actually. That basically I didnt also want EXPERT to find its way into actual running kernels. Hence, I am fine with this change now Reviewed-by: Abhinav Kumar But, I will wait to hear from helen, vignesh about what they think of this. lgfm Acked-by: Helen Koike Thanks Helen
Re: [PATCH v1 5/5] drm/ci: update xfails for the new testlist
On 30/04/2024 06:11, Vignesh Raman wrote: Now the testlist is used from IGT build, so update xfails with the new testlist. Signed-off-by: Vignesh Raman --- .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 47 +++ .../drm/ci/xfails/amdgpu-stoney-flakes.txt| 8 +- .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 15 drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 22 - .../gpu/drm/ci/xfails/i915-amly-flakes.txt| 8 ++ drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 8 ++ drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 45 +- drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 5 ++ drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 12 +++ drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 26 +- drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 6 ++ drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 8 ++ drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 28 +-- drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 12 +++ drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 39 - drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 10 ++- drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 21 + drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 75 + drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 13 +++ drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 46 +-- drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 8 ++ .../drm/ci/xfails/mediatek-mt8173-fails.txt | 47 +++ .../drm/ci/xfails/mediatek-mt8183-fails.txt | 17 +--- .../drm/ci/xfails/mediatek-mt8183-flakes.txt | 5 ++ .../gpu/drm/ci/xfails/meson-g12b-fails.txt| 20 + .../gpu/drm/ci/xfails/meson-g12b-flakes.txt | 5 ++ .../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 26 ++ .../gpu/drm/ci/xfails/msm-apq8016-flakes.txt | 5 ++ .../gpu/drm/ci/xfails/msm-apq8096-fails.txt | 5 +- .../gpu/drm/ci/xfails/msm-apq8096-flakes.txt | 5 ++ .../gpu/drm/ci/xfails/msm-apq8096-skips.txt | 67 +++ .../msm-sc7180-trogdor-kingoftown-fails.txt | 34 .../msm-sc7180-trogdor-kingoftown-flakes.txt | 5 ++ ...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 34 ...m-sc7180-trogdor-lazor-limozeen-flakes.txt | 5 ++ .../gpu/drm/ci/xfails/msm-sdm845-fails.txt| 75 - .../gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 26 ++ .../drm/ci/xfails/rockchip-rk3288-fails.txt | 54 .../drm/ci/xfails/rockchip-rk3399-fails.txt | 80 ++ .../drm/ci/xfails/rockchip-rk3399-flakes.txt | 7 -- .../drm/ci/xfails/virtio_gpu-none-fails.txt | 82 +-- .../drm/ci/xfails/virtio_gpu-none-skips.txt | 3 + 42 files changed, 574 insertions(+), 495 deletions(-) create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-flakes.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-flakes.txt delete mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt delete mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt index ea87dc46bc2b..a48df7880ec5 100644 --- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt +++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt @@ -1,27 +1,46 @@ -kms_addfb_basic@bad-pitch-65536,Fail +amdgpu/amd_assr@assr-links,Fail +amdgpu/amd_assr@assr-links-dpms,Fail +amdgpu/amd_deadlock@amdgpu-deadlock-compute,Timeout +amdgpu/amd_ilr@ilr-policy,Fail +amdgpu/amd_mall@static-screen,Crash +amdgpu/amd_mode_switch@mode-switch-first-last-pipe-2,Crash +amdgpu/amd_pci_unplug@amdgpu_hotunplug_simple,Fail +amdgpu/amd_pci_unplug@amdgpu_hotunplug_with_cs,Fail +amdgpu/amd_pci_unplug@amdgpu_hotunplug_with_exported_bo,Fail +amdgpu/amd_plane@mpo-pan-nv12,Fail +amdgpu/amd_plane@mpo-pan-p010,Fail +amdgpu/amd_plane@mpo-pan-rgb,Crash +amdgpu/amd_plane@mpo-scale-nv12,Fail +amdgpu/amd_plane@mpo-scale-p010,Fail +amdgpu/amd_plane@mpo-scale-rgb,Crash +amdgpu/amd_plane@mpo-swizzle-toggle,Fail +amdgpu/amd_uvd_dec@amdgpu_uvd_decode,Fail +amdgpu/amd_vce_dec@amdgpu_cs_vce_destroy,Fail +amdgpu/amd_vce_dec@amdgpu_cs_vce_encode,Fail +amdgpu/amd_vm@amdgpu-vm-unaligned-map,Fail +amdgpu/amd_vrr_range@freesync-parsing,Timeout +device_reset@unbind-cold-reset-rebind,Fail +dumb_buffer@invalid-bpp,Fail kms_addfb_basic@bo-too-small,Fail kms_addfb_basic@too-high,Fail kms_async_flips@async-flip-with-page-flip-events,Fail -kms_as
Re: [PATCH v1 4/5] drm/ci: skip driver specific tests
On 30/04/2024 06:11, Vignesh Raman wrote: Skip driver specific tests and skip kms tests for panfrost driver since it is not a kms driver. Signed-off-by: Vignesh Raman --- .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 14 +- drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 14 +- drivers/gpu/drm/ci/xfails/i915-apl-skips.txt| 14 +- drivers/gpu/drm/ci/xfails/i915-cml-skips.txt| 12 drivers/gpu/drm/ci/xfails/i915-glk-skips.txt| 14 +- drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt| 14 +- drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt| 14 +- drivers/gpu/drm/ci/xfails/i915-whl-skips.txt| 14 +- .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 12 .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 14 ++ drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt | 14 ++ drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt | 14 ++ drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt | 14 +- .../msm-sc7180-trogdor-kingoftown-skips.txt | 15 +++ .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 15 +++ drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 15 +++ .../gpu/drm/ci/xfails/rockchip-rk3288-skips.txt | 17 - .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 15 +++ .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 15 ++- 19 files changed, 260 insertions(+), 10 deletions(-) create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt index e2c538a0f954..70e2f925d06f 100644 --- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt +++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt @@ -1,2 +1,14 @@ # Suspend to RAM seems to be broken on this machine -.*suspend.* \ No newline at end of file +.*suspend.* + +# Skip driver specific tests +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* + +# Skip intel specific tests +gem_.* +i915_.* diff --git a/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt b/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt index fe55540a3f9a..59f8acfaa5ba 100644 --- a/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-amly-skips.txt @@ -1,4 +1,16 @@ # Suspend to RAM seems to be broken on this machine .*suspend.* # This is generating kernel oops with divide error -kms_plane_scaling@invalid-parameters \ No newline at end of file +kms_plane_scaling@invalid-parameters + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* + +# GEM tests takes ~1000 hours, so skip it +gem_.* diff --git a/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt b/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt index 3430b215c06e..d97bc038b63a 100644 --- a/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-apl-skips.txt @@ -3,4 +3,16 @@ # This is generating kernel oops with divide error kms_plane_scaling@invalid-parameters # This is cascading issues -kms_3d \ No newline at end of file +kms_3d + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* + +# GEM tests takes ~1000 hours, so skip it +gem_.* diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt b/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt index 6d3d7ddc377f..92c0ffee8283 100644 --- a/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-cml-skips.txt @@ -1,2 +1,14 @@ # This is generating kernel oops with divide error kms_plane_scaling@invalid-parameters + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* + +# GEM tests takes ~1000 hours, so skip it +gem_.* diff --git a/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt b/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt index 4c7d00ce14bc..a168722caf13 100644 --- a/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-glk-skips.txt @@ -2,4 +2,16 @@ .*suspend.* # This is generating kernel oops with divide error -kms_plane_scaling@invalid-parameters \ No newline at end of file +kms_plane_scaling@invalid-parameters + +# Skip driver specific tests +^amdgpu.* +msm_.* +nouveau_.* +panfrost_.* +^v3d.* +^vc4.* +^vmwgfx* + +# GEM tests takes ~1000 hours, so skip it +gem_.* diff --git a/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt b/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt index 4c7d00ce14bc..a168722caf13 100644 --- a/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt +++ b/drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt @@ -2,4 +2,16 @@ .*suspen
Re: [PATCH v1 3/5] drm/ci: build virtual GPU driver as module
On 30/04/2024 06:11, Vignesh Raman wrote:
With latest IGT, the tests tries to load the module and it
fails. So build the virtual GPU driver for virtio as module.
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
---
drivers/gpu/drm/ci/build.sh | 1 -
drivers/gpu/drm/ci/igt_runner.sh | 6 +++---
drivers/gpu/drm/ci/image-tags.yml | 4 ++--
drivers/gpu/drm/ci/test.yml | 1 +
drivers/gpu/drm/ci/x86_64.config | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 8a3baa003904..95493df9cdc2 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -156,7 +156,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/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index 20026612a9bd..55532f79fbdc 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -30,10 +30,10 @@ case "$DRIVER_NAME" in
export IGT_FORCE_DRIVER="panfrost"
fi
;;
-amdgpu)
+amdgpu|virtio_gpu)
# 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 d8f72b82c938..fd1cb6061166 100644
--- a/drivers/gpu/drm/ci/image-tags.yml
+++ b/drivers/gpu/drm/ci/image-tags.yml
@@ -4,9 +4,9 @@ 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-04-22-virtio"
- KERNEL_ROOTFS_TAG: "2023-10-06-amd"
+ KERNEL_ROOTFS_TAG: "2024-04-22-virtio"
PKG_REPO_REV: "3cc12a2a"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 612c9ede3507..864ac3809d84 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -350,6 +350,7 @@ virtio_gpu:none:
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
diff --git a/drivers/gpu/drm/ci/x86_64.config b/drivers/gpu/drm/ci/x86_64.config
index 1cbd49a5b23a..78479f063e8e 100644
--- a/drivers/gpu/drm/ci/x86_64.config
+++ b/drivers/gpu/drm/ci/x86_64.config
@@ -91,7 +91,7 @@ CONFIG_KVM=y
CONFIG_KVM_GUEST=y
CONFIG_VIRT_DRIVERS=y
CONFIG_VIRTIO_FS=y
-CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_DRM_VIRTIO_GPU=m
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_CONSOLE=y
Re: [PATCH v1 1/5] drm/ci: uprev mesa version
On 30/04/2024 06:11, Vignesh Raman wrote:
zlib.net is not allowing tarball download anymore and results
in below error in kernel+rootfs_arm32 container build,
urllib.error.HTTPError: HTTP Error 403: Forbidden
urllib.error.HTTPError: HTTP Error 415: Unsupported Media Type
Uprev mesa to latest version which includes a fix for this issue.
https://gitlab.freedesktop.org/mesa/mesa/-/commit/908f444e
Also copy helper scripts to install, so that the ci jobs can
use these scripts for logging.
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
---
drivers/gpu/drm/ci/build.sh | 1 +
drivers/gpu/drm/ci/container.yml | 12
drivers/gpu/drm/ci/gitlab-ci.yml | 11 ---
drivers/gpu/drm/ci/image-tags.yml | 3 ++-
drivers/gpu/drm/ci/test.yml | 2 ++
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 106f2d40d222..8a3baa003904 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -128,6 +128,7 @@ fi
# Pass needed files to the test stage
mkdir -p install
cp -rfv .gitlab-ci/* install/.
+cp -rfv ci/* install/.
cp -rfv install/common install/ci-common
cp -rfv drivers/gpu/drm/ci/* install/.
diff --git a/drivers/gpu/drm/ci/container.yml b/drivers/gpu/drm/ci/container.yml
index 9764e7921a4f..d6edf3635b23 100644
--- a/drivers/gpu/drm/ci/container.yml
+++ b/drivers/gpu/drm/ci/container.yml
@@ -36,15 +36,15 @@ debian/android_build:
rules:
- when: never
-debian/x86_64_test-android:
+.debian/x86_64_test-android:
rules:
- when: never
-windows_build_vs2019:
+windows_build_msvc:
rules:
- when: never
-windows_test_vs2019:
+windows_test_msvc:
rules:
- when: never
@@ -56,10 +56,6 @@ rustfmt:
rules:
- when: never
-windows_vs2019:
- rules:
-- when: never
-
-clang-format:
+windows_msvc:
rules:
- when: never
\ No newline at end of file
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 084e3ff8e3f4..9bf5190604a7 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
9d162de9a05155e1c4041857a5848842749164cf
+ DRM_CI_COMMIT_SHA: &drm-ci-commit-sha
e5f133ccc426a197c48a4e88f5377f943f078180
UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
TARGET_BRANCH: drm-next
@@ -26,10 +26,13 @@ variables:
JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
# default kernel for rootfs before injecting the current kernel tree
KERNEL_REPO: "gfx-ci/linux"
- KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
+ KERNEL_TAG: "v6.6.21-mesa-19fc"
KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
LAVA_TAGS: subset-1-gfx
LAVA_JOB_PRIORITY: 30
+ ARTIFACTS_BASE_URL:
https://${CI_PROJECT_ROOT_NAMESPACE}.${CI_PAGES_DOMAIN}/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts
+ # Python scripts for structured logger
+ PYTHONPATH: "$PYTHONPATH:$CI_PROJECT_DIR/install"
default:
before_script:
@@ -46,6 +49,7 @@ default:
- cd $CI_PROJECT_DIR
- curl --output -
$DRM_CI_PROJECT_URL/-/archive/$DRM_CI_COMMIT_SHA/mesa-$DRM_CI_COMMIT_SHA.tar.gz
| tar -xz
- mv mesa-$DRM_CI_COMMIT_SHA/.gitlab-ci* .
+- mv mesa-$DRM_CI_COMMIT_SHA/bin/ci .
- rm -rf mesa-$DRM_CI_COMMIT_SHA/
- echo -e "\e[0Ksection_end:$(date +%s):drm_ci_download_section\r\e[0K"
@@ -98,6 +102,7 @@ include:
stages:
- sanity
- container
+ - code-validation
- git-archive
- build
- amdgpu
@@ -107,7 +112,6 @@ stages:
- msm
- rockchip
- virtio-gpu
- - lint
# YAML anchors for rule conditions
#
@@ -218,6 +222,7 @@ make git archive:
script:
# Remove drm-ci files we just added
- rm -rf .gitlab-ci.*
+- rm -rf ci
# Compactify the .git directory
- git gc --aggressive
diff --git a/drivers/gpu/drm/ci/image-tags.yml
b/drivers/gpu/drm/ci/image-tags.yml
index 7ab4f2514da8..d8f72b82c938 100644
--- a/drivers/gpu/drm/ci/image-tags.yml
+++ b/drivers/gpu/drm/ci/image-tags.yml
@@ -1,5 +1,5 @@
variables:
- CONTAINER_TAG: "2023-10-11-mesa-uprev"
+ CONTAINER_TAG: "2024-04-22-mesa-uprev"
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
@@ -7,6 +7,7 @@ variables:
DEBIAN_BUILD_TAG: "2023-10-08-config"
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
+ PKG_REPO_REV: "3cc12a2a"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/dr
Re: [PATCH] drm: ci: fix the xfails for apq8016
On 25/04/2024 11:01, Helen Koike wrote: On 08/04/2024 14:04, Abhinav Kumar wrote: Hi Helen Gentle reminder on this. If you are okay, we can land it via msm-next tree... Thanks Abhinav On 4/1/2024 1:48 PM, Abhinav Kumar wrote: After IGT migrating to dynamic sub-tests, the pipe prefixes in the expected fails list are incorrect. Lets drop those to accurately match the expected fails. In addition, update the xfails list to match the current passing list. This should have ideally failed in the CI run because some tests were marked as fail even though they passed but due to the mismatch in test names, the matching didn't correctly work and was resulting in those failures not being seen. Here is the passing pipeline for apq8016 with this change: https://gitlab.freedesktop.org/drm/msm/-/jobs/57050562 Signed-off-by: Abhinav Kumar I'm sorry about my delay. Acked-by: Helen Koike I'm also merging it to msm-misc-next. Applied, thanks. Helen Regards, Helen --- drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 13 + 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt index 44a5c62dedad..b14d4e884971 100644 --- a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt @@ -1,17 +1,6 @@ kms_3d,Fail kms_addfb_basic@addfb25-bad-modifier,Fail -kms_cursor_legacy@all-pipes-forked-bo,Fail -kms_cursor_legacy@all-pipes-forked-move,Fail -kms_cursor_legacy@all-pipes-single-bo,Fail -kms_cursor_legacy@all-pipes-single-move,Fail -kms_cursor_legacy@all-pipes-torture-bo,Fail -kms_cursor_legacy@all-pipes-torture-move,Fail -kms_cursor_legacy@pipe-A-forked-bo,Fail -kms_cursor_legacy@pipe-A-forked-move,Fail -kms_cursor_legacy@pipe-A-single-bo,Fail -kms_cursor_legacy@pipe-A-single-move,Fail -kms_cursor_legacy@pipe-A-torture-bo,Fail -kms_cursor_legacy@pipe-A-torture-move,Fail +kms_cursor_legacy@torture-bo,Fail kms_force_connector_basic@force-edid,Fail kms_hdmi_inject@inject-4k,Fail kms_selftest@drm_format,Timeout
Re: drm-misc migration to Gitlab server
On 29/04/2024 14:56, Jani Nikula wrote: On Mon, 29 Apr 2024, Helen Koike wrote: On 01/04/2024 13:49, Tvrtko Ursulin wrote: No issues accessing the repo just a slight confusion and how to handle the workflow. More specifically, if I have a patch which wants to be merged to drm-misc-next, is the mailing list based worklflow still the way to go, or I should create a merge request, or I should apply for commit access via some new method other than adding permissions to my legacy fdo ssh account? I have this same question, I thought we would keep the workflow with dim tool, but after I pointed drm-misc remote to gitlab, dim is not happy. If I don't point drm-misc to gitlab, dim say it is outdated (but I'm using the last top of the tree of maintainer-tools). So I was wondering if dim requires changes or if the workflow changed. The workflow has not changed, only the location of the repo. Thanks for confirming. I'm afraid there's insufficient info here to say what exactly is going on though. I re-executed dim setup and it seems to be working now. Thanks. Helen BR, Jani.
Re: drm-misc migration to Gitlab server
On 01/04/2024 13:49, Tvrtko Ursulin wrote: On 12/03/2024 13:56, Maxime Ripard wrote: Hi, On Tue, Feb 20, 2024 at 09:49:25AM +0100, Maxime Ripard wrote: ## Changing the default location repo Dim gets its repos list in the drm-rerere nightly.conf file. We will need to change that file to match the gitlab repo, and drop the old cgit URLs to avoid people pushing to the wrong place once the transition is made. I guess the next merge window is a good time to do so, it's usually a quiet time for us and a small disruption would be easier to handle. I'll be off-duty during that time too, so I'll have time to handle any complication. ## Updating the documentation The documentation currently mentions the old process to request a drm-misc access. It will all go through Gitlab now, so it will change a few things. We will also need to update and move the issue template to the new repo to maintain consistency. I would expect the transition (if everything goes smoothly) to occur in the merge-window time frame (11/03 -> 24/03). The transition just happened. The main drm-misc repo is now on gitlab, with the old cgit repo being setup as a mirror. If there's any issue accessing that gitlab repo, please let me know. No issues accessing the repo just a slight confusion and how to handle the workflow. More specifically, if I have a patch which wants to be merged to drm-misc-next, is the mailing list based worklflow still the way to go, or I should create a merge request, or I should apply for commit access via some new method other than adding permissions to my legacy fdo ssh account? I have this same question, I thought we would keep the workflow with dim tool, but after I pointed drm-misc remote to gitlab, dim is not happy. If I don't point drm-misc to gitlab, dim say it is outdated (but I'm using the last top of the tree of maintainer-tools). So I was wondering if dim requires changes or if the workflow changed. Thanks, Helen Regards, Tvrtko
Re: [PATCH] drm: ci: fix the xfails for apq8016
On 08/04/2024 14:04, Abhinav Kumar wrote: Hi Helen Gentle reminder on this. If you are okay, we can land it via msm-next tree... Thanks Abhinav On 4/1/2024 1:48 PM, Abhinav Kumar wrote: After IGT migrating to dynamic sub-tests, the pipe prefixes in the expected fails list are incorrect. Lets drop those to accurately match the expected fails. In addition, update the xfails list to match the current passing list. This should have ideally failed in the CI run because some tests were marked as fail even though they passed but due to the mismatch in test names, the matching didn't correctly work and was resulting in those failures not being seen. Here is the passing pipeline for apq8016 with this change: https://gitlab.freedesktop.org/drm/msm/-/jobs/57050562 Signed-off-by: Abhinav Kumar I'm sorry about my delay. Acked-by: Helen Koike I'm also merging it to msm-misc-next. Regards, Helen --- drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 13 + 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt index 44a5c62dedad..b14d4e884971 100644 --- a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt @@ -1,17 +1,6 @@ kms_3d,Fail kms_addfb_basic@addfb25-bad-modifier,Fail -kms_cursor_legacy@all-pipes-forked-bo,Fail -kms_cursor_legacy@all-pipes-forked-move,Fail -kms_cursor_legacy@all-pipes-single-bo,Fail -kms_cursor_legacy@all-pipes-single-move,Fail -kms_cursor_legacy@all-pipes-torture-bo,Fail -kms_cursor_legacy@all-pipes-torture-move,Fail -kms_cursor_legacy@pipe-A-forked-bo,Fail -kms_cursor_legacy@pipe-A-forked-move,Fail -kms_cursor_legacy@pipe-A-single-bo,Fail -kms_cursor_legacy@pipe-A-single-move,Fail -kms_cursor_legacy@pipe-A-torture-bo,Fail -kms_cursor_legacy@pipe-A-torture-move,Fail +kms_cursor_legacy@torture-bo,Fail kms_force_connector_basic@force-edid,Fail kms_hdmi_inject@inject-4k,Fail kms_selftest@drm_format,Timeout
Re: [PATCH v5 10/10] drm/ci: add tests on vkms
On 01/04/2024 03:12, Vignesh Raman wrote:
Add job that runs igt on top of vkms.
Signed-off-by: Vignesh Raman
Acked-by: Jessica Zhang
Tested-by: Jessica Zhang
Acked-by: Maxime Ripard
Signed-off-by: Helen Koike
Acked-by: Helen Koike
Thanks
Helen
---
v4:
- New patch in the series.
https://lore.kernel.org/lkml/20240201065346.801038-1-vignesh.ra...@collabora.com/
v5:
- No changes.
---
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 | 23 +
11 files changed, 108 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 333704ceefb6..c78c825508ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6962,6 +6962,8 @@ 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/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 8a3baa003904..95493df9cdc2 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -156,7 +156,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 5b5d4a324659..df762d03533f 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -114,6 +114,7 @@ stages:
- panfrost
- powervr
- virtio-gpu
+ - software-driver
# YAML anchors for rule conditions
#
@@ -269,4 +270,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 ce6e22369d4d..c89acb974645 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 8c90ae5a51e6..8fed797a26b9 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -411,7 +411,7 @@ panfrost:g12b:
- .panfrost-gpu
virtio_gpu:none:
- stage: virtio-gpu
+ stage: software-driver
variables:
CROSVM_GALLIUM_DRIVER: llvmpipe
DRIVER_NAME: virtio_gpu
@@ -431,3 +431,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
Re: [PATCH v5 09/10] drm/ci: rockchip: Add job to test panfrost GPU driver
On 01/04/2024 03:12, Vignesh Raman wrote: For rockchip rk3288 and rk3399, the GPU driver is panfrost. So add support in drm-ci to test panfrost driver for rockchip SOC and update xfails. Skip KMS tests for panfrost driver since it is not a not a KMS driver and skip driver-specific tests. Signed-off-by: Vignesh Raman Btw, just a nit, I would squash this with the previous commit, so we don't have a point in history with panfrost tests, than without them, than with them again. But with or without this change: Acked-by: Helen Koike Thanks Helen --- v2: - Add panfrost GPU jobs for rockchip SOC with new xfails. v3: - Skip KMS tests for panfrost driver since it is not a not a KMS driver and update xfails. Add the job name in GPU_VERSION and use it for xfail file names instead of using DRIVER_NAME. v4: - Remove the gpu suffix in job and rename xfails accordingly. v5: - Skip driver-specific tests. --- drivers/gpu/drm/ci/test.yml | 10 ++ drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt | 1 + drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt | 8 drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt | 1 + drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt | 8 5 files changed, 28 insertions(+) create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 96b299c32c07..8c90ae5a51e6 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -191,11 +191,21 @@ rockchip:rk3288: - .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 diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt new file mode 100644 index ..abd35a8ef6f4 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt @@ -0,0 +1 @@ +panfrost_prime@gem-prime-import,Crash diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt new file mode 100644 index ..41a846a59644 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt @@ -0,0 +1,8 @@ +# Panfrost is not a KMS driver, so skip the KMS tests +kms_.* + +# Skip driver specific tests +msm_.* +^amdgpu.* +v3d_.* +vc4_.* diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt new file mode 100644 index ..6f5e760d5ec0 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt @@ -0,0 +1 @@ +panfrost_prime@gem-prime-import,Fail diff --git a/drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt new file mode 100644 index ..41a846a59644 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt @@ -0,0 +1,8 @@ +# Panfrost is not a KMS driver, so skip the KMS tests +kms_.* + +# Skip driver specific tests +msm_.* +^amdgpu.* +v3d_.* +vc4_.*
Re: [PATCH v5 08/10] drm/ci: rockchip: Refactor existing rockchip jobs
On 01/04/2024 03:12, Vignesh Raman wrote:
For rockchip rk3288 and rk3399, the display driver is rockchip.
Currently, in drm-ci for rockchip, only the display driver is
tested. Refactor the existing rockchip jobs so that gpu driver
testing jobs can be added later and update xfails accordingly.
Signed-off-by: Vignesh Raman
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names
instead of using DRIVER_NAME. Also update xfails.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
v5:
- Add rockchip-display job and skip driver-specfic tests.
---
drivers/gpu/drm/ci/test.yml | 38 +-
.../drm/ci/xfails/rockchip-rk3288-fails.txt | 50 ++-
.../drm/ci/xfails/rockchip-rk3288-flakes.txt | 21
.../drm/ci/xfails/rockchip-rk3288-skips.txt | 6 +++
.../drm/ci/xfails/rockchip-rk3399-fails.txt | 38 +++---
.../drm/ci/xfails/rockchip-rk3399-flakes.txt | 28 +--
.../drm/ci/xfails/rockchip-rk3399-skips.txt | 4 ++
7 files changed, 114 insertions(+), 71 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index d1d42ff7df2d..96b299c32c07 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -155,33 +155,47 @@ msm:sdm845:
script:
- ./install/bare-metal/cros-servo.sh
-rockchip:rk3288:
- extends:
-- .lava-igt:arm32
+.rockchip:
same here, s/.rockchip/.rockchip-device
With or without this change:
Acked-by: Helen Koike
Thanks
Helen
+ variables:
+DTB: ${DEVICE_TYPE}
+BOOT_METHOD: depthcharge
+
+.rockchip-display:
stage: rockchip
variables:
DRIVER_NAME: rockchip
+
+.rk3288:
+ extends:
+- .lava-igt:arm32
+- .rockchip
+ 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
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
+
+rockchip:rk3399:
+ extends:
+- .rk3399
+- .rockchip-display
+
.i915:
extends:
- .lava-igt:x86_64
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
index 90c63f519e9e..3137ebd4dc8e 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
@@ -1,54 +1,36 @@
kms_3d,Crash
kms_bw@linear-tiling-2-displays-1920x1080p,Fail
kms_bw@linear-tiling-2-displays-2560x1440p,Fail
-kms_bw@linear-tiling-2-displays-3840x2160p,Fail
kms_bw@linear-tiling-3-displays-1920x1080p,Fail
-kms_bw@linear-tiling-3-displays-2560x1440p,Fail
-kms_bw@linear-tiling-3-displays-3840x2160p,Fail
+kms_cursor_crc@cursor-onscreen-32x10,Crash
+kms_cursor_crc@cursor-onscreen-64x21,Crash
+kms_cursor_crc@cursor-onscreen-64x64,Crash
+kms_cursor_crc@cursor-random-32x10,Crash
+kms_cursor_crc@cursor-random-64x21,Crash
+kms_cursor_crc@cursor-random-64x64,Crash
+kms_cursor_crc@cursor-sliding-32x10,Crash
+kms_cursor_crc@cursor-sliding-32x32,Crash
+kms_cursor_crc@cursor-sliding-64x64,Crash
+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-atomic-transitions,Fail
+kms_cursor_legacy@cursor-vs-flip-toggle,Fail
+kms_cursor_legacy@flip-vs-cursor-crc-atomic,Crash
+kms_cursor_legacy@flip-vs-cursor-crc-legacy,Crash
kms_flip@flip-vs-modeset-vs-hang,Crash
kms_flip@flip-vs-panning-vs-hang,Crash
-kms_force_connector_basic@force-load-detect,Fail
kms_invalid_mode@int-max-clock,Crash
kms_pipe_crc_basic@compare-crc-sanitycheck-nv12,Crash
kms_pipe_crc_basic@nonblocking-crc-frame-sequence,Crash
kms_pipe_crc_basic@read-crc-frame-sequence,Crash
kms_plane@pixel-format,Crash
kms_plane@pixel-format-source-clamping,Crash
-kms_plane@plane-position-hole,Crash
-kms_plane@plane-position-hole-dpms,Crash
kms_plane_cursor@overlay,Crash
-kms_plane_cursor@pipe-A-overlay-size-128,Fail
-kms_plane_cursor@pipe-A-overlay-size-256,Fail
-kms_plane_cursor@pipe-A-overlay-size-64,Fail
-kms_plane_cursor@pipe-A-primary-size-128,Fail
-kms_plane_cursor@pipe-A
Re: [PATCH v5 07/10] drm/ci: meson: Add job to test panfrost GPU driver
On 01/04/2024 03:12, Vignesh Raman wrote: For amlogic meson SOC the GPU driver is panfrost. So add support in drm-ci to test panfrost driver for amlogic meson SOC and update xfails. Skip KMS tests for panfrost driver since it is not a not a KMS driver and skip driver-specific tests. Signed-off-by: Vignesh Raman Nit: Maybe squash this with previous commit. With or without this change: Acked-by: Helen Koike Thanks Helen --- v2: - Add panfrost GPU jobs for amlogic meson SOC with new xfails. v3: - Skip KMS tests for panfrost driver since it is not a not a KMS driver and update xfails. Add the job name in GPU_VERSION and use it for xfail file names instead of using DRIVER_NAME. v4: - Remove the gpu suffix in job and rename xfails accordingly. v5: - Use panfrost-gpu job and skip driver-specific tests. --- drivers/gpu/drm/ci/test.yml | 5 + drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 1 + drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt | 8 3 files changed, 14 insertions(+) create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 505733069995..d1d42ff7df2d 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -381,6 +381,11 @@ meson:g12b: - .g12b - .meson-display +panfrost:g12b: + extends: +- .g12b +- .panfrost-gpu + virtio_gpu:none: stage: virtio-gpu variables: diff --git a/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt new file mode 100644 index ..6f5e760d5ec0 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt @@ -0,0 +1 @@ +panfrost_prime@gem-prime-import,Fail diff --git a/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt new file mode 100644 index ..41a846a59644 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt @@ -0,0 +1,8 @@ +# Panfrost is not a KMS driver, so skip the KMS tests +kms_.* + +# Skip driver specific tests +msm_.* +^amdgpu.* +v3d_.* +vc4_.*
Re: [PATCH v5 06/10] drm/ci: meson: Refactor existing meson jobs
On 01/04/2024 03:12, Vignesh Raman wrote:
For Amlogic Meson SOC the display driver is meson. Currently,
in drm-ci for meson, only the display driver is tested.
Refactor the existing meson jobs so that gpu driver testing
jobs can be added later and update xfails accordingly.
Signed-off-by: Vignesh Raman
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names instead
of using DRIVER_NAME.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
v5:
- Add meson-display job.
---
drivers/gpu/drm/ci/test.yml| 14 +++---
drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt | 5 -
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index adeb05bdb440..505733069995 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -357,14 +357,17 @@ panfrost:mt8183:
.meson:
I also would rename this to .meson-device, so we don't confuse with the
driver name, what do you think?
With or without this change:
Acked-by: Helen Koike
Thanks
Helen
extends:
- .lava-igt:arm64
- stage: meson
variables:
-DRIVER_NAME: meson
DTB: ${DEVICE_TYPE}
BOOT_METHOD: u-boot
KERNEL_IMAGE_TYPE: "image"
-meson:g12b:
+.meson-display:
+ stage: meson
+ variables:
+DRIVER_NAME: meson
+
+.g12b:
extends:
- .meson
parallel: 3
@@ -373,6 +376,11 @@ meson:g12b:
GPU_VERSION: g12b
RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
+meson:g12b:
+ extends:
+- .g12b
+- .meson-display
+
virtio_gpu:none:
stage: virtio-gpu
variables:
diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
index 56a2ae7047b4..029b4ade21f6 100644
--- a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
@@ -5,11 +5,6 @@ kms_cursor_legacy@single-bo,Fail
kms_cursor_legacy@single-move,Fail
kms_cursor_legacy@torture-bo,Fail
kms_cursor_legacy@torture-move,Fail
-kms_force_connector_basic@force-edid,Fail
-kms_hdmi_inject@inject-4k,Fail
-kms_plane_cursor@overlay,Fail
-kms_plane_cursor@primary,Fail
-kms_plane_cursor@viewport,Fail
kms_properties@connector-properties-atomic,Fail
kms_properties@connector-properties-legacy,Fail
kms_properties@get_properties-sanity-atomic,Fail
Re: [PATCH v5 05/10] drm/ci: mediatek: Add job to test panfrost and powervr GPU driver
On 01/04/2024 03:12, Vignesh Raman wrote: For mediatek mt8173, the GPU driver is powervr and for mediatek mt8183, the GPU driver is panfrost. So add support in drm-ci to test panfrost and powervr GPU driver for mediatek SOCs and update xfails. Powervr driver was merged in linux kernel, but there's no mediatek support yet. So disable the mt8173-gpu job which uses powervr driver. Add panfrost specific tests to testlist and skip KMS tests for panfrost driver since it is not a not a KMS driver and skip driver-specific tests. Also update the MAINTAINERS file to include xfails for panfrost driver. Signed-off-by: Vignesh Raman --- v2: - Add panfrost and PVR GPU jobs for mediatek SOC with new xfails, add xfail entry to MAINTAINERS. v3: - Add panfrost specific tests to testlist and skip KMS tests for panfrost driver since it is not a not a KMS driver and update xfails. Update the MAINTAINERS file to include xfails for panfrost driver. Add the job name in GPU_VERSION and use it for xfail file names instead of using DRIVER_NAME. v4: - Remove the gpu suffix in job and rename xfails accordingly. Update the MAINTAINERS file to include xfails for panfrost driver. v5: - Add powervr-gpu and panfrost-gpu jobs and skip driver-specific tests. --- MAINTAINERS | 1 + drivers/gpu/drm/ci/gitlab-ci.yml | 2 ++ drivers/gpu/drm/ci/test.yml | 24 +++ .../drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + .../drm/ci/xfails/panfrost-mt8183-skips.txt | 8 +++ 5 files changed, 36 insertions(+) create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt diff --git a/MAINTAINERS b/MAINTAINERS index f7d0040a6c21..333704ceefb6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS Note: We'll also need an entry in MAINTAINERS file for powervr (but it is fine to only add it once we have tests running on it). Acked-by: Helen Koike Thanks Helen @@ -1666,6 +1666,7 @@ S:Supported T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/gpu/panfrost.rst F:drivers/gpu/drm/ci/testlist.txt +F: drivers/gpu/drm/ci/xfails/panfrost* F:drivers/gpu/drm/panfrost/ F:include/uapi/drm/panfrost_drm.h diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index d03d76692f0e..5b5d4a324659 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -111,6 +111,8 @@ stages: - meson - msm - rockchip + - panfrost + - powervr - virtio-gpu # YAML anchors for rule conditions diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index d8af670ee51d..adeb05bdb440 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -292,6 +292,16 @@ amdgpu:stoney: variables: DRIVER_NAME: mediatek +.powervr-gpu: + stage: powervr + variables: +DRIVER_NAME: powervr + +.panfrost-gpu: + stage: panfrost + variables: +DRIVER_NAME: panfrost + .mt8173: extends: - .mediatek @@ -315,11 +325,25 @@ mediatek:mt8173: - .mt8173 - .mediatek-display +powervr:mt8173: + extends: +- .mt8173 +- .powervr-gpu + rules: +# TODO: powervr driver was merged in linux kernel, but there's no mediatek support yet +# Remove the rule once mediatek support is added for powervr +- when: never + mediatek:mt8183: extends: - .mt8183 - .mediatek-display +panfrost:mt8183: + extends: +- .mt8183 +- .panfrost-gpu + # drm-mtk doesn't even probe yet in mainline for mt8192 .mediatek:mt8192: extends: diff --git a/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt new file mode 100644 index ..6f5e760d5ec0 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt @@ -0,0 +1 @@ +panfrost_prime@gem-prime-import,Fail diff --git a/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt new file mode 100644 index ..41a846a59644 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt @@ -0,0 +1,8 @@ +# Panfrost is not a KMS driver, so skip the KMS tests +kms_.* + +# Skip driver specific tests +msm_.* +^amdgpu.* +v3d_.* +vc4_.*
Re: [PATCH v5 04/10] drm/ci: mediatek: Refactor existing mediatek jobs
On 01/04/2024 03:12, Vignesh Raman wrote:
For mediatek mt8173 and mt8183, the display driver is mediatek.
Currently, in drm-ci for mediatek, only the display driver is
tested. Refactor the existing mediatek jobs so that gpu driver
testing jobs can be added later and update xfails accordingly.
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.
Signed-off-by: Vignesh Raman
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files, and remove IGT_FORCE_DRIVER from the
script since it's now set by the job.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names instead
of using DRIVER_NAME. Also update xfails.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
v5:
- Add mediatek-display job.
---
drivers/gpu/drm/ci/igt_runner.sh | 10 -
drivers/gpu/drm/ci/test.yml | 21 +++
.../drm/ci/xfails/mediatek-mt8173-fails.txt | 15 -
.../drm/ci/xfails/mediatek-mt8173-flakes.txt | 13
.../drm/ci/xfails/mediatek-mt8183-fails.txt | 21 ---
.../drm/ci/xfails/mediatek-mt8183-flakes.txt | 8 +++
6 files changed, 51 insertions(+), 37 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index f1a08b9b146f..ce6e22369d4d 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -20,16 +20,6 @@ cat /sys/kernel/debug/dri/*/state
set -e
case "$DRIVER_NAME" in
-rockchip|meson)
-export IGT_FORCE_DRIVER="panfrost"
-;;
-mediatek)
-if [ "$GPU_VERSION" = "mt8173" ]; then
-export IGT_FORCE_DRIVER=${DRIVER_NAME}
-elif [ "$GPU_VERSION" = "mt8183" ]; then
-export IGT_FORCE_DRIVER="panfrost"
-fi
-;;
amdgpu)
# Cannot use HWCI_KERNEL_MODULES as at that point we don't have the
module in /lib
mv /install/modules/lib/modules/* /lib/modules/.
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 612c9ede3507..d8af670ee51d 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -282,14 +282,17 @@ amdgpu:stoney:
.mediatek:
Maybe we could s/.mediatek/.mediatek-device, so we know we are not
talking about the driver name, what do you think?
extends:
- .lava-igt:arm64
- stage: mediatek
variables:
-DRIVER_NAME: mediatek
DTB: ${DEVICE_TYPE}
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
-mediatek:mt8173:
+.mediatek-display:
+ stage: mediatek
+ variables:
+DRIVER_NAME: mediatek
+
+.mt8173:
extends:
- .mediatek
parallel: 4
@@ -298,7 +301,7 @@ mediatek:mt8173:
GPU_VERSION: mt8173
RUNNER_TAG: mesa-ci-x86-64-lava-mt8173-elm-hana
-mediatek:mt8183:
+.mt8183:
extends:
- .mediatek
parallel: 3
@@ -307,6 +310,16 @@ mediatek:mt8183:
GPU_VERSION: mt8183
RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
+mediatek:mt8173:
+ extends:
+- .mt8173
+- .mediatek-display
+
+mediatek:mt8183:
+ extends:
+- .mt8183
+- .mediatek-display
From the code, panfrost was being used in IGT_FORCE_DRIVER for mt8183
no? --> never mind, I just saw the next patch handles panfrost case. I
guess these two commits could be squashed (up to you).
Regards,
Helen
+
# drm-mtk doesn't even probe yet in mainline for mt8192
.mediatek:mt8192:
extends:
diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
index ef0cb7c3698c..c63abd603b02 100644
--- a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
@@ -9,28 +9,13 @@ kms_bw@linear-tiling-3-displays-1920x1080p,Fail
kms_bw@linear-tiling-3-displays-2560x1440p,Fail
kms_bw@linear-tiling-3-displays-3840x2160p,Fail
kms_color@invalid-gamma-lut-sizes,Fail
-kms_color@pipe-A-invalid-gamma-lut-sizes,Fail
-kms_color@pipe-B-invalid-gamma-lut-sizes,Fail
kms_cursor_legacy@cursor-vs-flip-atomic,Fail
kms_cursor_legacy@cursor-vs-flip-legacy,Fail
kms_flip@flip-vs-modeset-vs-hang,Fail
kms_flip@flip-vs-panning-vs-hang,Fail
kms_flip@flip-vs-suspend,Fail
kms_flip@flip-vs-suspend-interruptible,Fail
-kms_force_connector_basic@force-edid,Fail
-kms_force_connector_basic@force-load-detect,Fail
-kms_force_connector_basic@prune-stale-modes,Fail
-kms_hdmi_inject@inject-4k,Fail
-kms_plane_scaling@planes-upscale-20x20,Fail
-kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-25,Fail
-kms_plane_scaling@planes-upscale-20x20-do
Re: [PATCH v5 03/10] drm/ci: uprev IGT and update testlist
On 01/04/2024 03:12, Vignesh Raman wrote: Uprev IGT and add amd, v3d, vc4 and vgem specific tests to testlist and skip driver-specific tests. Also add testlist to the MAINTAINERS file and update xfails. Signed-off-by: Vignesh Raman lgtm Acked-by: Helen Koike Thanks --- v3: - New patch in series to uprev IGT and update testlist. v4: - Add testlists to the MAINTAINERS file and remove amdgpu xfails changes. v5: - Keep single testlist and update xfails. Skip driver specific tests. --- MAINTAINERS | 8 + drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/testlist.txt | 321 ++ .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 25 +- .../drm/ci/xfails/amdgpu-stoney-flakes.txt| 10 +- .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 23 +- drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 9 +- drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 9 +- drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 7 + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 9 +- drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 9 +- drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 9 +- drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 9 +- .../drm/ci/xfails/mediatek-mt8173-skips.txt | 6 + .../drm/ci/xfails/mediatek-mt8183-skips.txt | 6 + .../gpu/drm/ci/xfails/meson-g12b-skips.txt| 6 + .../gpu/drm/ci/xfails/msm-apq8016-skips.txt | 5 + .../gpu/drm/ci/xfails/msm-apq8096-skips.txt | 8 +- .../msm-sc7180-trogdor-kingoftown-skips.txt | 6 + ...sm-sc7180-trogdor-lazor-limozeen-skips.txt | 6 + .../gpu/drm/ci/xfails/msm-sdm845-skips.txt| 6 + .../drm/ci/xfails/rockchip-rk3288-skips.txt | 9 +- .../drm/ci/xfails/rockchip-rk3399-skips.txt | 7 + .../drm/ci/xfails/virtio_gpu-none-skips.txt | 9 +- 24 files changed, 511 insertions(+), 13 deletions(-) create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt diff --git a/MAINTAINERS b/MAINTAINERS index 3bc7e122a094..f7d0040a6c21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1665,6 +1665,7 @@ L:dri-devel@lists.freedesktop.org S:Supported T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/gpu/panfrost.rst +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/panfrost/ F:include/uapi/drm/panfrost_drm.h @@ -6753,6 +6754,7 @@ S: Maintained B:https://gitlab.freedesktop.org/drm/msm/-/issues T:git https://gitlab.freedesktop.org/drm/msm.git F:Documentation/devicetree/bindings/display/msm/ +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/msm* F:drivers/gpu/drm/msm/ F:include/uapi/drm/msm_drm.h @@ -7047,6 +7049,7 @@ T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml F:Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml F:Documentation/gpu/meson.rst +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/meson* F:drivers/gpu/drm/meson/ @@ -7160,6 +7163,7 @@ L: dri-devel@lists.freedesktop.org L:linux-media...@lists.infradead.org (moderated for non-subscribers) S:Supported F:Documentation/devicetree/bindings/display/mediatek/ +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/mediatek* F:drivers/gpu/drm/mediatek/ F:drivers/phy/mediatek/phy-mtk-dp.c @@ -7211,6 +7215,7 @@ L:dri-devel@lists.freedesktop.org S:Maintained T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/devicetree/bindings/display/rockchip/ +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/rockchip* F:drivers/gpu/drm/rockchip/ @@ -10739,6 +10744,7 @@ C: irc://irc.oftc.net/intel-gfx T:git git://anongit.freedesktop.org/drm-intel F:Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon F:Documentation/gpu/i915.rst +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/i915* F:drivers/gpu/drm/i915/ F:include/drm/i915* @@ -18255,6 +18261,7 @@ C: irc://irc.oftc.net/radeon T:git https://gitlab.freedesktop.org/agd5f/linux.git F:Documentation/gpu/amdgpu/ F:drivers/gpu/drm/amd/ +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/amd* F:drivers/gpu/drm/radeon/ F:include/uapi/drm/amdgpu_drm.h @@ -23303,6 +23310,7 @@ L: dri-devel@lists.freedesktop.org L:virtualizat...@lists.linux.dev S:Maintained T:git git://anongit.freedesktop.org/drm/drm-misc +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/virtio* F:drivers
Re: [PATCH v4 09/11] drm/ci: rockchip: Refactor existing rockchip jobs
On 15/03/2024 08:18, Vignesh Raman wrote:
Hi Helen,
On 07/03/24 19:32, Helen Koike wrote:
On 06/03/2024 00:06, Vignesh Raman wrote:
For rockchip rk3288 and rk3399, the display driver is rockchip.
Currently, in drm-ci for rockchip, only the display driver is
tested. Refactor the existing rockchip jobs so that gpu driver
testing jobs can be added later and update xfails accordingly.
Signed-off-by: Vignesh Raman
---
v2:
- Refactor the patch to rename job to indicate display driver
testing,
rename the existing xfail files.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names
instead of using DRIVER_NAME. Also update xfails.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
---
drivers/gpu/drm/ci/test.yml | 36
.../drm/ci/xfails/rockchip-rk3288-fails.txt | 58 ++-
.../drm/ci/xfails/rockchip-rk3288-flakes.txt | 20 +++
.../drm/ci/xfails/rockchip-rk3288-skips.txt | 54 ++---
.../drm/ci/xfails/rockchip-rk3399-fails.txt | 38 ++--
.../drm/ci/xfails/rockchip-rk3399-flakes.txt | 28 +++--
.../drm/ci/xfails/rockchip-rk3399-skips.txt | 5 +-
7 files changed, 110 insertions(+), 129 deletions(-)
create mode 100644
drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 6ae6398b3d88..831e580e6dfd 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -153,33 +153,45 @@ msm:sdm845:
script:
- ./install/bare-metal/cros-servo.sh
-rockchip:rk3288:
- extends:
- - .lava-igt:arm32
+.rockchip:
stage: rockchip
variables:
- DRIVER_NAME: rockchip
Looks like it make sense to keep DRIVER_NAME here, no?
- DEVICE_TYPE: rk3288-veyron-jaq
DTB: ${DEVICE_TYPE}
BOOT_METHOD: depthcharge
+
+.rk3288:
+ extends:
+ - .lava-igt:arm32
+ - .rockchip
Maybe, instead of extending .rockchip here, make .rockchip tied to the
DRIVER_NAME and .rk3288 tied to the GPU_VERSION, and on
rockchip:rk3288 you can extend both .rockchip and .rk3288, what do you
think?
So rockchip:rk3399 you can extend .rockchip and .rk3399.
and in the panfrost one you can have a .panfrost (that can extend
.rockchip if they are the same definition).
I feel it becomes less confusing, what do you think?
I would even add some prefix or suffix to make it less confusing, like
.driver-rockchip and .gpu-rk3288 for instance, making it a bit more
intuitive and helping our future selves :)
Thanks for the suggestion. This can be done. Should we do it only
for rockchip jobs or others also (meson, mediatek) ?
I guess we could keep the same patter for all the make sense.
Helen
+ variables:
+ DEVICE_TYPE: rk3288-veyron-jaq
KERNEL_IMAGE_TYPE: "zimage"
- GPU_VERSION: rk3288
Looks like it make sense to keep GPU_VERSION here, no? Same comment
for .rk3399.
Yes, will fix this.
Regards,
Vignesh
Re: [PATCH v4 03/11] drm/ci: uprev IGT and update testlist
On 15/03/2024 08:12, Vignesh Raman wrote: Hi Helen, On 07/03/24 19:05, Helen Koike wrote: On 06/03/2024 00:06, Vignesh Raman wrote: Uprev IGT and add amd, v3d, vc4 and vgem specific tests to testlist. Have testlist.txt per driver and include a base testlist so that the driver specific tests will run only on those hardware. Also add testlists to the MAINTAINERS file. Signed-off-by: Vignesh Raman --- v3: - New patch in series to uprev IGT and update testlist. v4: - Add testlists to the MAINTAINERS file and remove amdgpu xfails changes. --- MAINTAINERS | 11 ++ drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/igt_runner.sh | 12 +- drivers/gpu/drm/ci/testlist-amdgpu.txt | 151 +++ drivers/gpu/drm/ci/testlist-msm.txt | 50 drivers/gpu/drm/ci/testlist-panfrost.txt | 17 +++ drivers/gpu/drm/ci/testlist-v3d.txt | 73 +++ drivers/gpu/drm/ci/testlist-vc4.txt | 49 drivers/gpu/drm/ci/testlist.txt | 84 ++--- 9 files changed, 398 insertions(+), 51 deletions(-) create mode 100644 drivers/gpu/drm/ci/testlist-amdgpu.txt create mode 100644 drivers/gpu/drm/ci/testlist-msm.txt create mode 100644 drivers/gpu/drm/ci/testlist-panfrost.txt create mode 100644 drivers/gpu/drm/ci/testlist-v3d.txt create mode 100644 drivers/gpu/drm/ci/testlist-vc4.txt diff --git a/MAINTAINERS b/MAINTAINERS index 3bc7e122a094..4da66ca92f1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1665,6 +1665,8 @@ L: dri-devel@lists.freedesktop.org S: Supported T: git git://anongit.freedesktop.org/drm/drm-misc F: Documentation/gpu/panfrost.rst +F: drivers/gpu/drm/ci/testlist-panfrost.txt +F: drivers/gpu/drm/ci/testlist.txt I wonder if we should have both here, since the second is not used right? Yes, we need to use both here. testlist-panfrost.txt includes testlist.txt. So we have moved the driver specific tests to testlist-panfrost.txt and have a base testlist.txt. diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index f1a08b9b146f..77cd81fe6d1a 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -74,10 +74,20 @@ if ! grep -q "core_getversion" /install/testlist.txt; then fi set +e +if [ "$DRIVER_NAME" = "amdgpu" ]; then + TEST_LIST="/install/testlist-amdgpu.txt" +elif [ "$DRIVER_NAME" = "msm" ]; then + TEST_LIST="/install/testlist-msm.txt" +elif [ "$DRIVER_NAME" = "panfrost" ]; then + TEST_LIST="/install/testlist-panfrost.txt" +else + TEST_LIST="/install/testlist.txt" +fi Maybe simplify this with: TEST_LIST="/install/testlist-$DRIVER_NAME.txt" if [ ! -f "$TEST_LIST" ]; then TEST_LIST="/install/testlist.txt" fi Yes, this is much better. Thanks. Another question I have: shouldn't testlist-$DRIVER_NAME.txt and testlist.txt be merged? Or they are really mutually exclusive? We have testlist-$DRIVER_NAME.txt per driver and it includes a base testlist.txt I'm confused, it seems that from the code or it uses testlist-$DRIVER_NAME.txt or it uses testlist.txt, you don't merge them by code, which means that drivers don't need to follow changes to testlist.txt. If testlist-$DRIVER_NAME.txt already includes tests in testlist.txt, than testlist.txt doesn't need to be added in the MAINTEINERS file in all drivers. Helen Regards, Vignesh
Re: [PATCH v3] drm/ci: update device type for volteer devices
On 07/03/2024 10:21, Helen Koike wrote:
On 06/03/2024 23:18, Vignesh Raman wrote:
Volteer devices in the collabora lab are categorized under the
asus-cx9400-volteer device type. The majority of these units
has an Intel Core i5-1130G7 CPU, while some of them have a
Intel Core i7-1160G7 CPU instead. So due to this difference,
new device type template is added for the Intel Core i5-1130G7
and i7-1160G7 variants of the Acer Chromebook Spin 514 (CP514-2H)
volteer Chromebooks. So update the same in drm-ci.
https://gitlab.collabora.com/lava/lava/-/merge_requests/149
Fixes: 0119c894ab0d ("drm: Add initial ci/ subdirectory")
Reviewed-by: David Heidelberg
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
Applied to drm-misc-next.
Thanks
Helen
---
v2:
- Add fixes tag so change gets propagated to stable.
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1119672
v3:
- Fix checkpatch warning.
Please use correct Fixes: style 'Fixes: <12 chars of sha1>
("")'
---
drivers/gpu/drm/ci/test.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 0857773e5c5f..8bc63912fddb 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -252,11 +252,11 @@ i915:cml:
i915:tgl:
extends:
- .i915
- parallel: 8
+ parallel: 5
variables:
- DEVICE_TYPE: asus-cx9400-volteer
+ DEVICE_TYPE: acer-cp514-2h-1130g7-volteer
GPU_VERSION: tgl
- RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer
+ RUNNER_TAG: mesa-ci-x86-64-lava-acer-cp514-2h-1130g7-volteer
.amdgpu:
extends:
Re: [PATCH v4 00/11] drm/ci: Add support for GPU and display testing
On 06/03/2024 00:06, Vignesh Raman wrote: Some ARM SOCs have a separate display controller and GPU, each with different drivers. For mediatek mt8173, the GPU driver is powervr, and the display driver is mediatek. In the case of mediatek mt8183, the GPU driver is panfrost, and the display driver is mediatek. With rockchip rk3288/rk3399, the GPU driver is panfrost, while the display driver is rockchip. For amlogic meson, the GPU driver is panfrost, and the display driver is meson. IGT tests run various tests with different xfails and can test both GPU devices and KMS/display devices. Currently, in drm-ci for MediaTek, Rockchip, and Amlogic Meson platforms, only the GPU driver is tested. This leads to incomplete coverage since the display is never tested on these platforms. This commit series adds support in drm-ci to run tests for both GPU and display drivers for MediaTek, Rockchip, and Amlogic Meson platforms. Uprev mesa and IGT in drm-ci and add amd, v3d, vc4 and vgem specific tests to testlist. Have testlist.txt per driver and include a base testlist so that the driver specific tests will run only on those hardware and add testlists to the MAINTAINERS file. This series also includes patch to add vkms testing to drm-ci. Working pipeline link, https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1119859 Hi Vignesh, thanks for this patchset. Just to confirm, the new convention is: stages are named per DRIVER_NAME jobs are named DRIVER_NAME:GPU_VERSION xfails files and testlist files are named DRIVER_NAME-.txt Looks good. I just have some minor comments/questions in the series, please check. Regards, Helen Vignesh Raman (11): drm/ci: arm64.config: Enable CONFIG_DRM_ANALOGIX_ANX7625 drm/ci: uprev mesa version drm/ci: uprev IGT and update testlist drm/ci: amdgpu: update xfails drm/ci: mediatek: Refactor existing mediatek jobs drm/ci: mediatek: Add job to test panfrost and powervr GPU driver drm/ci: meson: Refactor existing meson jobs drm/ci: meson: Add job to test panfrost GPU driver drm/ci: rockchip: Refactor existing rockchip jobs drm/ci: rockchip: Add job to test panfrost GPU driver drm/ci: add tests on vkms MAINTAINERS | 14 ++ drivers/gpu/drm/ci/arm64.config | 1 + drivers/gpu/drm/ci/build.sh | 1 - drivers/gpu/drm/ci/container.yml | 6 +- drivers/gpu/drm/ci/gitlab-ci.yml | 13 +- drivers/gpu/drm/ci/igt_runner.sh | 28 ++-- drivers/gpu/drm/ci/image-tags.yml | 5 +- drivers/gpu/drm/ci/test.yml | 136 +--- drivers/gpu/drm/ci/testlist-amdgpu.txt| 151 ++ drivers/gpu/drm/ci/testlist-msm.txt | 50 ++ drivers/gpu/drm/ci/testlist-panfrost.txt | 17 ++ drivers/gpu/drm/ci/testlist-v3d.txt | 73 + drivers/gpu/drm/ci/testlist-vc4.txt | 49 ++ drivers/gpu/drm/ci/testlist.txt | 84 -- drivers/gpu/drm/ci/x86_64.config | 1 + .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 26 ++- .../drm/ci/xfails/amdgpu-stoney-flakes.txt| 10 +- .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 17 +- .../drm/ci/xfails/mediatek-mt8173-fails.txt | 15 -- .../drm/ci/xfails/mediatek-mt8173-flakes.txt | 13 ++ .../drm/ci/xfails/mediatek-mt8183-fails.txt | 21 ++- .../drm/ci/xfails/mediatek-mt8183-flakes.txt | 8 + .../gpu/drm/ci/xfails/meson-g12b-fails.txt| 5 - .../gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 1 + .../gpu/drm/ci/xfails/panfrost-g12b-skips.txt | 2 + .../drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + .../drm/ci/xfails/panfrost-mt8183-skips.txt | 2 + .../drm/ci/xfails/panfrost-rk3288-fails.txt | 1 + .../drm/ci/xfails/panfrost-rk3288-skips.txt | 2 + .../drm/ci/xfails/panfrost-rk3399-fails.txt | 1 + .../drm/ci/xfails/panfrost-rk3399-skips.txt | 2 + .../drm/ci/xfails/rockchip-rk3288-fails.txt | 58 ++- .../drm/ci/xfails/rockchip-rk3288-flakes.txt | 20 +++ .../drm/ci/xfails/rockchip-rk3288-skips.txt | 54 +-- .../drm/ci/xfails/rockchip-rk3399-fails.txt | 38 +++-- .../drm/ci/xfails/rockchip-rk3399-flakes.txt | 28 +++- .../drm/ci/xfails/rockchip-rk3399-skips.txt | 5 +- .../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 ++ 41 files changed, 784 insertions(+), 245 deletions(-) create mode 100644 drivers/gpu/drm/ci/testlist-amdgpu.txt create mode 100644 drivers/gpu/drm/ci/testlist-msm.txt create mode 100644 drivers/gpu/drm/ci/testlist-panfrost.txt create mode 100644 drivers/gpu/drm/ci/testlist-v3d.txt create mode 100644 drivers/gpu/drm/ci/testlist-vc4.txt create mode 100644 drivers/gpu/drm/ci/xfa
Re: [PATCH v4 09/11] drm/ci: rockchip: Refactor existing rockchip jobs
On 06/03/2024 00:06, Vignesh Raman wrote:
For rockchip rk3288 and rk3399, the display driver is rockchip.
Currently, in drm-ci for rockchip, only the display driver is
tested. Refactor the existing rockchip jobs so that gpu driver
testing jobs can be added later and update xfails accordingly.
Signed-off-by: Vignesh Raman
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names
instead of using DRIVER_NAME. Also update xfails.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
---
drivers/gpu/drm/ci/test.yml | 36
.../drm/ci/xfails/rockchip-rk3288-fails.txt | 58 ++-
.../drm/ci/xfails/rockchip-rk3288-flakes.txt | 20 +++
.../drm/ci/xfails/rockchip-rk3288-skips.txt | 54 ++---
.../drm/ci/xfails/rockchip-rk3399-fails.txt | 38 ++--
.../drm/ci/xfails/rockchip-rk3399-flakes.txt | 28 +++--
.../drm/ci/xfails/rockchip-rk3399-skips.txt | 5 +-
7 files changed, 110 insertions(+), 129 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 6ae6398b3d88..831e580e6dfd 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -153,33 +153,45 @@ msm:sdm845:
script:
- ./install/bare-metal/cros-servo.sh
-rockchip:rk3288:
- extends:
-- .lava-igt:arm32
+.rockchip:
stage: rockchip
variables:
-DRIVER_NAME: rockchip
Looks like it make sense to keep DRIVER_NAME here, no?
-DEVICE_TYPE: rk3288-veyron-jaq
DTB: ${DEVICE_TYPE}
BOOT_METHOD: depthcharge
+
+.rk3288:
+ extends:
+- .lava-igt:arm32
+- .rockchip
Maybe, instead of extending .rockchip here, make .rockchip tied to the
DRIVER_NAME and .rk3288 tied to the GPU_VERSION, and on rockchip:rk3288
you can extend both .rockchip and .rk3288, what do you think?
So rockchip:rk3399 you can extend .rockchip and .rk3399.
and in the panfrost one you can have a .panfrost (that can extend
.rockchip if they are the same definition).
I feel it becomes less confusing, what do you think?
I would even add some prefix or suffix to make it less confusing, like
.driver-rockchip and .gpu-rk3288 for instance, making it a bit more
intuitive and helping our future selves :)
+ variables:
+DEVICE_TYPE: rk3288-veyron-jaq
KERNEL_IMAGE_TYPE: "zimage"
-GPU_VERSION: rk3288
Looks like it make sense to keep GPU_VERSION here, no? Same comment for
.rk3399.
Regards,
Helen
RUNNER_TAG: mesa-ci-x86-64-lava-rk3288-veyron-jaq
-rockchip:rk3399:
+.rk3399:
extends:
- .lava-igt:arm64
- stage: rockchip
+- .rockchip
parallel: 2
variables:
-DRIVER_NAME: rockchip
DEVICE_TYPE: rk3399-gru-kevin
-DTB: ${DEVICE_TYPE}
-BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
-GPU_VERSION: rk3399
RUNNER_TAG: mesa-ci-x86-64-lava-rk3399-gru-kevin
+rockchip:rk3288:
+ extends:
+- .rk3288
+ variables:
+GPU_VERSION: rk3288
+DRIVER_NAME: rockchip
+
+rockchip:rk3399:
+ extends:
+- .rk3399
+ variables:
+GPU_VERSION: rk3399
+DRIVER_NAME: rockchip
+
.i915:
extends:
- .lava-igt:x86_64
diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
index 90c63f519e9e..c16e0a06cc8f 100644
--- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-fails.txt
@@ -1,54 +1,30 @@
-kms_3d,Crash
-kms_bw@linear-tiling-2-displays-1920x1080p,Fail
kms_bw@linear-tiling-2-displays-2560x1440p,Fail
-kms_bw@linear-tiling-2-displays-3840x2160p,Fail
kms_bw@linear-tiling-3-displays-1920x1080p,Fail
-kms_bw@linear-tiling-3-displays-2560x1440p,Fail
-kms_bw@linear-tiling-3-displays-3840x2160p,Fail
+kms_cursor_crc@cursor-onscreen-32x10,Crash
+kms_cursor_crc@cursor-onscreen-64x21,Crash
+kms_cursor_crc@cursor-onscreen-64x64,Crash
+kms_cursor_crc@cursor-random-32x10,Crash
+kms_cursor_crc@cursor-random-64x21,Crash
+kms_cursor_crc@cursor-random-64x64,Crash
+kms_cursor_crc@cursor-sliding-32x10,Crash
+kms_cursor_crc@cursor-sliding-32x32,Crash
+kms_cursor_crc@cursor-sliding-64x64,Crash
+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-atomic-transitions,Fail
+kms_cursor_legacy@cursor-vs-flip-toggle,Fail
+kms_cursor_legacy@flip-vs-cursor-crc-atomic,Crash
+kms_cursor_legacy@flip-vs-cursor-crc-legacy,Crash
kms_flip@flip-vs-modeset-vs-hang,Crash
kms_flip@flip-vs-panning-vs-hang,Crash
-kms_force_connector_basic@force-load-detect,Fail
kms_invalid_mode@int-max-clock,Crash
-kms_pipe_crc_basic@compare-c
Re: [PATCH v4 07/11] drm/ci: meson: Refactor existing meson jobs
On 06/03/2024 00:06, Vignesh Raman wrote:
For Amlogic Meson SOC the display driver is meson. Currently,
in drm-ci for meson, only the display driver is tested.
Refactor the existing meson jobs so that gpu driver testing
jobs can be added later and update xfails accordingly.
Signed-off-by: Vignesh Raman
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names instead
of using DRIVER_NAME.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
---
drivers/gpu/drm/ci/test.yml| 11 ---
drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt | 5 -
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 99fd101ce2fe..951a44bf9d19 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -351,20 +351,25 @@ panfrost:mt8183:
- .lava-igt:arm64
stage: meson
variables:
-DRIVER_NAME: meson
DTB: ${DEVICE_TYPE}
BOOT_METHOD: u-boot
KERNEL_IMAGE_TYPE: "image"
-meson:g12b:
+.g12b:
extends:
- .meson
parallel: 3
variables:
DEVICE_TYPE: meson-g12b-a311d-khadas-vim3
-GPU_VERSION: g12b
Looks like it make sense to keep GPU_VERSION here, no?
Regards,
Helen
RUNNER_TAG: mesa-ci-x86-64-lava-meson-g12b-a311d-khadas-vim3
+meson:g12b:
+ extends:
+- .g12b
+ variables:
+GPU_VERSION: g12b
+DRIVER_NAME: meson
+
virtio_gpu:none:
stage: virtio-gpu
variables:
diff --git a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
index 56a2ae7047b4..029b4ade21f6 100644
--- a/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt
@@ -5,11 +5,6 @@ kms_cursor_legacy@single-bo,Fail
kms_cursor_legacy@single-move,Fail
kms_cursor_legacy@torture-bo,Fail
kms_cursor_legacy@torture-move,Fail
-kms_force_connector_basic@force-edid,Fail
-kms_hdmi_inject@inject-4k,Fail
-kms_plane_cursor@overlay,Fail
-kms_plane_cursor@primary,Fail
-kms_plane_cursor@viewport,Fail
kms_properties@connector-properties-atomic,Fail
kms_properties@connector-properties-legacy,Fail
kms_properties@get_properties-sanity-atomic,Fail
Re: [PATCH v4 05/11] drm/ci: mediatek: Refactor existing mediatek jobs
On 06/03/2024 00:06, Vignesh Raman wrote:
For mediatek mt8173 and mt8183, the display driver is mediatek.
Currently, in drm-ci for mediatek, only the display driver is
tested. Refactor the existing mediatek jobs so that gpu driver
testing jobs can be added later and update xfails accordingly.
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.
Signed-off-by: Vignesh Raman
---
v2:
- Refactor the patch to rename job to indicate display driver testing,
rename the existing xfail files, and remove IGT_FORCE_DRIVER from the
script since it's now set by the job.
v3:
- Add the job name in GPU_VERSION and use it for xfail file names instead
of using DRIVER_NAME. Also update xfails.
v4:
- Remove the display suffix in job and rename xfails accordingly.
Remove the change adding job name in GPU_VERSION.
---
drivers/gpu/drm/ci/igt_runner.sh | 10 -
drivers/gpu/drm/ci/test.yml | 21 ++-
.../drm/ci/xfails/mediatek-mt8173-fails.txt | 15 -
.../drm/ci/xfails/mediatek-mt8173-flakes.txt | 13
.../drm/ci/xfails/mediatek-mt8183-fails.txt | 21 ---
.../drm/ci/xfails/mediatek-mt8183-flakes.txt | 8 +++
6 files changed, 50 insertions(+), 38 deletions(-)
create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt
create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt
diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index 77cd81fe6d1a..711f32772e48 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -20,16 +20,6 @@ cat /sys/kernel/debug/dri/*/state
set -e
case "$DRIVER_NAME" in
-rockchip|meson)
-export IGT_FORCE_DRIVER="panfrost"
-;;
-mediatek)
-if [ "$GPU_VERSION" = "mt8173" ]; then
-export IGT_FORCE_DRIVER=${DRIVER_NAME}
-elif [ "$GPU_VERSION" = "mt8183" ]; then
-export IGT_FORCE_DRIVER="panfrost"
-fi
-;;
amdgpu)
# Cannot use HWCI_KERNEL_MODULES as at that point we don't have the
module in /lib
mv /install/modules/lib/modules/* /lib/modules/.
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 0857773e5c5f..f8f48523ada3 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -282,29 +282,40 @@ amdgpu:stoney:
- .lava-igt:arm64
stage: mediatek
variables:
-DRIVER_NAME: mediatek
DTB: ${DEVICE_TYPE}
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
-mediatek:mt8173:
+.mt8173:
extends:
- .mediatek
parallel: 4
variables:
DEVICE_TYPE: mt8173-elm-hana
-GPU_VERSION: mt8173
Looks like it make sense to keep GPU_VERSION here, no?
Same comment for .mt8183.
Regards,
Helen
RUNNER_TAG: mesa-ci-x86-64-lava-mt8173-elm-hana
-mediatek:mt8183:
+.mt8183:
extends:
- .mediatek
parallel: 3
variables:
DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16
-GPU_VERSION: mt8183
RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16
+mediatek:mt8173:
+ extends:
+- .mt8173
+ variables:
+GPU_VERSION: mt8173
+DRIVER_NAME: mediatek
+
+mediatek:mt8183:
+ extends:
+- .mt8183
+ variables:
+GPU_VERSION: mt8183
+DRIVER_NAME: mediatek
+
# drm-mtk doesn't even probe yet in mainline for mt8192
.mediatek:mt8192:
extends:
diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
index ef0cb7c3698c..c63abd603b02 100644
--- a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
+++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt
@@ -9,28 +9,13 @@ kms_bw@linear-tiling-3-displays-1920x1080p,Fail
kms_bw@linear-tiling-3-displays-2560x1440p,Fail
kms_bw@linear-tiling-3-displays-3840x2160p,Fail
kms_color@invalid-gamma-lut-sizes,Fail
-kms_color@pipe-A-invalid-gamma-lut-sizes,Fail
-kms_color@pipe-B-invalid-gamma-lut-sizes,Fail
kms_cursor_legacy@cursor-vs-flip-atomic,Fail
kms_cursor_legacy@cursor-vs-flip-legacy,Fail
kms_flip@flip-vs-modeset-vs-hang,Fail
kms_flip@flip-vs-panning-vs-hang,Fail
kms_flip@flip-vs-suspend,Fail
kms_flip@flip-vs-suspend-interruptible,Fail
-kms_force_connector_basic@force-edid,Fail
-kms_force_connector_basic@force-load-detect,Fail
-kms_force_connector_basic@prune-stale-modes,Fail
-kms_hdmi_inject@inject-4k,Fail
-kms_plane_scaling@planes-upscale-20x20,Fail
-kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-25,Fail
-kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-5,Fail
-kms_plane_scaling@planes-upscale-20x20-downscale-factor-0-75,Fail
-kms_plane_scaling@upscale-with-modifier-20x20,Fail
-kms_plane_scaling@upscale-with-pixel-format-20x20,Fail
-kms_plane_scaling@upscale-with-rotation-20x20,Fail
kms_pro
Re: [PATCH v4 03/11] drm/ci: uprev IGT and update testlist
On 06/03/2024 00:06, Vignesh Raman wrote: Uprev IGT and add amd, v3d, vc4 and vgem specific tests to testlist. Have testlist.txt per driver and include a base testlist so that the driver specific tests will run only on those hardware. Also add testlists to the MAINTAINERS file. Signed-off-by: Vignesh Raman --- v3: - New patch in series to uprev IGT and update testlist. v4: - Add testlists to the MAINTAINERS file and remove amdgpu xfails changes. --- MAINTAINERS | 11 ++ drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/igt_runner.sh | 12 +- drivers/gpu/drm/ci/testlist-amdgpu.txt | 151 +++ drivers/gpu/drm/ci/testlist-msm.txt | 50 drivers/gpu/drm/ci/testlist-panfrost.txt | 17 +++ drivers/gpu/drm/ci/testlist-v3d.txt | 73 +++ drivers/gpu/drm/ci/testlist-vc4.txt | 49 drivers/gpu/drm/ci/testlist.txt | 84 ++--- 9 files changed, 398 insertions(+), 51 deletions(-) create mode 100644 drivers/gpu/drm/ci/testlist-amdgpu.txt create mode 100644 drivers/gpu/drm/ci/testlist-msm.txt create mode 100644 drivers/gpu/drm/ci/testlist-panfrost.txt create mode 100644 drivers/gpu/drm/ci/testlist-v3d.txt create mode 100644 drivers/gpu/drm/ci/testlist-vc4.txt diff --git a/MAINTAINERS b/MAINTAINERS index 3bc7e122a094..4da66ca92f1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1665,6 +1665,8 @@ L:dri-devel@lists.freedesktop.org S:Supported T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/gpu/panfrost.rst +F: drivers/gpu/drm/ci/testlist-panfrost.txt +F: drivers/gpu/drm/ci/testlist.txt I wonder if we should have both here, since the second is not used right? F:drivers/gpu/drm/panfrost/ F:include/uapi/drm/panfrost_drm.h @@ -6753,6 +6755,8 @@ S: Maintained B:https://gitlab.freedesktop.org/drm/msm/-/issues T:git https://gitlab.freedesktop.org/drm/msm.git F:Documentation/devicetree/bindings/display/msm/ +F: drivers/gpu/drm/ci/testlist-msm.txt +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/msm* F:drivers/gpu/drm/msm/ F:include/uapi/drm/msm_drm.h @@ -7047,6 +7051,7 @@ T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml F:Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml F:Documentation/gpu/meson.rst +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/meson* F:drivers/gpu/drm/meson/ @@ -7160,6 +7165,7 @@ L: dri-devel@lists.freedesktop.org L:linux-media...@lists.infradead.org (moderated for non-subscribers) S:Supported F:Documentation/devicetree/bindings/display/mediatek/ +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/mediatek* F:drivers/gpu/drm/mediatek/ F:drivers/phy/mediatek/phy-mtk-dp.c @@ -7211,6 +7217,7 @@ L:dri-devel@lists.freedesktop.org S:Maintained T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/devicetree/bindings/display/rockchip/ +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/rockchip* F:drivers/gpu/drm/rockchip/ @@ -10739,6 +10746,7 @@ C: irc://irc.oftc.net/intel-gfx T:git git://anongit.freedesktop.org/drm-intel F:Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon F:Documentation/gpu/i915.rst +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/i915* F:drivers/gpu/drm/i915/ F:include/drm/i915* @@ -18255,6 +18263,8 @@ C: irc://irc.oftc.net/radeon T:git https://gitlab.freedesktop.org/agd5f/linux.git F:Documentation/gpu/amdgpu/ F:drivers/gpu/drm/amd/ +F: drivers/gpu/drm/ci/testlist-amdgpu.txt +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/amd* F:drivers/gpu/drm/radeon/ F:include/uapi/drm/amdgpu_drm.h @@ -23303,6 +23313,7 @@ L: dri-devel@lists.freedesktop.org L:virtualizat...@lists.linux.dev S:Maintained T:git git://anongit.freedesktop.org/drm/drm-misc +F: drivers/gpu/drm/ci/testlist.txt F:drivers/gpu/drm/ci/xfails/virtio* F:drivers/gpu/drm/virtio/ F:include/uapi/linux/virtio_gpu.h diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index bc8cb3420476..e2b021616a8e 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -5,7 +5,7 @@ variables: UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next - IGT_VERSION: d2af13d9f5be5ce23d996e4afd3e45990f5ab977 + IGT_VERSION: b0cc8160ebdc87ce08b7fd83bb3c99ff7a4d8610 DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git DEQP_RUNNER_GIT_TAG: v0.15.0 diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/i
Re: [PATCH v4 02/11] drm/ci: uprev mesa version
On 06/03/2024 00:06, Vignesh Raman wrote:
zlib.net is not allowing tarball download anymore and results
in below error in kernel+rootfs_arm32 container build,
urllib.error.HTTPError: HTTP Error 403: Forbidden
urllib.error.HTTPError: HTTP Error 415: Unsupported Media Type
Uprev mesa which includes a fix for this issue.
https://gitlab.freedesktop.org/mesa/mesa/-/commit/908f444e
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
Thanks
Helen
---
v3:
- New patch in series to uprev mesa.
v4:
- Fix checkpatch warning.
---
drivers/gpu/drm/ci/container.yml | 6 +++---
drivers/gpu/drm/ci/gitlab-ci.yml | 6 +++---
drivers/gpu/drm/ci/image-tags.yml | 3 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/ci/container.yml b/drivers/gpu/drm/ci/container.yml
index 9764e7921a4f..1060eb380b02 100644
--- a/drivers/gpu/drm/ci/container.yml
+++ b/drivers/gpu/drm/ci/container.yml
@@ -40,11 +40,11 @@ debian/x86_64_test-android:
rules:
- when: never
-windows_build_vs2019:
+windows_build_msvc:
rules:
- when: never
-windows_test_vs2019:
+windows_test_msvc:
rules:
- when: never
@@ -56,7 +56,7 @@ rustfmt:
rules:
- when: never
-windows_vs2019:
+windows_msvc:
rules:
- when: never
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 084e3ff8e3f4..bc8cb3420476 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
9d162de9a05155e1c4041857a5848842749164cf
+ DRM_CI_COMMIT_SHA: &drm-ci-commit-sha
c4b32f9e90b7204735e6adf1f60c178bf85752e7
UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
TARGET_BRANCH: drm-next
@@ -26,7 +26,7 @@ variables:
JOB_ARTIFACTS_BASE: ${PIPELINE_ARTIFACTS_BASE}/${CI_JOB_ID}
# default kernel for rootfs before injecting the current kernel tree
KERNEL_REPO: "gfx-ci/linux"
- KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
+ KERNEL_TAG: "v6.6.13-mesa-9916"
KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
LAVA_TAGS: subset-1-gfx
LAVA_JOB_PRIORITY: 30
@@ -98,6 +98,7 @@ include:
stages:
- sanity
- container
+ - code-validation
- git-archive
- build
- amdgpu
@@ -107,7 +108,6 @@ stages:
- msm
- rockchip
- virtio-gpu
- - lint
# YAML anchors for rule conditions
#
diff --git a/drivers/gpu/drm/ci/image-tags.yml
b/drivers/gpu/drm/ci/image-tags.yml
index 7ab4f2514da8..cf07c3e09b8c 100644
--- a/drivers/gpu/drm/ci/image-tags.yml
+++ b/drivers/gpu/drm/ci/image-tags.yml
@@ -1,5 +1,5 @@
variables:
- CONTAINER_TAG: "2023-10-11-mesa-uprev"
+ CONTAINER_TAG: "2022-01-29-mesa-uprev"
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
@@ -7,6 +7,7 @@ variables:
DEBIAN_BUILD_TAG: "2023-10-08-config"
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
+ PKG_REPO_REV: "67f2c46b"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"
Re: [PATCH v3] drm/ci: update device type for volteer devices
On 06/03/2024 23:18, Vignesh Raman wrote:
Volteer devices in the collabora lab are categorized under the
asus-cx9400-volteer device type. The majority of these units
has an Intel Core i5-1130G7 CPU, while some of them have a
Intel Core i7-1160G7 CPU instead. So due to this difference,
new device type template is added for the Intel Core i5-1130G7
and i7-1160G7 variants of the Acer Chromebook Spin 514 (CP514-2H)
volteer Chromebooks. So update the same in drm-ci.
https://gitlab.collabora.com/lava/lava/-/merge_requests/149
Fixes: 0119c894ab0d ("drm: Add initial ci/ subdirectory")
Reviewed-by: David Heidelberg
Signed-off-by: Vignesh Raman
Acked-by: Helen Koike
Thanks
Helen
---
v2:
- Add fixes tag so change gets propagated to stable.
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1119672
v3:
- Fix checkpatch warning.
Please use correct Fixes: style 'Fixes: <12 chars of sha1> ("")'
---
drivers/gpu/drm/ci/test.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 0857773e5c5f..8bc63912fddb 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -252,11 +252,11 @@ i915:cml:
i915:tgl:
extends:
- .i915
- parallel: 8
+ parallel: 5
variables:
-DEVICE_TYPE: asus-cx9400-volteer
+DEVICE_TYPE: acer-cp514-2h-1130g7-volteer
GPU_VERSION: tgl
-RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer
+RUNNER_TAG: mesa-ci-x86-64-lava-acer-cp514-2h-1130g7-volteer
.amdgpu:
extends:
Re: [PATCH 1/3] kci-gitlab: Introducing GitLab-CI Pipeline for Kernel Testing
Hi Linus, Thank you for your reply and valuable inputs. On 01/03/2024 17:10, Linus Torvalds wrote: On Fri, 1 Mar 2024 at 02:27, Nikolai Kondrashov wrote: I agree, it's hard to imagine even a simple majority agreeing on how GitLab CI should be done. Still, we would like to help people, who are interested in this kind of thing, to set it up. How about we reframe this contribution as a sort of template, or a reference for people to start their setup with, assuming that most maintainers would want to tweak it? We would also be glad to stand by for questions and help, as people try to use it. Ack. I think seeing it as a library for various gitlab CI models would be a lot more palatable. Particularly if you can then show that yes, it is also relevant to our currently existing drm case. Having it as a library would certainly make my work as the DRM-CI maintainer easier and also simplify the process whenever we consider integrating tests into other subsystems. So I'm not objecting to having (for example) some kind of CI helper templates - I think a logical place would be in tools/ci/ which is kind of alongside our tools/testing subdirectory. Works for me. We can skip having a default .gitlab-ci.yml in the root directory and instead include clear instructions in our documentation for using these templates. Thanks, Helen Koike (And then perhaps have a 'gitlab' directory under that. I'm not sure whether - and how much - commonality there might be between the different CI models of different hosts). Just to clarify: when I say "a logical place", I very much want to emphasize the "a" - maybe there are better places, and I'm not saying that is the only possible place. But it sounds more logical to me than some. Linus
[PATCH 2/3] kci-gitlab: Add documentation
Add documentation of kci-gitlab. Signed-off-by: Helen Koike --- Documentation/ci/gitlab-ci/gitlab-ci.rst | 404 +++ Documentation/index.rst | 7 + MAINTAINERS | 1 + 3 files changed, 412 insertions(+) create mode 100644 Documentation/ci/gitlab-ci/gitlab-ci.rst diff --git a/Documentation/ci/gitlab-ci/gitlab-ci.rst b/Documentation/ci/gitlab-ci/gitlab-ci.rst new file mode 100644 index 0..4f7ef03cca95c --- /dev/null +++ b/Documentation/ci/gitlab-ci/gitlab-ci.rst @@ -0,0 +1,404 @@ +.. SPDX-License-Identifier: GPL-2.0+ + += +Automated Testing with GitLab CI/CD += + +This documentation outlines the GitLab CI/CD workflow for the Linux Kernel. The +workflow is designed to simplify testing for developers, allowing tests to be +run on any branch at any time, without the need for specific infrastructure. +Tests are automatically triggered on each `git push`, with results displayed in +the GitLab UI. + +.. image:: images/the-pipeline.png + :alt: GitLab-CI pipeline for kernel testing + :align: center + +Customizations and extensions of the pipeline are possible through the +scenarios. Scenarios can override existing jobs, change configurations, or +define new jobs and stages. See :ref:`extending-the-ci` section. + +.. note:: If you are unfamiliar with GitLab CI/CD basic concepts, please check + the `official documentation <https://docs.gitlab.com/ee/ci/>`_. + +.. only:: subproject and html + + Indices + === + + * :ref:`genindex` + +Setup +- + +The GitLab CI pipeline is configured for **"out-of-the-box"** use. Pushing code to a +GitLab repository automatically triggers the pipeline. + +.. code-block:: bash + + # Download the Linux kernel source code + git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + # Create a repository on GitLab and add it as a remote + git remote add gitlab https://gitlab.yourinstance.com/your-username/your-repo.git + # Push the code to GitLab + git push gitlab + +.. image:: images/pipelines-on-push.png + :alt: Pipeline triggered on push + :align: center + +Troubleshooting +--- + +If the pipeline doesn't trigger automatically, check the following: + +1. **Enable CI/CD in Project Settings:** + + - Go to `Settings > General > Visibility, project features, permissions`. + - Under `Repository`, ensure the `CI/CD` toggle is enabled. + +2. **Enable Container Registry:** + + - Still in `Settings`, find the `Container Registry` section. + - Enable the `Container Registry` toggle. + +3. **CI Minutes and Resources:** + + - If you've exhausted CI minutes or other resources on the Free Tier, + consider setting up a local GitLab runner (see below). + +Setting Up a Local GitLab Runner + + +You can use your own machine as a runner, instead of the shared runners provided +by your GitLab instance. + +1. **Generate a GitLab Runner Token:** + + - Navigate to `Settings > CI/CD > Runners`. + - Expand the `Runners` section and click on "New project runner". + - Choose "Run untagged jobs" and click "Create runner". + - Copy the provided token. + +.. image:: images/new-project-runner.png + :alt: New project runner button + :align: center + +2. **Launch the Runner:** + + - Ensure Docker is installed and your user is added to the Docker group: + +.. code-block:: bash + +sudo usermod -aG docker + + - Log in again to apply the changes. + - Set up the runner: + +.. code-block:: bash + + export GITLAB_RUNNER_TOKEN= + export GITLAB_URL=https://gitlab.yourinstance.com # Use this for instances other than gitlab.com + cd ci/gitlab-ci + ./bootstrap-gitlab-runner.sh + + +Current Pipeline Jobs +- + +stage: container + + +**job: debian/x86_64_build** + +This job prepares the container used by subsequent jobs. It starts from a base +Debian image, installing necessary tools for building the kernel and running +tests. The resulting image is pushed to the project registry and cached. If the +image already exists in the registry, it won't be rebuilt. + +To force a rebuild, update the `FDO_DISTRIBUTION_TAG` variable in the +`container.yml` file. + +stage: static-checks + + +**job: checkpatch** + +Runs the `checkpatch.pl` script on the last `$ICI_PATCH_SERIES_SIZE` commits. +This variable is determined by: + +- `ICI_PATCH_SERIES_SIZE=` The number of differing patches between target and + source branches for merge requests; Or +- `ICI_PATCH_SERIES_SIZE=$KCI_PATCH_SERIES_SIZE` if `KCI_PATCH_SERIES_SIZE` is + set (see :ref:`how-to-set-variables` below). + +Defaults to 1 and raises a GitLab warning if unable to identify the number of +commits. + +**job: s
[PATCH 1/3] kci-gitlab: Introducing GitLab-CI Pipeline for Kernel Testing
This patch introduces a `.gitlab-ci` file along with a `ci/` folder, defininga basic test pipeline triggered by code pushes to a GitLab-CI instance. This initial version includes static checks (checkpatch and smatch for now) and build tests across various architectures and configurations. It leverages an integrated cache for efficient build times and introduces a flexible 'scenarios' mechanism for subsystem-specific extensions. [ci: add prerequisites to run check-patch on MRs] Co-developed-by: Tales Aparecida Signed-off-by: Tales Aparecida Signed-off-by: Helen Koike --- Hey all, You can check the validation of this patchset on: https://gitlab.collabora.com/koike/linux/-/pipelines/87035 I would appreciate your feedback on this work, what do you think? If you would rate from 0 to 5, where: [ ] 0. I don't think this is useful at all, and I doubt it will ever be. It doesn't seem worthwhile. [ ] 1. I don't find it useful in its current form. [ ] 2. It might be useful to others, but not for me. [ ] 3. It has potential, but it's not yet something I can incorporate into my workflow. [ ] 4. This is useful, but it needs some adjustments before I can include it in my workflow. [ ] 5. This is really useful! I'm eager to start using it right away. Why didn't you send this earlier? :) Which rating would you select? --- .gitlab-ci.yml| 2 + MAINTAINERS | 8 ++ ci/gitlab-ci/bootstrap-gitlab-runner.sh | 55 + ci/gitlab-ci/ci-scripts/build-docs.sh | 35 ++ ci/gitlab-ci/ci-scripts/build-kernel.sh | 35 ++ ci/gitlab-ci/ci-scripts/ici-functions.sh | 104 ++ ci/gitlab-ci/ci-scripts/install-smatch.sh | 13 +++ .../ci-scripts/parse_commit_message.sh| 27 + ci/gitlab-ci/ci-scripts/run-checkpatch.sh | 20 ci/gitlab-ci/ci-scripts/run-smatch.sh | 45 ci/gitlab-ci/docker-compose.yaml | 18 +++ ci/gitlab-ci/linux.code-workspace | 11 ++ ci/gitlab-ci/yml/build.yml| 43 ci/gitlab-ci/yml/cache.yml| 26 + ci/gitlab-ci/yml/container.yml| 36 ++ ci/gitlab-ci/yml/gitlab-ci.yml| 71 ci/gitlab-ci/yml/kernel-combinations.yml | 18 +++ ci/gitlab-ci/yml/scenarios.yml| 12 ++ ci/gitlab-ci/yml/scenarios/file-systems.yml | 21 ci/gitlab-ci/yml/scenarios/media.yml | 21 ci/gitlab-ci/yml/scenarios/network.yml| 21 ci/gitlab-ci/yml/static-checks.yml| 21 22 files changed, 663 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100755 ci/gitlab-ci/bootstrap-gitlab-runner.sh create mode 100755 ci/gitlab-ci/ci-scripts/build-docs.sh create mode 100755 ci/gitlab-ci/ci-scripts/build-kernel.sh create mode 100644 ci/gitlab-ci/ci-scripts/ici-functions.sh create mode 100755 ci/gitlab-ci/ci-scripts/install-smatch.sh create mode 100755 ci/gitlab-ci/ci-scripts/parse_commit_message.sh create mode 100755 ci/gitlab-ci/ci-scripts/run-checkpatch.sh create mode 100755 ci/gitlab-ci/ci-scripts/run-smatch.sh create mode 100644 ci/gitlab-ci/docker-compose.yaml create mode 100644 ci/gitlab-ci/linux.code-workspace create mode 100644 ci/gitlab-ci/yml/build.yml create mode 100644 ci/gitlab-ci/yml/cache.yml create mode 100644 ci/gitlab-ci/yml/container.yml create mode 100644 ci/gitlab-ci/yml/gitlab-ci.yml create mode 100644 ci/gitlab-ci/yml/kernel-combinations.yml create mode 100644 ci/gitlab-ci/yml/scenarios.yml create mode 100644 ci/gitlab-ci/yml/scenarios/file-systems.yml create mode 100644 ci/gitlab-ci/yml/scenarios/media.yml create mode 100644 ci/gitlab-ci/yml/scenarios/network.yml create mode 100644 ci/gitlab-ci/yml/static-checks.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0..fac523bb86866 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,2 @@ +include: + - ci/gitlab-ci/yml/gitlab-ci.yml diff --git a/MAINTAINERS b/MAINTAINERS index 716b2e22598c8..aa0f65791c2ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4998,6 +4998,14 @@ T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/i2c/chrontel,ch7322.yaml F: drivers/media/cec/i2c/ch7322.c +CI AUTOMATED TESTING +M: Helen Koike +L: linux-ker...@vger.kernel.org +S: Maintained +T: git https://gitlab.collabora.com/koike/linux.git +F: .gitlab-ci.yml +F: ci/ + CIRRUS LOGIC AUDIO CODEC DRIVERS M: James Schulman M: David Rhodes diff --git a/ci/gitlab-ci/bootstrap-gitlab-runner.sh b/ci/gitlab-ci/bootstrap-gitlab-runner.sh new file mode 100755 index 0..73238960d0880 --- /dev/null +++ b/ci/gitlab-ci/bootstrap-gitlab-runner.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# +# Copyright (C) 2024 Col
[PATCH 0/3] kci-gitlab: Introducing GitLab-CI Pipeline for Kernel Testing
th from Red Hat - and KernelCI community for their valuable feedback and support in this proposal. I eagerly await your thoughts and suggestions on this initiative. Also, if you want to see this initiave move faster, we are happy to discuss funding options. Best regards, Helen Koike Helen Koike (3): kci-gitlab: Introducing GitLab-CI Pipeline for Kernel Testing kci-gitlab: Add documentation kci-gitlab: docs: Add images .gitlab-ci.yml| 2 + Documentation/ci/gitlab-ci/gitlab-ci.rst | 404 ++ .../ci/gitlab-ci/images/job-matrix.png| Bin 0 -> 159752 bytes .../gitlab-ci/images/new-project-runner.png | Bin 0 -> 607737 bytes .../ci/gitlab-ci/images/pipelines-on-push.png | Bin 0 -> 532143 bytes .../ci/gitlab-ci/images/the-pipeline.png | Bin 0 -> 91675 bytes .../ci/gitlab-ci/images/variables.png | Bin 0 -> 277518 bytes Documentation/index.rst | 7 + MAINTAINERS | 9 + ci/gitlab-ci/bootstrap-gitlab-runner.sh | 55 +++ ci/gitlab-ci/ci-scripts/build-docs.sh | 35 ++ ci/gitlab-ci/ci-scripts/build-kernel.sh | 35 ++ ci/gitlab-ci/ci-scripts/ici-functions.sh | 104 + ci/gitlab-ci/ci-scripts/install-smatch.sh | 13 + .../ci-scripts/parse_commit_message.sh| 27 ++ ci/gitlab-ci/ci-scripts/run-checkpatch.sh | 19 + ci/gitlab-ci/ci-scripts/run-smatch.sh | 45 ++ ci/gitlab-ci/docker-compose.yaml | 18 + ci/gitlab-ci/linux.code-workspace | 11 + ci/gitlab-ci/yml/build.yml| 43 ++ ci/gitlab-ci/yml/cache.yml| 26 ++ ci/gitlab-ci/yml/container.yml| 36 ++ ci/gitlab-ci/yml/gitlab-ci.yml| 71 +++ ci/gitlab-ci/yml/kernel-combinations.yml | 18 + ci/gitlab-ci/yml/scenarios.yml| 12 + ci/gitlab-ci/yml/scenarios/file-systems.yml | 21 + ci/gitlab-ci/yml/scenarios/media.yml | 21 + ci/gitlab-ci/yml/scenarios/network.yml| 21 + ci/gitlab-ci/yml/static-checks.yml| 21 + 29 files changed, 1074 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 Documentation/ci/gitlab-ci/gitlab-ci.rst create mode 100644 Documentation/ci/gitlab-ci/images/job-matrix.png create mode 100644 Documentation/ci/gitlab-ci/images/new-project-runner.png create mode 100644 Documentation/ci/gitlab-ci/images/pipelines-on-push.png create mode 100644 Documentation/ci/gitlab-ci/images/the-pipeline.png create mode 100644 Documentation/ci/gitlab-ci/images/variables.png create mode 100755 ci/gitlab-ci/bootstrap-gitlab-runner.sh create mode 100755 ci/gitlab-ci/ci-scripts/build-docs.sh create mode 100755 ci/gitlab-ci/ci-scripts/build-kernel.sh create mode 100644 ci/gitlab-ci/ci-scripts/ici-functions.sh create mode 100755 ci/gitlab-ci/ci-scripts/install-smatch.sh create mode 100755 ci/gitlab-ci/ci-scripts/parse_commit_message.sh create mode 100755 ci/gitlab-ci/ci-scripts/run-checkpatch.sh create mode 100755 ci/gitlab-ci/ci-scripts/run-smatch.sh create mode 100644 ci/gitlab-ci/docker-compose.yaml create mode 100644 ci/gitlab-ci/linux.code-workspace create mode 100644 ci/gitlab-ci/yml/build.yml create mode 100644 ci/gitlab-ci/yml/cache.yml create mode 100644 ci/gitlab-ci/yml/container.yml create mode 100644 ci/gitlab-ci/yml/gitlab-ci.yml create mode 100644 ci/gitlab-ci/yml/kernel-combinations.yml create mode 100644 ci/gitlab-ci/yml/scenarios.yml create mode 100644 ci/gitlab-ci/yml/scenarios/file-systems.yml create mode 100644 ci/gitlab-ci/yml/scenarios/media.yml create mode 100644 ci/gitlab-ci/yml/scenarios/network.yml create mode 100644 ci/gitlab-ci/yml/static-checks.yml -- 2.40.1
Re: [PATCH v4 3/8] drm: ci: arm64.config: update ONBOARD_USB_HUB to ONBOARD_USB_DEV
On 20/02/2024 11:05, Javier Carrasco wrote: The onboard_usb_hub driver has been updated to support non-hub devices, which has led to some renaming. Update to the new name (ONBOARD_USB_DEV) accordingly. Signed-off-by: Javier Carrasco Acked-by: Helen Koike Regards, Helen --- drivers/gpu/drm/ci/arm64.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/ci/arm64.config b/drivers/gpu/drm/ci/arm64.config index 8dbce9919a57..4140303d6260 100644 --- a/drivers/gpu/drm/ci/arm64.config +++ b/drivers/gpu/drm/ci/arm64.config @@ -87,7 +87,7 @@ CONFIG_DRM_PARADE_PS8640=y CONFIG_DRM_LONTIUM_LT9611UXC=y CONFIG_PHY_QCOM_USB_HS=y CONFIG_QCOM_GPI_DMA=y -CONFIG_USB_ONBOARD_HUB=y +CONFIG_USB_ONBOARD_DEV=y CONFIG_NVMEM_QCOM_QFPROM=y CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y @@ -97,7 +97,7 @@ CONFIG_USB_RTL8152=y # db820c ethernet CONFIG_ATL1C=y # Chromebooks ethernet -CONFIG_USB_ONBOARD_HUB=y +CONFIG_USB_ONBOARD_DEV=y # 888 HDK ethernet CONFIG_USB_LAN78XX=y
Re: [PATCH] drm: ci: uprev IGT
On 20/02/2024 09:17, Dmitry Baryshkov wrote: Bump IGT revision to pick up Rob Clark's fixes for the msm driver: - msm_submit@invalid-duplicate-bo-submit,Fail Signed-off-by: Dmitry Baryshkov Do you have a gitlab pipeline link I can check? Thanks Helen --- drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 8b82e6656924..47e567b4f7a7 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -5,7 +5,7 @@ variables: UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next - IGT_VERSION: d2af13d9f5be5ce23d996e4afd3e45990f5ab977 + IGT_VERSION: 3f2879fef93c0c546a2f1c0aa48a9cc2a594b9d2 DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git DEQP_RUNNER_GIT_TAG: v0.15.0
Re: [PATCH 3/3] drm/ci: mark universal-plane-sanity as failing on SC7180
On 19/02/2024 17:25, Helen Koike wrote: On 18/02/2024 01:12, Dmitry Baryshkov wrote: The test kms_universal_plane@universal-plane-sanity fails on both SC7180 platforms. The drm/msm returns -ERANGE as it can not handle passet scaling range, however the test is not ready to handle that. Mark the test as failing until it is fixed. ERROR - Igt error: (kms_universal_plane:1554) CRITICAL: Test assertion failure function sanity_test_pipe, file ../tests/kms_universal_plane.c:438: ERROR - Igt error: (kms_universal_plane:1554) CRITICAL: Failed assertion: drmModeSetPlane(data->drm_fd, primary->drm_plane->plane_id, output->config.crtc->crtc_id, test.oversized_fb.fb_id, 0, 0, 0, mode->hdisplay + 100, mode->vdisplay + 100, IGT_FIXED(0,0), IGT_FIXED(0,0), IGT_FIXED(mode->hdisplay,0), IGT_FIXED(mode->vdisplay,0)) == expect ERROR - Igt error: (kms_universal_plane:1554) CRITICAL: Last errno: 34, Numerical result out of range Signed-off-by: Dmitry Baryshkov Acked-by: Helen Koike Applied to drm-misc/drm-misc-next Thanks Helen --- .../gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 1 + .../drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt index 7e4d8744fcc6..f0576aa629e8 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt @@ -15,3 +15,4 @@ kms_plane_alpha_blend@alpha-7efc,Fail kms_plane_alpha_blend@coverage-7efc,Fail kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail kms_rmfb@close-fd,Fail +kms_universal_plane@universal-plane-sanity,Fail diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt index 7e4d8744fcc6..f0576aa629e8 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt @@ -15,3 +15,4 @@ kms_plane_alpha_blend@alpha-7efc,Fail kms_plane_alpha_blend@coverage-7efc,Fail kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail kms_rmfb@close-fd,Fail +kms_universal_plane@universal-plane-sanity,Fail
Re: [PATCH 2/3] drm/ci: update msm-apq8096-fails list
On 19/02/2024 17:26, Helen Koike wrote: On 18/02/2024 01:12, Dmitry Baryshkov wrote: Mark two tests as passing on the APQ8096 / db820c platform. Signed-off-by: Dmitry Baryshkov Acked-by: Helen Koike Applied to drm-misc/drm-misc-next Thanks Helen --- drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt index 2cd49e8ee47f..88a1fc0a3b0d 100644 --- a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt @@ -1,4 +1,2 @@ kms_3d,Fail kms_addfb_basic@addfb25-bad-modifier,Fail -kms_force_connector_basic@force-edid,Fail -kms_hdmi_inject@inject-4k,Fail
Re: [PATCH 1/3] drm/ci: update IGT test names
On 19/02/2024 17:25, Helen Koike wrote: On 19/02/2024 14:42, Dmitry Baryshkov wrote: On Mon, 19 Feb 2024 at 18:48, Helen Koike wrote: On 19/02/2024 11:33, Dmitry Baryshkov wrote: On Mon, 19 Feb 2024 at 15:21, Helen Koike wrote: Hi Dmitry, On 18/02/2024 01:12, Dmitry Baryshkov wrote: Since the addition of testlist.txt the IGT has changed some of test names. Some test names were changed to use '-' instead of '_'. In other cases tests were just renamed. Follow those changes. Signed-off-by: Dmitry Baryshkov Thanks for the patchset Do you have a pipeline link with those patches I can check? https://gitlab.freedesktop.org/drm/msm/-/pipelines/1106149/ I see two jobs failing, both had a timeout on the serial. msm:apq8016 had: Pass: 26, Fail: 1, ExpectedFail: 2, Skip: 1044, Duration: 17:40, Remaining: 27:48 but it didn't generate the fails.csv due to the timeout. In any case, should it also be updated on xfails? I could not get apq8016 to finish. Once it works in a stable way, I'll update corresponding xfails. Fair enough. We had apq8016 running well before, I wonder what happened. For this patch: Acked-by: Helen Koike Thanks Helen Applied to drm-misc/drm-misc-next Thanks Helen Regards, Helen Thanks Helen --- drivers/gpu/drm/ci/testlist.txt | 1888 ++- 1 file changed, 844 insertions(+), 1044 deletions(-) diff --git a/drivers/gpu/drm/ci/testlist.txt b/drivers/gpu/drm/ci/testlist.txt index eaeb751bb0ad..3377f002f8c5 100644 --- a/drivers/gpu/drm/ci/testlist.txt +++ b/drivers/gpu/drm/ci/testlist.txt @@ -100,7 +100,7 @@ kms_atomic@plane-invalid-params-fence kms_atomic@crtc-invalid-params kms_atomic@crtc-invalid-params-fence kms_atomic@atomic-invalid-params -kms_atomic@atomic_plane_damage +kms_atomic@atomic-plane-damage kms_atomic_interruptible@legacy-setmode kms_atomic_interruptible@atomic-setmode kms_atomic_interruptible@legacy-dpms @@ -321,726 +321,726 @@ kms_bw@linear-tiling-7-displays-3840x2160p kms_bw@linear-tiling-8-displays-1920x1080p kms_bw@linear-tiling-8-displays-2560x1440p kms_bw@linear-tiling-8-displays-3840x2160p -kms_ccs@pipe-A-bad-pixel-format-y_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-yf_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-yf_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-yf_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc
Re: [PATCH 2/3] drm/ci: update msm-apq8096-fails list
On 18/02/2024 01:12, Dmitry Baryshkov wrote: Mark two tests as passing on the APQ8096 / db820c platform. Signed-off-by: Dmitry Baryshkov Acked-by: Helen Koike --- drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt index 2cd49e8ee47f..88a1fc0a3b0d 100644 --- a/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt @@ -1,4 +1,2 @@ kms_3d,Fail kms_addfb_basic@addfb25-bad-modifier,Fail -kms_force_connector_basic@force-edid,Fail -kms_hdmi_inject@inject-4k,Fail
Re: [PATCH 3/3] drm/ci: mark universal-plane-sanity as failing on SC7180
On 18/02/2024 01:12, Dmitry Baryshkov wrote: The test kms_universal_plane@universal-plane-sanity fails on both SC7180 platforms. The drm/msm returns -ERANGE as it can not handle passet scaling range, however the test is not ready to handle that. Mark the test as failing until it is fixed. ERROR - Igt error: (kms_universal_plane:1554) CRITICAL: Test assertion failure function sanity_test_pipe, file ../tests/kms_universal_plane.c:438: ERROR - Igt error: (kms_universal_plane:1554) CRITICAL: Failed assertion: drmModeSetPlane(data->drm_fd, primary->drm_plane->plane_id, output->config.crtc->crtc_id, test.oversized_fb.fb_id, 0, 0, 0, mode->hdisplay + 100, mode->vdisplay + 100, IGT_FIXED(0,0), IGT_FIXED(0,0), IGT_FIXED(mode->hdisplay,0), IGT_FIXED(mode->vdisplay,0)) == expect ERROR - Igt error: (kms_universal_plane:1554) CRITICAL: Last errno: 34, Numerical result out of range Signed-off-by: Dmitry Baryshkov Acked-by: Helen Koike --- .../gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt| 1 + .../drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt| 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt index 7e4d8744fcc6..f0576aa629e8 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt @@ -15,3 +15,4 @@ kms_plane_alpha_blend@alpha-7efc,Fail kms_plane_alpha_blend@coverage-7efc,Fail kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail kms_rmfb@close-fd,Fail +kms_universal_plane@universal-plane-sanity,Fail diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt index 7e4d8744fcc6..f0576aa629e8 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt @@ -15,3 +15,4 @@ kms_plane_alpha_blend@alpha-7efc,Fail kms_plane_alpha_blend@coverage-7efc,Fail kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail kms_rmfb@close-fd,Fail +kms_universal_plane@universal-plane-sanity,Fail
Re: [PATCH 1/3] drm/ci: update IGT test names
On 19/02/2024 14:42, Dmitry Baryshkov wrote: On Mon, 19 Feb 2024 at 18:48, Helen Koike wrote: On 19/02/2024 11:33, Dmitry Baryshkov wrote: On Mon, 19 Feb 2024 at 15:21, Helen Koike wrote: Hi Dmitry, On 18/02/2024 01:12, Dmitry Baryshkov wrote: Since the addition of testlist.txt the IGT has changed some of test names. Some test names were changed to use '-' instead of '_'. In other cases tests were just renamed. Follow those changes. Signed-off-by: Dmitry Baryshkov Thanks for the patchset Do you have a pipeline link with those patches I can check? https://gitlab.freedesktop.org/drm/msm/-/pipelines/1106149/ I see two jobs failing, both had a timeout on the serial. msm:apq8016 had: Pass: 26, Fail: 1, ExpectedFail: 2, Skip: 1044, Duration: 17:40, Remaining: 27:48 but it didn't generate the fails.csv due to the timeout. In any case, should it also be updated on xfails? I could not get apq8016 to finish. Once it works in a stable way, I'll update corresponding xfails. Fair enough. We had apq8016 running well before, I wonder what happened. For this patch: Acked-by: Helen Koike Thanks Helen Regards, Helen Thanks Helen --- drivers/gpu/drm/ci/testlist.txt | 1888 ++- 1 file changed, 844 insertions(+), 1044 deletions(-) diff --git a/drivers/gpu/drm/ci/testlist.txt b/drivers/gpu/drm/ci/testlist.txt index eaeb751bb0ad..3377f002f8c5 100644 --- a/drivers/gpu/drm/ci/testlist.txt +++ b/drivers/gpu/drm/ci/testlist.txt @@ -100,7 +100,7 @@ kms_atomic@plane-invalid-params-fence kms_atomic@crtc-invalid-params kms_atomic@crtc-invalid-params-fence kms_atomic@atomic-invalid-params -kms_atomic@atomic_plane_damage +kms_atomic@atomic-plane-damage kms_atomic_interruptible@legacy-setmode kms_atomic_interruptible@atomic-setmode kms_atomic_interruptible@legacy-dpms @@ -321,726 +321,726 @@ kms_bw@linear-tiling-7-displays-3840x2160p kms_bw@linear-tiling-8-displays-1920x1080p kms_bw@linear-tiling-8-displays-2560x1440p kms_bw@linear-tiling-8-displays-3840x2160p -kms_ccs@pipe-A-bad-pixel-format-y_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-yf_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-yf_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-yf_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-random-ccs-data-4_ti
Re: [PATCH] drm/ci: skip suspend tests for both msm-sc7180 machines
On 19/02/2024 11:47, Vignesh Raman wrote:
On 17/02/24 02:26, Dmitry Baryshkov wrote:
The commit ea489a3d983b ("drm/ci: add sc7180-trogdor-kingoftown")
dropped the msm-sc7180-skips.txt file, which disabled suspend-to-RAM
tests. However testing shows that STR tests still can fail. Restore the
skiplist, applying it to both limozeen and kingoftown machines.
Fixes: ea489a3d983b ("drm/ci: add sc7180-trogdor-kingoftown")
Signed-off-by: Dmitry Baryshkov
---
.../gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 2 ++
.../drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt | 2 ++
2 files changed, 4 insertions(+)
create mode 100644
drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt
create mode 100644
drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt
diff --git
a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt
b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt
new file mode 100644
index ..327039f70252
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-skips.txt
@@ -0,0 +1,2 @@
+# Suspend to RAM seems to be broken on this machine
+.*suspend.*
diff --git
a/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt
new file mode 100644
index ..327039f70252
--- /dev/null
+++
b/drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt
@@ -0,0 +1,2 @@
+# Suspend to RAM seems to be broken on this machine
+.*suspend.*
Acked-by: Vignesh Raman
Applied to drm-misc/drm-misc-next
Thanks
Helen
Re: [PATCH 1/3] drm/ci: update IGT test names
On 19/02/2024 11:33, Dmitry Baryshkov wrote: On Mon, 19 Feb 2024 at 15:21, Helen Koike wrote: Hi Dmitry, On 18/02/2024 01:12, Dmitry Baryshkov wrote: Since the addition of testlist.txt the IGT has changed some of test names. Some test names were changed to use '-' instead of '_'. In other cases tests were just renamed. Follow those changes. Signed-off-by: Dmitry Baryshkov Thanks for the patchset Do you have a pipeline link with those patches I can check? https://gitlab.freedesktop.org/drm/msm/-/pipelines/1106149/ I see two jobs failing, both had a timeout on the serial. msm:apq8016 had: Pass: 26, Fail: 1, ExpectedFail: 2, Skip: 1044, Duration: 17:40, Remaining: 27:48 but it didn't generate the fails.csv due to the timeout. In any case, should it also be updated on xfails? Regards, Helen Thanks Helen --- drivers/gpu/drm/ci/testlist.txt | 1888 ++- 1 file changed, 844 insertions(+), 1044 deletions(-) diff --git a/drivers/gpu/drm/ci/testlist.txt b/drivers/gpu/drm/ci/testlist.txt index eaeb751bb0ad..3377f002f8c5 100644 --- a/drivers/gpu/drm/ci/testlist.txt +++ b/drivers/gpu/drm/ci/testlist.txt @@ -100,7 +100,7 @@ kms_atomic@plane-invalid-params-fence kms_atomic@crtc-invalid-params kms_atomic@crtc-invalid-params-fence kms_atomic@atomic-invalid-params -kms_atomic@atomic_plane_damage +kms_atomic@atomic-plane-damage kms_atomic_interruptible@legacy-setmode kms_atomic_interruptible@atomic-setmode kms_atomic_interruptible@legacy-dpms @@ -321,726 +321,726 @@ kms_bw@linear-tiling-7-displays-3840x2160p kms_bw@linear-tiling-8-displays-1920x1080p kms_bw@linear-tiling-8-displays-2560x1440p kms_bw@linear-tiling-8-displays-3840x2160p -kms_ccs@pipe-A-bad-pixel-format-y_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-yf_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-yf_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-yf_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_ccs -kms_ccs@pipe-A-missing-ccs-buffer-yf_tiled_ccs -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_gen12_mc_ccs -kms_ccs@
Re: [PATCH 1/3] drm/ci: update IGT test names
Hi Dmitry, On 18/02/2024 01:12, Dmitry Baryshkov wrote: Since the addition of testlist.txt the IGT has changed some of test names. Some test names were changed to use '-' instead of '_'. In other cases tests were just renamed. Follow those changes. Signed-off-by: Dmitry Baryshkov Thanks for the patchset Do you have a pipeline link with those patches I can check? Thanks Helen --- drivers/gpu/drm/ci/testlist.txt | 1888 ++- 1 file changed, 844 insertions(+), 1044 deletions(-) diff --git a/drivers/gpu/drm/ci/testlist.txt b/drivers/gpu/drm/ci/testlist.txt index eaeb751bb0ad..3377f002f8c5 100644 --- a/drivers/gpu/drm/ci/testlist.txt +++ b/drivers/gpu/drm/ci/testlist.txt @@ -100,7 +100,7 @@ kms_atomic@plane-invalid-params-fence kms_atomic@crtc-invalid-params kms_atomic@crtc-invalid-params-fence kms_atomic@atomic-invalid-params -kms_atomic@atomic_plane_damage +kms_atomic@atomic-plane-damage kms_atomic_interruptible@legacy-setmode kms_atomic_interruptible@atomic-setmode kms_atomic_interruptible@legacy-dpms @@ -321,726 +321,726 @@ kms_bw@linear-tiling-7-displays-3840x2160p kms_bw@linear-tiling-8-displays-1920x1080p kms_bw@linear-tiling-8-displays-2560x1440p kms_bw@linear-tiling-8-displays-3840x2160p -kms_ccs@pipe-A-bad-pixel-format-y_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-yf_tiled_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-pixel-format-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-yf_tiled_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-bad-rotation-90-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-basic-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-yf_tiled_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-crc-primary-rotation-180-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-yf_tiled_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_dg2_rc_ccs_cc -kms_ccs@pipe-A-random-ccs-data-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-random-ccs-data-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_ccs -kms_ccs@pipe-A-missing-ccs-buffer-yf_tiled_ccs -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-missing-ccs-buffer-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-missing-ccs-buffer-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-missing-ccs-buffer-4_tiled_mtl_mc_ccs -kms_ccs@pipe-A-missing-ccs-buffer-4_tiled_mtl_rc_ccs_cc -kms_ccs@pipe-A-ccs-on-another-bo-y_tiled_ccs -kms_ccs@pipe-A-ccs-on-another-bo-yf_tiled_ccs -kms_ccs@pipe-A-ccs-on-another-bo-y_tiled_gen12_rc_ccs -kms_ccs@pipe-A-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc -kms_ccs@pipe-A-ccs-on-another-bo-y_tiled_gen12_mc_ccs -kms_ccs@pipe-A-ccs-on-another-bo-4_tiled_mtl_rc_ccs -kms_ccs@pipe-A-ccs-on-another-bo-4
Re: [PATCH v3 3/9] drm/ci: mediatek: Add job to test panfrost and powervr GPU driver
On 19/02/2024 06:39, Vignesh Raman wrote: Hi Helen, On 09/02/24 23:51, Helen Koike wrote: On 30/01/2024 12:03, Vignesh Raman wrote: For mediatek mt8173, the GPU driver is powervr and for mediatek mt8183, the GPU driver is panfrost. So add support in drm-ci to test panfrost and powervr GPU driver for mediatek SOCs and update xfails. Powervr driver was merged in linux kernel, but there's no mediatek support yet. So disable the mt8173-gpu job which uses powervr driver. Add panfrost specific tests to testlist and skip KMS tests for panfrost driver since it is not a not a KMS driver. Also update the MAINTAINERS file to include xfails for panfrost driver. Signed-off-by: Vignesh Raman Hi Vignesh, thanks for your work. I'm still wondering about a few things, please check below. --- v2: - Add panfrost and PVR GPU jobs for mediatek SOC with new xfails, add xfail entry to MAINTAINERS. Maybe we should review how the xfails failes are named. I think they should start with the DRIVER_NAME instead of GPU_VERSION. For instance, consider the following job: mediatek:mt8183-gpu: extends: - .mt8183 variables: GPU_VERSION: mediatek-mt8183-gpu DRIVER_NAME: panfrost And we have mediatek-mt8183-gpu-skips.txt If there is an error, we want to notify the panfrost driver maintainers (and maybe not the mediatek driver maintainers), so MAINTAINERS file doesn't correspond to this. Agree. How about a naming __ ? powervr_mediatek-mt8173_gpu-skipts.txt mediatek_mediatek-mt8173_display-skipts.txt panfrost_mediatek-mt8183_gpu-skips.txt mediatek_mediatek-mt8183_display-skips.txt ... What do you think? Yes we can keep this naming. In this case do we still need gpu/display in the xfails file name? If you think this split is not required, then I'm fine dropping it. Regards, Helen Regards, Vignesh
Re: [PATCH v2] drm: ci: use clk_ignore_unused for apq8016
On 14/02/2024 10:30, Helen Koike wrote:
On 14/02/2024 05:37, Dmitry Baryshkov wrote:
If the ADV7511 bridge driver is compiled as a module, while DRM_MSM is
built-in, the clk_disable_unused congests with the runtime PM handling
of the DSI PHY for the clk_prepare_lock(). This causes apq8016 runner to
fail without completing any jobs ([1]). Drop the BM_CMDLINE which
duplicate the command line from the .baremetal-igt-arm64 clause and
enforce the clk_ignore_unused kernelarg instead to make apq8016 runner
work.
[1] https://gitlab.freedesktop.org/drm/msm/-/jobs/54990475
Fixes: 0119c894ab0d ("drm: Add initial ci/ subdirectory")
Reviewed-by: Javier Martinez Canillas
Signed-off-by: Dmitry Baryshkov
Acked-by: Helen Koike
Applied to drm-misc-next.
Regards,
Helen
Thanks
Helen
---
Changes in v2:
- Added a comment, describing the issue and a way to reproduce it
(Javier)
---
drivers/gpu/drm/ci/test.yml | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 7ffb620d7398..e64205286a27 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -119,7 +119,10 @@ msm:apq8016:
DRIVER_NAME: msm
BM_DTB:
https://${PIPELINE_ARTIFACTS_BASE}/arm64/apq8016-sbc-usb-host.dtb
GPU_VERSION: apq8016
- BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8
$BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug
nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
+ # disabling unused clocks congests with the MDSS runtime PM
trying to
+ # disable those clocks and causes boot to fail.
+ # Reproducer: DRM_MSM=y, DRM_I2C_ADV7511=m
+ BM_KERNEL_EXTRA_ARGS: clk_ignore_unused
RUNNER_TAG: google-freedreno-db410c
script:
- ./install/bare-metal/fastboot.sh
Re: [PATCH v3 9/9] drm/ci: uprev IGT and update testlist
On 10/02/2024 15:20, Maíra Canal wrote: On 2/10/24 15:17, Maíra Canal wrote: On 1/30/24 12:03, Vignesh Raman wrote: Uprev IGT and add amd, v3d, vc4 and vgem specific tests to testlist. Have testlist.txt per driver and include a base testlist so that the driver specific tests will run only on those hardware. Signed-off-by: Vignesh Raman --- v3: - New patch in series to uprev IGT and update testlist. --- drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/igt_runner.sh | 12 +- drivers/gpu/drm/ci/testlist-amdgpu.txt | 151 ++ drivers/gpu/drm/ci/testlist-msm.txt | 50 ++ drivers/gpu/drm/ci/testlist-panfrost.txt | 17 ++ drivers/gpu/drm/ci/testlist-v3d.txt | 73 + drivers/gpu/drm/ci/testlist-vc4.txt | 49 ++ drivers/gpu/drm/ci/testlist.txt | 100 .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 24 ++- .../drm/ci/xfails/amdgpu-stoney-flakes.txt | 9 +- .../gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 10 +- 11 files changed, 427 insertions(+), 70 deletions(-) create mode 100644 drivers/gpu/drm/ci/testlist-amdgpu.txt create mode 100644 drivers/gpu/drm/ci/testlist-msm.txt create mode 100644 drivers/gpu/drm/ci/testlist-panfrost.txt create mode 100644 drivers/gpu/drm/ci/testlist-v3d.txt create mode 100644 drivers/gpu/drm/ci/testlist-vc4.txt diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index bc8cb3420476..e2b021616a8e 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -5,7 +5,7 @@ variables: UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next - IGT_VERSION: d2af13d9f5be5ce23d996e4afd3e45990f5ab977 + IGT_VERSION: b0cc8160ebdc87ce08b7fd83bb3c99ff7a4d8610 DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git DEQP_RUNNER_GIT_TAG: v0.15.0 diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index f001e015d135..2fd09b9b7cf6 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -64,10 +64,20 @@ if ! grep -q "core_getversion" /install/testlist.txt; then fi set +e +if [ "$DRIVER_NAME" = "amdgpu" ]; then + TEST_LIST="/install/testlist-amdgpu.txt" +elif [ "$DRIVER_NAME" = "msm" ]; then + TEST_LIST="/install/testlist-msm.txt" +elif [ "$DRIVER_NAME" = "panfrost" ]; then + TEST_LIST="/install/testlist-panfrost.txt" +else + TEST_LIST="/install/testlist.txt" +fi + Isn't V3D and VC4 testlists missing? It would be nice if you could provide us a link to a working pipeline. Also, if possible, I would like to be CCed on the next version of this patch, as I have interest in the V3D/VC4 tests. Ah, one thing: it would be nice to add the testlists to the MAINTAINERS file. This way, maintainers can keep track of any changes. Make sense, +1 ^ Regards, Helen Best Regards, - Maíra igt-runner \ run \ --igt-folder /igt/libexec/igt-gpu-tools \ - --caselist /install/testlist.txt \ + --caselist $TEST_LIST \ --output /results \ $IGT_SKIPS \ $IGT_FLAKES \ diff --git a/drivers/gpu/drm/ci/testlist-amdgpu.txt b/drivers/gpu/drm/ci/testlist-amdgpu.txt new file mode 100644 index ..4486f86d340b --- /dev/null +++ b/drivers/gpu/drm/ci/testlist-amdgpu.txt @@ -0,0 +1,151 @@ +testlist.txt +amdgpu/amd_abm@dpms_cycle +amdgpu/amd_abm@backlight_monotonic_basic +amdgpu/amd_abm@backlight_monotonic_abm +amdgpu/amd_abm@abm_enabled +amdgpu/amd_abm@abm_gradual +amdgpu/amd_bo@amdgpu_bo_export_import +amdgpu/amd_bo@amdgpu_bo_metadata +amdgpu/amd_bo@amdgpu_bo_map_unmap +amdgpu/amd_bo@amdgpu_memory_alloc +amdgpu/amd_bo@amdgpu_mem_fail_alloc +amdgpu/amd_bo@amdgpu_bo_find_by_cpu_mapping +amdgpu/amd_cp_dma_misc@GTT_to_VRAM-AMDGPU_HW_IP_GFX0 +amdgpu/amd_cp_dma_misc@GTT_to_VRAM-AMDGPU_HW_IP_COMPUTE0 +amdgpu/amd_cp_dma_misc@VRAM_to_GTT-AMDGPU_HW_IP_GFX0 +amdgpu/amd_cp_dma_misc@VRAM_to_GTT-AMDGPU_HW_IP_COMPUTE0 +amdgpu/amd_cp_dma_misc@VRAM_to_VRAM-AMDGPU_HW_IP_GFX0 +amdgpu/amd_cp_dma_misc@VRAM_to_VRAM-AMDGPU_HW_IP_COMPUTE0 +amdgpu/amd_dispatch@amdgpu-dispatch-test-compute-with-IP-COMPUTE +amdgpu/amd_dispatch@amdgpu-dispatch-test-gfx-with-IP-GFX +amdgpu/amd_dispatch@amdgpu-dispatch-hang-test-gfx-with-IP-GFX +amdgpu/amd_dispatch@amdgpu-dispatch-hang-test-compute-with-IP-COMPUTE +amdgpu/amd_dispatch@amdgpu-reset-test-gfx-with-IP-GFX-and-COMPUTE +amdgpu/amd_hotplug@basic +amdgpu/amd_hotplug@basic-suspend +amdgpu/amd_jpeg_dec@amdgpu_cs_jpeg_decode +amdgpu/amd_max_bpc@4k-mode-max-bpc +amdgpu/amd_module_load@reload +amdgpu/amd_plane@test-mpo-4k +amdgpu/amd_plane@mpo-swizzle-toggle +amdgpu/amd_plane@mpo-swizzle-toggle-multihead +amdgpu/amd_plane@mpo-pan-rgb +amdgpu/amd_plane@mpo-pan-rgb-multihead +amdgpu/amd_plane@mpo-pan-nv12 +amdgpu/amd_plane@mpo-pan-nv12-multihead +amdgpu/amd_plane@mpo-pan-p010 +amdgpu/amd_plane@mpo-pan-
Re: [PATCH v2] drm: ci: use clk_ignore_unused for apq8016
On 14/02/2024 05:37, Dmitry Baryshkov wrote:
If the ADV7511 bridge driver is compiled as a module, while DRM_MSM is
built-in, the clk_disable_unused congests with the runtime PM handling
of the DSI PHY for the clk_prepare_lock(). This causes apq8016 runner to
fail without completing any jobs ([1]). Drop the BM_CMDLINE which
duplicate the command line from the .baremetal-igt-arm64 clause and
enforce the clk_ignore_unused kernelarg instead to make apq8016 runner
work.
[1] https://gitlab.freedesktop.org/drm/msm/-/jobs/54990475
Fixes: 0119c894ab0d ("drm: Add initial ci/ subdirectory")
Reviewed-by: Javier Martinez Canillas
Signed-off-by: Dmitry Baryshkov
Acked-by: Helen Koike
Thanks
Helen
---
Changes in v2:
- Added a comment, describing the issue and a way to reproduce it
(Javier)
---
drivers/gpu/drm/ci/test.yml | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 7ffb620d7398..e64205286a27 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -119,7 +119,10 @@ msm:apq8016:
DRIVER_NAME: msm
BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/apq8016-sbc-usb-host.dtb
GPU_VERSION: apq8016
-BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS
root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
+# disabling unused clocks congests with the MDSS runtime PM trying to
+# disable those clocks and causes boot to fail.
+# Reproducer: DRM_MSM=y, DRM_I2C_ADV7511=m
+BM_KERNEL_EXTRA_ARGS: clk_ignore_unused
RUNNER_TAG: google-freedreno-db410c
script:
- ./install/bare-metal/fastboot.sh
Re: [PATCH v3 1/9] drm/ci: arm64.config: Enable CONFIG_DRM_ANALOGIX_ANX7625
On 30/01/2024 12:03, Vignesh Raman wrote: Enable CONFIG_DRM_ANALOGIX_ANX7625 in the arm64 defconfig to get display driver probed on the mt8183-kukui-jacuzzi-juniper machine. arch/arm64/configs/defconfig has CONFIG_DRM_ANALOGIX_ANX7625=m, but drm-ci don't have initrd with modules, so add CONFIG_DRM_ANALOGIX_ANX7625=y in CI arm64 config. Couldn't you load the module as it is done on https://cgit.freedesktop.org/drm/drm-misc/tree/drivers/gpu/drm/ci/igt_runner.sh#n35 ? This is not a blocker, in any case Acked-by: Helen Koike Thanks Helen Signed-off-by: Vignesh Raman --- v2: - No changes v3: - No changes --- drivers/gpu/drm/ci/arm64.config | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/ci/arm64.config b/drivers/gpu/drm/ci/arm64.config index 8dbce9919a57..37d23fd7a367 100644 --- a/drivers/gpu/drm/ci/arm64.config +++ b/drivers/gpu/drm/ci/arm64.config @@ -187,6 +187,7 @@ CONFIG_MTK_DEVAPC=y CONFIG_PWM_MTK_DISP=y CONFIG_MTK_CMDQ=y CONFIG_REGULATOR_DA9211=y +CONFIG_DRM_ANALOGIX_ANX7625=y # For nouveau. Note that DRM must be a module so that it's loaded after NFS is up to provide the firmware. CONFIG_ARCH_TEGRA=y
Re: [PATCH v3 3/9] drm/ci: mediatek: Add job to test panfrost and powervr GPU driver
On 30/01/2024 12:03, Vignesh Raman wrote: For mediatek mt8173, the GPU driver is powervr and for mediatek mt8183, the GPU driver is panfrost. So add support in drm-ci to test panfrost and powervr GPU driver for mediatek SOCs and update xfails. Powervr driver was merged in linux kernel, but there's no mediatek support yet. So disable the mt8173-gpu job which uses powervr driver. Add panfrost specific tests to testlist and skip KMS tests for panfrost driver since it is not a not a KMS driver. Also update the MAINTAINERS file to include xfails for panfrost driver. Signed-off-by: Vignesh Raman Hi Vignesh, thanks for your work. I'm still wondering about a few things, please check below. --- v2: - Add panfrost and PVR GPU jobs for mediatek SOC with new xfails, add xfail entry to MAINTAINERS. Maybe we should review how the xfails failes are named. I think they should start with the DRIVER_NAME instead of GPU_VERSION. For instance, consider the following job: mediatek:mt8183-gpu: extends: - .mt8183 variables: GPU_VERSION: mediatek-mt8183-gpu DRIVER_NAME: panfrost And we have mediatek-mt8183-gpu-skips.txt If there is an error, we want to notify the panfrost driver maintainers (and maybe not the mediatek driver maintainers), so MAINTAINERS file doesn't correspond to this. How about a naming __ ? powervr_mediatek-mt8173_gpu-skipts.txt mediatek_mediatek-mt8173_display-skipts.txt panfrost_mediatek-mt8183_gpu-skips.txt mediatek_mediatek-mt8183_display-skips.txt ... What do you think? Thanks Helen v3: - Add panfrost specific tests to testlist and skip KMS tests for panfrost driver since it is not a not a KMS driver and update xfails. Update the MAINTAINERS file to include xfails for panfrost driver. Add the job name in GPU_VERSION and use it for xfail file names instead of using DRIVER_NAME. --- MAINTAINERS| 1 + drivers/gpu/drm/ci/test.yml| 18 ++ drivers/gpu/drm/ci/testlist.txt| 16 .../ci/xfails/mediatek-mt8183-gpu-skips.txt| 2 ++ 4 files changed, 37 insertions(+) create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-gpu-skips.txt diff --git a/MAINTAINERS b/MAINTAINERS index 9d959a6881f7..bcdc17d1aa26 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1645,6 +1645,7 @@ L:dri-devel@lists.freedesktop.org S:Supported T:git git://anongit.freedesktop.org/drm/drm-misc F:Documentation/gpu/panfrost.rst +F: drivers/gpu/drm/ci/xfails/panfrost* F:drivers/gpu/drm/panfrost/ F:include/uapi/drm/panfrost_drm.h diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 0cd44e6ea18b..e153c5a7ad80 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -299,6 +299,17 @@ amdgpu:stoney: DEVICE_TYPE: mt8183-kukui-jacuzzi-juniper-sku16 RUNNER_TAG: mesa-ci-x86-64-lava-mt8183-kukui-jacuzzi-juniper-sku16 +mediatek:mt8173-gpu: + extends: +- .mt8173 + variables: +GPU_VERSION: mediatek-mt8173-gpu +DRIVER_NAME: powervr + rules: +# TODO: powervr driver was merged in linux kernel, but there's no mediatek support yet +# Remove the rule once mediatek support is added for powervr +- when: never + mediatek:mt8173-display: extends: - .mt8173 @@ -306,6 +317,13 @@ mediatek:mt8173-display: GPU_VERSION: mediatek-mt8173-display DRIVER_NAME: mediatek +mediatek:mt8183-gpu: + extends: +- .mt8183 + variables: +GPU_VERSION: mediatek-mt8183-gpu +DRIVER_NAME: panfrost + mediatek:mt8183-display: extends: - .mt8183 diff --git a/drivers/gpu/drm/ci/testlist.txt b/drivers/gpu/drm/ci/testlist.txt index eaeb751bb0ad..772fc025b1f8 100644 --- a/drivers/gpu/drm/ci/testlist.txt +++ b/drivers/gpu/drm/ci/testlist.txt @@ -2959,3 +2959,19 @@ msm_submit@invalid-duplicate-bo-submit msm_submit@invalid-cmd-idx-submit msm_submit@invalid-cmd-type-submit msm_submit@valid-submit +panfrost_get_param@base-params +panfrost_get_param@get-bad-param +panfrost_get_param@get-bad-padding +panfrost_gem_new@gem-new-4096 +panfrost_gem_new@gem-new-0 +panfrost_gem_new@gem-new-zeroed +panfrost_prime@gem-prime-import +panfrost_submit@pan-submit +panfrost_submit@pan-submit-error-no-jc +panfrost_submit@pan-submit-error-bad-in-syncs +panfrost_submit@pan-submit-error-bad-bo-handles +panfrost_submit@pan-submit-error-bad-requirements +panfrost_submit@pan-submit-error-bad-out-sync +panfrost_submit@pan-reset +panfrost_submit@pan-submit-and-close +panfrost_submit@pan-unhandled-pagefault diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8183-gpu-skips.txt b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-gpu-skips.txt new file mode 100644 index ..2ea09d1648bc --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8183-gpu-skips.txt @@ -0,0 +1,2 @@ +# Panfrost is not a KMS driver, so skip the KMS tests +kms_.*
Re: [PATCH v4] drm/ci: add tests on vkms
On 01/02/2024 03:53, Vignesh Raman wrote:
Add job that runs igt on top of vkms.
Signed-off-by: Vignesh Raman
Acked-by: Jessica Zhang
Tested-by: Jessica Zhang
Acked-by: Maxime Ripard
Signed-off-by: Helen Koike
---
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/20240130150340.687871-1-vignesh.ra...@collabora.com/
Do you have a link of a pipeline with this job passing?
Thanks
Helen
---
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
diff --git a/MAINTAINERS b/MAINTAINERS
index bcdc17d1aa26..09310a6f4b5f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6923,6 +6923,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 331a61e0d25a..2e089e03f061 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -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
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index e2b021616a8e..c69fb6af4cf8 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -107,7 +107,7 @@ stages:
- meson
- msm
- rockchip
- - virtio-gpu
+ - 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 2fd09b9b7cf6..3c7f000805e5 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 8ab8a8f56d6a..58c3cf4b18e0 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -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
diff --git a/drivers/gpu
Re: [PATCH v1] drm/ci: add sc7180-trogdor-kingoftown
On 04/01/2024 05:14, Vignesh Raman wrote:
Add job that executes the IGT test suite for sc7180-trogdor-kingoftown.
This commit also updates xfails for sc7180-trogdor-lazor-limozeen.
Signed-off-by: Vignesh Raman
Applied to drm-misc-next.
Thanks
Helen
---
See pipeline:
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1069934
---
drivers/gpu/drm/ci/build.sh | 1 +
drivers/gpu/drm/ci/test.yml | 25
.../gpu/drm/ci/xfails/msm-sc7180-fails.txt| 30 ---
.../gpu/drm/ci/xfails/msm-sc7180-flakes.txt | 17 ---
.../gpu/drm/ci/xfails/msm-sc7180-skips.txt| 7 -
.../msm-sc7180-trogdor-kingoftown-fails.txt | 17 +++
...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 17 +++
7 files changed, 55 insertions(+), 59 deletions(-)
delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
create mode 100644
drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt
create mode 100644
drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 97ff43759b91..331a61e0d25a 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -26,6 +26,7 @@ if [[ "$KERNEL_ARCH" = "arm64" ]]; then
DEVICE_TREES+="
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb"
DEVICE_TREES+="
arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dtb"
DEVICE_TREES+="
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
+DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtb"
elif [[ "$KERNEL_ARCH" = "arm" ]]; then
GCC_ARCH="arm-linux-gnueabihf"
DEBIAN_ARCH="armhf"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index a079f3632a95..0c7920c0254d 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -82,20 +82,35 @@
tags:
- $RUNNER_TAG
-msm:sc7180:
+.msm-sc7180:
extends:
- .lava-igt:arm64
stage: msm
- parallel: 4
variables:
DRIVER_NAME: msm
-DEVICE_TYPE: sc7180-trogdor-lazor-limozeen
-DTB: sc7180-trogdor-lazor-limozeen-nots-r5
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
-GPU_VERSION: sc7180
+
+msm:sc7180-trogdor-lazor-limozeen:
+ extends:
+- .msm-sc7180
+ parallel: 4
+ variables:
+DEVICE_TYPE: sc7180-trogdor-lazor-limozeen
+DTB: sc7180-trogdor-lazor-limozeen-nots-r5
+GPU_VERSION: ${DEVICE_TYPE}
RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
+msm:sc7180-trogdor-kingoftown:
+ extends:
+- .msm-sc7180
+ parallel: 6
+ variables:
+DEVICE_TYPE: sc7180-trogdor-kingoftown
+DTB: sc7180-trogdor-kingoftown
+GPU_VERSION: ${DEVICE_TYPE}
+RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown
+
msm:apq8016:
extends:
- .baremetal-igt-arm64
diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
b/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
deleted file mode 100644
index f71166a57731..
--- a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-kms_color@ctm-0-25,Fail
-kms_color@ctm-0-50,Fail
-kms_color@ctm-0-75,Fail
-kms_color@ctm-blue-to-red,Fail
-kms_color@ctm-green-to-red,Fail
-kms_color@ctm-negative,Fail
-kms_color@ctm-red-to-blue,Fail
-kms_color@ctm-signed,Fail
-kms_cursor_legacy@cursor-vs-flip-toggle,Fail
-kms_cursor_legacy@cursor-vs-flip-varying-size,Fail
-kms_cursor_legacy@cursorA-vs-flipA-atomic-transitions,Crash
-kms_flip@flip-vs-modeset-vs-hang,Fail
-kms_flip@flip-vs-panning-vs-hang,Fail
-kms_pipe_crc_basic@compare-crc-sanitycheck-nv12,Fail
-kms_plane_alpha_blend@alpha-7efc,Fail
-kms_plane_alpha_blend@coverage-7efc,Fail
-kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail
-kms_plane_alpha_blend@pipe-A-alpha-7efc,Fail
-kms_plane_alpha_blend@pipe-A-coverage-7efc,Fail
-kms_plane_alpha_blend@pipe-A-coverage-vs-premult-vs-constant,Fail
-kms_plane_alpha_blend@pipe-B-alpha-7efc,Fail
-kms_plane_alpha_blend@pipe-B-alpha-basic,Fail
-kms_plane_alpha_blend@pipe-B-alpha-opaque-fb,Fail
-kms_plane_alpha_blend@pipe-B-constant-alpha-max,Fail
-kms_plane_alpha_blend@pipe-B-constant-alpha-mid,Fail
-kms_plane_alpha_blend@pipe-B-coverage-7efc,Fail
-kms_plane_alpha_blend@pipe-B-coverage-vs-premult-vs-constant,Fail
-kms_rmfb@close-fd,Fail
-kms_universal_plane@disable-primary-vs-flip-pipe-b,Fail
-kms_universal_plane@universal-plane-pipe-B-sanity,Fail
diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
b/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
deleted file mode 100644
index 04730044ed12..
--- a/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-kms_color@ctm-0-25
-kms_color@ctm-0-50
-kms_color@ctm-0-75
Re: [PATCH v2] drm/ci: uprev mesa version: fix kdl commit fetch
On 22/12/2023 00:34, Vignesh Raman wrote:
build-kdl.sh was doing a `clone --depth 1` of the default branch,
then checking out a commit that might not be the latest of that
branch, resulting in container build error.
https://gitlab.freedesktop.org/mesa/mesa/-/commit/5efa4d56 fixes
kdl commit fetch issue. Uprev mesa in drm-ci to fix this.
This commit updates the kernel tag and adds .never-post-merge-rules
due to the mesa uprev. It also fixes an issue where the virtio-gpu
pipeline was not getting created with the mesa uprev.
Reviewed-by: David Heidelberg
Acked-by: Helen Koike
Reviewed-by: Dmitry Baryshkov
Tested-by: Abhinav Kumar
Signed-off-by: Vignesh Raman
Applied to drm-misc-next.
Thanks
Helen
---
v2:
- Fix an issue where the virtio-gpu pipeline was not getting created with
the mesa uprev
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1062221
---
drivers/gpu/drm/ci/gitlab-ci.yml | 14 --
drivers/gpu/drm/ci/test.yml | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index dac92cc2777c..084e3ff8e3f4 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
edfbf74df1d4d6ce54ffe24566108be0e1a98c3d
+ DRM_CI_COMMIT_SHA: &drm-ci-commit-sha
9d162de9a05155e1c4041857a5848842749164cf
UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm
TARGET_BRANCH: drm-next
@@ -25,7 +25,9 @@ variables:
# 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
+ KERNEL_REPO: "gfx-ci/linux"
+ KERNEL_TAG: "v6.6.4-for-mesa-ci-e4f4c500f7fb"
+ KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG}
LAVA_TAGS: subset-1-gfx
LAVA_JOB_PRIORITY: 30
@@ -133,6 +135,11 @@ stages:
- if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" &&
$CI_PIPELINE_SOURCE == "merge_request_event"'
when: on_success
+.never-post-merge-rules:
+ rules:
+- if: *is-post-merge
+ when: never
+
# Rule to filter for only scheduled pipelines.
.scheduled_pipeline-rules:
rules:
@@ -150,6 +157,7 @@ stages:
.build-rules:
rules:
- !reference [.no_scheduled_pipelines-rules, rules]
+- !reference [.never-post-merge-rules, rules]
# Run automatically once all dependency jobs have passed
- when: on_success
@@ -157,6 +165,7 @@ stages:
.container+build-rules:
rules:
- !reference [.no_scheduled_pipelines-rules, rules]
+- !reference [.never-post-merge-rules, rules]
- when: manual
.ci-deqp-artifacts:
@@ -175,6 +184,7 @@ stages:
.container-rules:
rules:
- !reference [.no_scheduled_pipelines-rules, rules]
+- !reference [.never-post-merge-rules, rules]
# Run pipeline by default in the main project if any CI pipeline
# configuration files were changed, to ensure docker images are up to date
- if: *is-post-merge
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 2c9a1838e728..1705f268547a 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -324,6 +324,7 @@ virtio_gpu:none:
GPU_VERSION: none
extends:
- .test-gl
+- .test-rules
tags:
- kvm
script:
Re: [PATCH v1] drm/ci: Update xfails for newly added msm tests
On 15/01/2024 07:17, Vignesh Raman wrote: msm tests are added to testlist.txt, so update the xfails for jobs in msm stage. Signed-off-by: Vignesh Raman Applied to drm-misc-next. Thanks Helen --- Depends on https://patchwork.kernel.org/project/linux-arm-msm/patch/20240108195016.156583-1-robdcl...@gmail.com/ --- .../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 3 +- .../gpu/drm/ci/xfails/msm-sdm845-fails.txt| 5 +--- .../gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 28 +-- .../gpu/drm/ci/xfails/msm-sdm845-skips.txt| 7 - 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt index d39d254c935e..44a5c62dedad 100644 --- a/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt @@ -6,8 +6,6 @@ kms_cursor_legacy@all-pipes-single-bo,Fail kms_cursor_legacy@all-pipes-single-move,Fail kms_cursor_legacy@all-pipes-torture-bo,Fail kms_cursor_legacy@all-pipes-torture-move,Fail -kms_cursor_legacy@forked-bo,Fail -kms_cursor_legacy@forked-move,Fail kms_cursor_legacy@pipe-A-forked-bo,Fail kms_cursor_legacy@pipe-A-forked-move,Fail kms_cursor_legacy@pipe-A-single-bo,Fail @@ -18,3 +16,4 @@ kms_force_connector_basic@force-edid,Fail kms_hdmi_inject@inject-4k,Fail kms_selftest@drm_format,Timeout kms_selftest@drm_format_helper,Timeout +msm_mapping@ring,Fail diff --git a/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt index c55baa2d18c1..e9043a00383e 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt @@ -15,7 +15,7 @@ kms_color@pipe-A-ctm-max,Fail kms_color@pipe-A-ctm-negative,Fail kms_color@pipe-A-ctm-red-to-blue,Fail kms_color@pipe-A-legacy-gamma,Fail -kms_cursor_legacy@basic-flip-after-cursor-legacy,Fail +kms_cursor_legacy@basic-flip-after-cursor-atomic,Fail kms_cursor_legacy@basic-flip-after-cursor-varying-size,Fail kms_cursor_legacy@basic-flip-before-cursor-atomic,Fail kms_cursor_legacy@basic-flip-before-cursor-legacy,Fail @@ -29,9 +29,6 @@ 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_cursor_legacy@short-flip-after-cursor-atomic-transitions,Fail -kms_cursor_legacy@short-flip-after-cursor-atomic-transitions-varying-size,Fail -kms_cursor_legacy@short-flip-after-cursor-toggle,Fail kms_flip@flip-vs-modeset-vs-hang,Fail kms_flip@flip-vs-panning-vs-hang,Fail kms_pipe_crc_basic@compare-crc-sanitycheck-nv12,Fail diff --git a/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt b/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt index 16d205c04cbb..8a492f01eaa4 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt @@ -1,12 +1,22 @@ -kms_cursor_legacy@basic-flip-after-cursor-atomic -kms_cursor_legacy@basic-flip-before-cursor-varying-size -kms_cursor_legacy@cursorA-vs-flipA-toggle -kms_cursor_legacy@flip-vs-cursor-atomic-transitions +# Board Name: msm:sdm845 +# Bug Report: https://lore.kernel.org/dri-devel/46287831-edfa-78e8-6055-d7a08831c...@collabora.com/T/#u +# Failure Rate: 50 +# IGT Version: 1.28-gd2af13d9f +# Linux Version: 6.7.0-rc3 + +# Reported by deqp-runner +kms_cursor_legacy@basic-flip-after-cursor-legacy kms_cursor_legacy@flip-vs-cursor-toggle kms_cursor_legacy@flip-vs-cursor-varying-size +kms_cursor_legacy@short-flip-after-cursor-toggle kms_cursor_legacy@short-flip-before-cursor-atomic-transitions -kms_cursor_legacy@short-flip-before-cursor-toggle -kms_flip@flip-vs-modeset-vs-hang -kms_flip@flip-vs-panning-vs-hang -kms_plane@pixel-format -kms_plane@pixel-format-source-clamping +kms_cursor_legacy@short-flip-before-cursor-atomic-transitions-varying-size +msm_shrink@copy-gpu-32 +msm_shrink@copy-gpu-oom-32 + +# The below test shows inconsistency across multiple runs, giving +# results of Pass and Fail alternately. +kms_cursor_legacy@basic-flip-before-cursor-varying-size +kms_cursor_legacy@flip-vs-cursor-atomic-transitions +kms_cursor_legacy@short-flip-after-cursor-atomic-transitions +kms_cursor_legacy@short-flip-after-cursor-atomic-transitions-varying-size diff --git a/drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt index 42675f1c6d76..618e3a3a7277 100644 --- a/drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt +++ b/drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt @@ -1,2 +1,7 @@ # Hangs machine -kms_bw.* \ No newline at end of file +kms_bw.* + +# Failing due to a bootloader/fw issue. The workaround in mesa CI involves these two patches +# https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/4b49f902ec6f2bb382cbbf489870573f4b43371e +# https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/38cdf4c5559771e2474ae0fecef8469f6514
Re: [PATCH] drm/ci: Add msm tests
On 08/01/2024 16:50, Rob Clark wrote: From: Rob Clark The msm tests should skip on non-msm hw, so I think it should be safe to enable everywhere. Signed-off-by: Rob Clark Applied to drm-misc-next. Thanks Helen --- drivers/gpu/drm/ci/testlist.txt | 49 + 1 file changed, 49 insertions(+) diff --git a/drivers/gpu/drm/ci/testlist.txt b/drivers/gpu/drm/ci/testlist.txt index f82cd90372f4..eaeb751bb0ad 100644 --- a/drivers/gpu/drm/ci/testlist.txt +++ b/drivers/gpu/drm/ci/testlist.txt @@ -2910,3 +2910,52 @@ kms_writeback@writeback-invalid-parameters kms_writeback@writeback-fb-id kms_writeback@writeback-check-output prime_mmap_kms@buffer-sharing +msm_shrink@copy-gpu-sanitycheck-8 +msm_shrink@copy-gpu-sanitycheck-32 +msm_shrink@copy-gpu-8 +msm_shrink@copy-gpu-32 +msm_shrink@copy-gpu-madvise-8 +msm_shrink@copy-gpu-madvise-32 +msm_shrink@copy-gpu-oom-8 +msm_shrink@copy-gpu-oom-32 +msm_shrink@copy-mmap-sanitycheck-8 +msm_shrink@copy-mmap-sanitycheck-32 +msm_shrink@copy-mmap-8 +msm_shrink@copy-mmap-32 +msm_shrink@copy-mmap-madvise-8 +msm_shrink@copy-mmap-madvise-32 +msm_shrink@copy-mmap-oom-8 +msm_shrink@copy-mmap-oom-32 +msm_shrink@copy-mmap-dmabuf-sanitycheck-8 +msm_shrink@copy-mmap-dmabuf-sanitycheck-32 +msm_shrink@copy-mmap-dmabuf-8 +msm_shrink@copy-mmap-dmabuf-32 +msm_shrink@copy-mmap-dmabuf-madvise-8 +msm_shrink@copy-mmap-dmabuf-madvise-32 +msm_shrink@copy-mmap-dmabuf-oom-8 +msm_shrink@copy-mmap-dmabuf-oom-32 +msm_mapping@ring +msm_mapping@sqefw +msm_mapping@shadow +msm_submitoverhead@submitbench-10-bos +msm_submitoverhead@submitbench-10-bos-no-implicit-sync +msm_submitoverhead@submitbench-100-bos +msm_submitoverhead@submitbench-100-bos-no-implicit-sync +msm_submitoverhead@submitbench-250-bos +msm_submitoverhead@submitbench-250-bos-no-implicit-sync +msm_submitoverhead@submitbench-500-bos +msm_submitoverhead@submitbench-500-bos-no-implicit-sync +msm_submitoverhead@submitbench-1000-bos +msm_submitoverhead@submitbench-1000-bos-no-implicit-sync +msm_recovery@hangcheck +msm_recovery@gpu-fault +msm_recovery@gpu-fault-parallel +msm_recovery@iova-fault +msm_submit@empty-submit +msm_submit@invalid-queue-submit +msm_submit@invalid-flags-submit +msm_submit@invalid-in-fence-submit +msm_submit@invalid-duplicate-bo-submit +msm_submit@invalid-cmd-idx-submit +msm_submit@invalid-cmd-type-submit +msm_submit@valid-submit
Re: [PATCH] drm/ci: Add msm tests
On 15/01/2024 07:22, Vignesh Raman wrote: Hi Rob, On 12/01/24 22:44, Rob Clark wrote: On Fri, Jan 12, 2024 at 7:57 AM Rob Clark wrote: On Fri, Jan 12, 2024 at 3:42 AM Vignesh Raman wrote: Hi Rob, On 09/01/24 01:20, Rob Clark wrote: From: Rob Clark The msm tests should skip on non-msm hw, so I think it should be safe to enable everywhere. Signed-off-by: Rob Clark Acked-by: Helen Koike --- drivers/gpu/drm/ci/testlist.txt | 49 + 1 file changed, 49 insertions(+) diff --git a/drivers/gpu/drm/ci/testlist.txt b/drivers/gpu/drm/ci/testlist.txt index f82cd90372f4..eaeb751bb0ad 100644 --- a/drivers/gpu/drm/ci/testlist.txt +++ b/drivers/gpu/drm/ci/testlist.txt @@ -2910,3 +2910,52 @@ kms_writeback@writeback-invalid-parameters kms_writeback@writeback-fb-id kms_writeback@writeback-check-output prime_mmap_kms@buffer-sharing +msm_shrink@copy-gpu-sanitycheck-8 +msm_shrink@copy-gpu-sanitycheck-32 +msm_shrink@copy-gpu-8 +msm_shrink@copy-gpu-32 +msm_shrink@copy-gpu-madvise-8 +msm_shrink@copy-gpu-madvise-32 +msm_shrink@copy-gpu-oom-8 +msm_shrink@copy-gpu-oom-32 +msm_shrink@copy-mmap-sanitycheck-8 +msm_shrink@copy-mmap-sanitycheck-32 +msm_shrink@copy-mmap-8 +msm_shrink@copy-mmap-32 +msm_shrink@copy-mmap-madvise-8 +msm_shrink@copy-mmap-madvise-32 +msm_shrink@copy-mmap-oom-8 +msm_shrink@copy-mmap-oom-32 +msm_shrink@copy-mmap-dmabuf-sanitycheck-8 +msm_shrink@copy-mmap-dmabuf-sanitycheck-32 +msm_shrink@copy-mmap-dmabuf-8 +msm_shrink@copy-mmap-dmabuf-32 +msm_shrink@copy-mmap-dmabuf-madvise-8 +msm_shrink@copy-mmap-dmabuf-madvise-32 +msm_shrink@copy-mmap-dmabuf-oom-8 +msm_shrink@copy-mmap-dmabuf-oom-32 +msm_mapping@ring +msm_mapping@sqefw +msm_mapping@shadow +msm_submitoverhead@submitbench-10-bos +msm_submitoverhead@submitbench-10-bos-no-implicit-sync +msm_submitoverhead@submitbench-100-bos +msm_submitoverhead@submitbench-100-bos-no-implicit-sync +msm_submitoverhead@submitbench-250-bos +msm_submitoverhead@submitbench-250-bos-no-implicit-sync +msm_submitoverhead@submitbench-500-bos +msm_submitoverhead@submitbench-500-bos-no-implicit-sync +msm_submitoverhead@submitbench-1000-bos +msm_submitoverhead@submitbench-1000-bos-no-implicit-sync +msm_recovery@hangcheck +msm_recovery@gpu-fault +msm_recovery@gpu-fault-parallel +msm_recovery@iova-fault +msm_submit@empty-submit +msm_submit@invalid-queue-submit +msm_submit@invalid-flags-submit +msm_submit@invalid-in-fence-submit +msm_submit@invalid-duplicate-bo-submit +msm_submit@invalid-cmd-idx-submit +msm_submit@invalid-cmd-type-submit +msm_submit@valid-submit I tested this patch with latest drm-misc/drm-misc-next and there was some failures seen for the newly added msm tests. I have updated the xfails with below commit, https://gitlab.freedesktop.org/vigneshraman/linux/-/commit/d012893597a661d6ebbb755bf2607dfb055524a1 I will notify the maintainers about the flaky tests, update the url in the flakes.txt, and submit a separate patch for this change. Oh, you should probably move msm_mapping@* to skips on sdm845. I had a closer look at those, and they are failing due to a bootloader/fw issue. We work around this in mesa CI with these two patches: https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/4b49f902ec6f2bb382cbbf489870573f4b43371e https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/38cdf4c5559771e2474ae0fecef8469f65147bc1 But given that sdm845 is similar to sc7180 as far as kernel gpu driver, it is probably just better to skip these on sdm845 (with a comment referring to the hack patches we use in mesa CI) I have sent a patch with these changes, Thanks! Helen https://lore.kernel.org/dri-devel/20240115101750.27077-1-vignesh.ra...@collabora.com/T/#u Thanks. Regards, Vignesh
Re: [PATCH v1] drm/ci: Update xfails for newly added msm tests
patch to solve this? +msm_mapping@* In any case: Acked-by: Helen Koike Thanks Helen
Re: [PATCH v1] drm/ci: add sc7180-trogdor-kingoftown
On 04/01/2024 05:14, Vignesh Raman wrote:
Add job that executes the IGT test suite for sc7180-trogdor-kingoftown.
This commit also updates xfails for sc7180-trogdor-lazor-limozeen.
Signed-off-by: Vignesh Raman
lgtm
Acked-by: Helen Koike
Thanks
Helen
---
See pipeline:
https://gitlab.freedesktop.org/vigneshraman/linux/-/pipelines/1069934
---
drivers/gpu/drm/ci/build.sh | 1 +
drivers/gpu/drm/ci/test.yml | 25
.../gpu/drm/ci/xfails/msm-sc7180-fails.txt| 30 ---
.../gpu/drm/ci/xfails/msm-sc7180-flakes.txt | 17 ---
.../gpu/drm/ci/xfails/msm-sc7180-skips.txt| 7 -
.../msm-sc7180-trogdor-kingoftown-fails.txt | 17 +++
...sm-sc7180-trogdor-lazor-limozeen-fails.txt | 17 +++
7 files changed, 55 insertions(+), 59 deletions(-)
delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-skips.txt
create mode 100644
drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-fails.txt
create mode 100644
drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 97ff43759b91..331a61e0d25a 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -26,6 +26,7 @@ if [[ "$KERNEL_ARCH" = "arm64" ]]; then
DEVICE_TREES+="
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb"
DEVICE_TREES+="
arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dtb"
DEVICE_TREES+="
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb"
+DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown.dtb"
elif [[ "$KERNEL_ARCH" = "arm" ]]; then
GCC_ARCH="arm-linux-gnueabihf"
DEBIAN_ARCH="armhf"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index a079f3632a95..0c7920c0254d 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -82,20 +82,35 @@
tags:
- $RUNNER_TAG
-msm:sc7180:
+.msm-sc7180:
extends:
- .lava-igt:arm64
stage: msm
- parallel: 4
variables:
DRIVER_NAME: msm
-DEVICE_TYPE: sc7180-trogdor-lazor-limozeen
-DTB: sc7180-trogdor-lazor-limozeen-nots-r5
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
-GPU_VERSION: sc7180
+
+msm:sc7180-trogdor-lazor-limozeen:
+ extends:
+- .msm-sc7180
+ parallel: 4
+ variables:
+DEVICE_TYPE: sc7180-trogdor-lazor-limozeen
+DTB: sc7180-trogdor-lazor-limozeen-nots-r5
+GPU_VERSION: ${DEVICE_TYPE}
RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
+msm:sc7180-trogdor-kingoftown:
+ extends:
+- .msm-sc7180
+ parallel: 6
+ variables:
+DEVICE_TYPE: sc7180-trogdor-kingoftown
+DTB: sc7180-trogdor-kingoftown
+GPU_VERSION: ${DEVICE_TYPE}
+RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown
+
msm:apq8016:
extends:
- .baremetal-igt-arm64
diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
b/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
deleted file mode 100644
index f71166a57731..
--- a/drivers/gpu/drm/ci/xfails/msm-sc7180-fails.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-kms_color@ctm-0-25,Fail
-kms_color@ctm-0-50,Fail
-kms_color@ctm-0-75,Fail
-kms_color@ctm-blue-to-red,Fail
-kms_color@ctm-green-to-red,Fail
-kms_color@ctm-negative,Fail
-kms_color@ctm-red-to-blue,Fail
-kms_color@ctm-signed,Fail
-kms_cursor_legacy@cursor-vs-flip-toggle,Fail
-kms_cursor_legacy@cursor-vs-flip-varying-size,Fail
-kms_cursor_legacy@cursorA-vs-flipA-atomic-transitions,Crash
-kms_flip@flip-vs-modeset-vs-hang,Fail
-kms_flip@flip-vs-panning-vs-hang,Fail
-kms_pipe_crc_basic@compare-crc-sanitycheck-nv12,Fail
-kms_plane_alpha_blend@alpha-7efc,Fail
-kms_plane_alpha_blend@coverage-7efc,Fail
-kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail
-kms_plane_alpha_blend@pipe-A-alpha-7efc,Fail
-kms_plane_alpha_blend@pipe-A-coverage-7efc,Fail
-kms_plane_alpha_blend@pipe-A-coverage-vs-premult-vs-constant,Fail
-kms_plane_alpha_blend@pipe-B-alpha-7efc,Fail
-kms_plane_alpha_blend@pipe-B-alpha-basic,Fail
-kms_plane_alpha_blend@pipe-B-alpha-opaque-fb,Fail
-kms_plane_alpha_blend@pipe-B-constant-alpha-max,Fail
-kms_plane_alpha_blend@pipe-B-constant-alpha-mid,Fail
-kms_plane_alpha_blend@pipe-B-coverage-7efc,Fail
-kms_plane_alpha_blend@pipe-B-coverage-vs-premult-vs-constant,Fail
-kms_rmfb@close-fd,Fail
-kms_universal_plane@disable-primary-vs-flip-pipe-b,Fail
-kms_universal_plane@universal-plane-pipe-B-sanity,Fail
diff --git a/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
b/drivers/gpu/drm/ci/xfails/msm-sc7180-flakes.txt
deleted file mode 100644
index 04730044ed12..
--- a/drivers/gpu/drm/ci/xfails
Re: [PATCH v3] drm/ci: add tests on vkms
Hi,
Thanks for picking this up.
On 02/01/2024 06:41, Vignesh Raman wrote:
From: Helen Koike
Add job that runs igt on top of vkms.
Signed-off-by: Vignesh Raman
Acked-by: Jessica Zhang
Tested-by: Jessica Zhang
Acked-by: Maxime Ripard
Signed-off-by: Helen Koike
---
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
diff --git a/MAINTAINERS b/MAINTAINERS
index 9d959a6881f7..2c1593aa436f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6922,6 +6922,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/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index 084e3ff8e3f4..4b636d39734c 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -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?
# YAML anchors for rule conditions
#
diff --git a/drivers/gpu/drm/ci/image-tags.yml
b/drivers/gpu/drm/ci/image-tags.yml
index 7ab4f2514da8..bfa70f8cdf57 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-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}"
\ No newline at end of file
+ ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}"
diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml
index 1705f268547a..a079f3632a95 100644
--- a/drivers/gpu/drm/ci/test.yml
+++ b/drivers/gpu/drm/ci/test.yml
@@ -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
diff --git a/drivers/gpu/drm/ci/x86_64.config b/drivers/gpu/drm/ci/x86_64.config
index 1cbd49a5b23a..ab4dcca749cc 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=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
# Strip out some stuff we don't need for graphics testing, to reduce
# the build.
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 ..ce8c93008d7e
--- /dev/null
+++ b/drivers/gpu/drm/ci/xfails/vkms-none-fails.txt
@@ -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-rapi
Re: Automatically update drm CI dependencies?
On 20/12/2023 08:11, Bagas Sanjaya wrote: On 12/19/23 23:43, Helen Koike wrote: Hi, On 14/12/2023 06:38, Bagas Sanjaya wrote: Hi all, I'm referring to dependabot PR on torvalds.git GitHub mirror [1]. I know that PRs submitted there are not accepted (the repo is essentially read-only mirror), hence this mail question. In summary, dependabot submitted automated PR that bumps package versions in `drivers/gpu/drm/ci/xfails/requirements.txt`. In this case, pip was upgraded to 23.3. From my experience, such automated PRs can pollute commit history (in some GitHub projects these PR kind can contribute up to half of total commits since the beginning of project). And in some projects, dependabot PRs are automatically merged without any maintainer intervention. Does such PRs (when submitted to LKML these will be patches) make sense for DRM subsystem? Thanks. [1]: https://github.com/torvalds/linux/pull/807 imho I rather not having this automated patches, but I would like to hear the opinions from others. But why? Did you mean that making the CI always depends on latest version of dependencies create another maintenance variable (and may constantly broke CI)? Confused... Sorry I didn't reply earlier. I'm ok with that if it doesn't produce much noise, I also think that we need an automated test to see if the tool is still working as expected before merging the patch. The pip there is just used for a helper tool, it is nothing critical. Regards, Helen
Re: Automatically update drm CI dependencies?
Hi, On 14/12/2023 06:38, Bagas Sanjaya wrote: Hi all, I'm referring to dependabot PR on torvalds.git GitHub mirror [1]. I know that PRs submitted there are not accepted (the repo is essentially read-only mirror), hence this mail question. In summary, dependabot submitted automated PR that bumps package versions in `drivers/gpu/drm/ci/xfails/requirements.txt`. In this case, pip was upgraded to 23.3. From my experience, such automated PRs can pollute commit history (in some GitHub projects these PR kind can contribute up to half of total commits since the beginning of project). And in some projects, dependabot PRs are automatically merged without any maintainer intervention. Does such PRs (when submitted to LKML these will be patches) make sense for DRM subsystem? Thanks. [1]: https://github.com/torvalds/linux/pull/807 imho I rather not having this automated patches, but I would like to hear the opinions from others. Thanks Helen
Re: [PATCH] drm/ci: uprev mesa version: fix kdl commit fetch
On 14/12/2023 05:00, Dmitry Baryshkov wrote: On Tue, 12 Dec 2023 at 18:04, Vignesh Raman wrote: build-kdl.sh was doing a `clone --depth 1` of the default branch, then checking out a commit that might not be the latest of that branch, resulting in container build error. https://gitlab.freedesktop.org/mesa/mesa/-/commit/5efa4d56 fixes kdl commit fetch issue. Uprev mesa in drm-ci to fix this. This commit also updates the kernel tag and adds .never-post-merge-rules due to the mesa uprev. Tested-by: Abhinav Kumar Signed-off-by: Vignesh Raman Reviewed-by: Dmitry Baryshkov Acked-by: Helen Koike Thanks Helen --- drivers/gpu/drm/ci/gitlab-ci.yml | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-)
Re: [PATCH v7 00/10] drm: ci: fixes
On 07/12/2023 06:18, Vignesh Raman wrote: The patch series contains improvements, enabling new ci jobs which enables testing for Mediatek MT8173, Qualcomm APQ 8016 and VirtIO GPU, fixing issues with the ci jobs and updating the expectation files. v2: - Use fdtoverlay command to merge overlay dtbo with the base dtb instead of modifying the kernel sources - Reworded the commit message for enabling jobs - Added a new patch in the series to use scripts/config to enable/disable configs v3: - New patch in the series to add device tree overlay in arch/arm64/boot/dts/qcom - drm-ci scripts to use device tree overlay from arch/arm64/boot/dts/qcom and compile base device tree with overlay support - New patch in the series to enable CONFIG_REGULATOR_DA9211 in defconfig - Remove CONFIG_RTC_DRV_MT6397=y as it is already enabled in defconfig v4: - Drop 'enable CONFIG_REGULATOR_DA9211 in defconfig' patch as it is sent upstream as a seperate patch - Use apq8016-sbc-usb-host.dtb which allows the USB controllers to work in host mode. This patch depends on https://lore.kernel.org/lkml/20230911161518.650726-1-vignesh.ra...@collabora.com/ v5: - Added a new patch in the series to set IGT_FORCE_DRIVER to 'mediatek' for mt8173 - Added a new patch in the series to make artifacts available for virtio jobs - Added a new patch in the series to add pipeline url to fails and flakes files - Generate fails and flakes file with the updated xfails script - https://www.spinics.net/lists/kernel/msg4959630.html - Drop 'virtio: Update ci variables' patch as the tests which causes the malloc issue are skipped v6: - Updated commit message for enable DA9211 regulator fix - Use GPU_VERSION instead of CI_JOB_NAME to check if it is mt8173 while setting IGT_FORCE_DRIVER - Added a new patch in the series to uprev IGT to fix memory corruption - Added a new patch in the series to update drm ci documentation - Generate fails file with drm-misc-next v7: - Fix checkpatch style problems in commit message - Rework mt8173 IGT_FORCE_DRIVER fix and reword the commit message Vignesh Raman (10): drm: ci: igt_runner: Remove todo drm: ci: Force db410c to host mode drm: ci: arm64.config: Enable DA9211 regulator drm: ci: Enable new jobs drm: ci: Use scripts/config to enable/disable configs drm: ci: mt8173: Do not set IGT_FORCE_DRIVER to panfrost drm: ci: virtio: Make artifacts available drm: ci: uprev IGT drm/doc: ci: Add IGT version details for flaky tests drm: ci: Update xfails Documentation/gpu/automated_testing.rst | 7 +-- drivers/gpu/drm/ci/arm64.config | 1 + drivers/gpu/drm/ci/build.sh | 16 +++ drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/igt_runner.sh | 10 +++- drivers/gpu/drm/ci/test.yml | 13 ++ .../drm/ci/xfails/mediatek-mt8173-fails.txt | 13 -- .../gpu/drm/ci/xfails/msm-apq8016-fails.txt | 5 ++ .../drm/ci/xfails/virtio_gpu-none-fails.txt | 46 +++ 9 files changed, 86 insertions(+), 27 deletions(-) Applied to drm/drm-misc (drm-misc-next). Thanks! Helen
Re: [PATCH v6 09/10] drm/doc: ci: Add IGT version details for flaky tests
On 29/11/2023 09:18, Vignesh Raman wrote: Document the IGT version in the flaky tests reporting template. Nice! Signed-off-by: Vignesh Raman Acked-by: Helen Koike Thanks Helen --- v6: - Added a new patch in the series to update drm ci documentation --- Documentation/gpu/automated_testing.rst | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/gpu/automated_testing.rst b/Documentation/gpu/automated_testing.rst index 240e29d5ba68..2d5a28866afe 100644 --- a/Documentation/gpu/automated_testing.rst +++ b/Documentation/gpu/automated_testing.rst @@ -69,14 +69,15 @@ the result. They will still be run. Each new flake entry must be associated with a link to the email reporting the bug to the author of the affected driver, the board name or Device Tree name of -the board, the first kernel version affected, and an approximation of the -failure rate. +the board, the first kernel version affected, the IGT version used for tests, +and an approximation of the failure rate. They should be provided under the following format:: # Bug Report: $LORE_OR_PATCHWORK_URL # Board Name: broken-board.dtb - # Version: 6.6-rc1 + # Linux Version: 6.6-rc1 + # IGT Version: 1.28-gd2af13d9f # Failure Rate: 100 flaky-test
Re: [PATCH v6 08/10] drm: ci: uprev IGT
On 29/11/2023 09:18, Vignesh Raman wrote: virtio-gpu kernel driver reports 16 for count_crtcs which exceeds IGT_MAX_PIPES set to 8 in igt-gpu-tools. This results in below memory corruption, malloc(): corrupted top size Received signal SIGABRT. Stack trace: #0 [fatal_sig_handler+0x17b] #1 [__sigaction+0x40] #2 [pthread_key_delete+0x14c] #3 [gsignal+0x12] #4 [abort+0xd3] #5 [__fsetlocking+0x290] #6 [timer_settime+0x37a] #7 [__default_morecore+0x1f1b] #8 [__libc_calloc+0x161] #9 [drmModeGetPlaneResources+0x44] #10 [igt_display_require+0x194] #11 [__igt_uniquereal_main1356+0x93c] #12 [main+0x3f] #13 [__libc_init_first+0x8a] #14 [__libc_start_main+0x85] #15 [_start+0x21] This is fixed in igt-gpu-tools by increasing IGT_MAX_PIPES to 16. https://patchwork.freedesktop.org/series/126327/ Uprev IGT to include the patches which fixes this issue. Signed-off-by: Vignesh Raman Acked-by: Helen Koike Thanks Helen --- v6: - Added a new patch in the series to uprev IGT to fix memory corruption --- drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index aeb9bab1b069..dac92cc2777c 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -5,7 +5,7 @@ variables: UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next - IGT_VERSION: d1db7333d9c5fbbb05e50b0804123950d9dc1c46 + IGT_VERSION: d2af13d9f5be5ce23d996e4afd3e45990f5ab977 DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git DEQP_RUNNER_GIT_TAG: v0.15.0
Re: [PATCH v6 07/10] drm: ci: virtio: Make artifacts available
On 29/11/2023 09:18, Vignesh Raman wrote: There were no artifacts available for virtio job. So make the artifacts available in the pipeline job. Signed-off-by: Vignesh Raman Acked-by: Helen Koike Thanks Helen --- v5: - Added a new patch in the series to make artifacts available for virtio jobs v6: - No changes --- drivers/gpu/drm/ci/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index e0fdc55c9b69..2c9a1838e728 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -329,6 +329,8 @@ virtio_gpu:none: script: - ln -sf $CI_PROJECT_DIR/install /install - mv install/bzImage /lava-files/bzImage +- 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
Re: [PATCH v6 06/10] drm: ci: mediatek: Set IGT_FORCE_DRIVER for mt8173
Hi,
Thanks for your patch.
On 29/11/2023 09:18, Vignesh Raman wrote:
Expected driver for mt8173 is "mediatek" and for mt8183
it is "panfrost". Set IGT_FORCE_DRIVER to 'mediatek' as
the expected driver for mt8173.
Signed-off-by: Vignesh Raman
---
v5:
- Added a new patch in the series to set IGT_FORCE_DRIVER to 'mediatek' for
mt8173
v6:
- Use GPU_VERSION instead of CI_JOB_NAME to check if it is mt8173
---
drivers/gpu/drm/ci/igt_runner.sh | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh
index c6cf963592c5..70a0f84021a1 100755
--- a/drivers/gpu/drm/ci/igt_runner.sh
+++ b/drivers/gpu/drm/ci/igt_runner.sh
@@ -30,6 +30,10 @@ case "$DRIVER_NAME" in
;;
esac
+if [ "$GPU_VERSION" = "mt8173" ]; then
+export IGT_FORCE_DRIVER=${DRIVER_NAME}
+fi
Just a nit, could you add this in the first case statement? Just to
avoid confusing about double assignment? -> but feel free to ignore this
comment.
With or without this:
Acked-by: Helen Koike
Thanks
Helen
+
if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" ]; then
IGT_SKIPS="--skips /install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt"
fi
Re: [PATCH] drm/ci: remove rebase-merge directory
On 02/12/2023 19:13, Dmitry Baryshkov wrote:
Gitlab runner can cache git repository, including the unfinished rebase
merge status. New CI job will come as a fresh checkout, however this
will not destroy the unfinished rebase, failing our build script.
Destroy the unfinished rebase state.
Suggested-by: David Heidelberg
Signed-off-by: Dmitry Baryshkov
Acked-by: Helen Koike
Thanks!
Helen
---
drivers/gpu/drm/ci/build.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index e5c5dcedd108..ca2923ed2290 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -58,6 +58,9 @@ git config --global user.email "f...@example.com"
git config --global user.name "freedesktop.org CI"
git config --global pull.rebase true
+# cleanup git state on the worker
+rm -rf .git/rebase-merge
+
# Try to merge fixes from target repo
if [ "$(git ls-remote --exit-code --heads ${UPSTREAM_REPO}
${TARGET_BRANCH}-external-fixes)" ]; then
git pull ${UPSTREAM_REPO} ${TARGET_BRANCH}-external-fixes
Re: github version complaints about the gitlab CI requirements.txt
Hi Linus, On 12/11/2023 17:33, Linus Torvalds wrote: So every time I push to my github mirror, github now ends up having a 'dependabot' thing that warns about some of the CI version requirements for the gitlab automated testing file. It wants to update the pip requirements from 23.2.1 to 23.3 - When installing a package from a Mercurial VCS URL, e.g. pip install hg+..., with pip prior to v23.3, the specified Mercurial revision could be used to inject arbitrary configuration options to the hg clone call (e.g. --config). Controlling the Mercurial configuration can modify how and which repository is installed. This vulnerability does not affect users who aren't installing from Mercurial. and upgrade the urllib3 requirements from 2.0.4 to 2.0.7: - urllib3's request body not stripped after redirect from 303 status changes request method to GET - `Cookie` HTTP header isn't stripped on cross-origin redirects And it's not like any of this looks like a big deal, but I'd like to shut up the messages I get. I can either just close those issues, or I can apply a patch something like the attached (which also adds a missing newline at the end). I thought I should ask the people who actually set this up. Comments? I just tested your attached patch and looks fine, the scripts with those requirements worked as expected, so please go ahead with your patch with Tested-by: Helen Koike Now I'm thinking how to prevent those warnings in the future. Thank you, Helen Linus
Re: [PATCH 0/3] drm/ci: Add support for SM8250 Gitlab Runner
On 07/11/2023 21:10, Jessica Zhang wrote: On 11/6/2023 9:35 AM, Jessica Zhang wrote: On 11/4/2023 6:02 AM, Helen Koike wrote: Hi Jessica, On 10/10/2023 19:25, Jessica Zhang wrote: Recently, we've registered a Gitlab runner for a Qualcomm RB5 device that will be hosted and maintained in Qualcomm labs. This series will add a corresponding CI job for testing SM8250 devices and add the skip/fails/flakes list. We were able to complete a successful run [1] with these changes. For now, we will keep the job as manual trigger only and drop that rule later after we stabilize the tests. [1] https://gitlab.freedesktop.org/drm/msm/-/jobs/50092719 --- Thank you for you patchset. I'm getting the following error: "serial.serialutil.SerialException: [Errno 2] could not open port /dev/ttyUSB0: [Errno 2] No such file or directory: '/dev/ttyUSB0'" https://gitlab.freedesktop.org/helen.fornazier/linux/-/jobs/51193215#L146 I'm wondering if I'm missing some configuration. I tested on top of drm-misc-next. Hi Helen, Sorry for the inconvenience, but I had to temporarily take down the runner last Friday to physically move the setup (as part of a reorganization of our lab here). I'll update this thread as soon as the runner is back up -- the move will be complete by the end of this week. The RB5 runner is back up -- please let me know if you run into any issues with it. It worked now, I runned on drm-tip-next, I got several UnexpectedPass, except for kms_color@ctm-green-to-red,Fail, could you check if those are flakes or things got fixed and we can remove them from -fails.txt? https://gitlab.freedesktop.org/helen.fornazier/linux/-/jobs/51385345#L23356 Thanks! Regards, Helen Thanks, Jessica Zhang Also, I'd like to add in the docs an entry about the devices we have, which tag they need, which dts they correspond to, which farm they are located, who to contact if there is any problem and maybe some comment about the device (how it is hooked up, the logs comes from uart or ssh, does it use fastboot, etc) if you find it useful. Would you mind adding an entry in the docs with this information for the sm8250? (Than I'll add the info of the other devices after yours). Sure, sounds good. Jessica Zhang (3): drm/ci: Add SM8250 job to CI I would also move this patch to last, so we don't have a commit where things shouldn't work properly. Or maybe squash them all. Acked -- I'll move this patch to the end. Thanks, Jessica Zhang Regards, Helen drm/ci: enable CONFIG_INTERCONNECT_QCOM_SM8250 for arm64 config drm/ci: Add skips, fails and flakes for SM8250 drivers/gpu/drm/ci/arm64.config | 1 + drivers/gpu/drm/ci/build.sh | 1 + drivers/gpu/drm/ci/test.yml | 15 + drivers/gpu/drm/ci/xfails/msm-sm8250-fails.txt | 29 + drivers/gpu/drm/ci/xfails/msm-sm8250-flakes.txt | 3 +++ drivers/gpu/drm/ci/xfails/msm-sm8250-skips.txt | 8 +++ 6 files changed, 57 insertions(+) --- base-commit: dcd88f8c63341ed11a8c5019408f62202cd9d1f2 change-id: 20230919-rb5-runner-77ec32bd61e7 Best regards,
Re: [PATCH 3/3] drm/ci: Add skips, fails and flakes for SM8250
On 10/10/2023 19:25, Jessica Zhang wrote: Add skips, fails and flakes for the SM8250 test. Generated using update-xfails.py [1] [1] https://patchwork.freedesktop.org/patch/561453/?series=124793&rev=1 Signed-off-by: Abhinav Kumar Signed-off-by: Jessica Zhang --- drivers/gpu/drm/ci/xfails/msm-sm8250-fails.txt | 29 + drivers/gpu/drm/ci/xfails/msm-sm8250-flakes.txt | 3 +++ drivers/gpu/drm/ci/xfails/msm-sm8250-skips.txt | 8 +++ 3 files changed, 40 insertions(+) diff --git a/drivers/gpu/drm/ci/xfails/msm-sm8250-fails.txt b/drivers/gpu/drm/ci/xfails/msm-sm8250-fails.txt new file mode 100644 index ..cc8ae32e90e7 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/msm-sm8250-fails.txt @@ -0,0 +1,29 @@ +kms_3d,Fail +kms_atomic_transition@plane-all-modeset-transition,Timeout +kms_color@ctm-0-25,Fail +kms_color@ctm-0-50,Fail +kms_color@ctm-0-75,Fail +kms_color@ctm-blue-to-red,Fail +kms_color@ctm-negative,Fail +kms_color@ctm-red-to-blue,Fail +kms_color@ctm-signed,Fail +kms_cursor_legacy@basic-flip-after-cursor-varying-size,Fail +kms_cursor_legacy@basic-flip-before-cursor-varying-size,Fail +kms_cursor_legacy@cursor-vs-flip-atomic-transitions-varying-size,Fail +kms_cursor_legacy@cursor-vs-flip-toggle,Fail +kms_cursor_legacy@cursor-vs-flip-varying-size,Fail +kms_cursor_legacy@short-flip-after-cursor-atomic-transitions-varying-size,Fail +kms_cursor_legacy@short-flip-before-cursor-atomic-transitions-varying-size,Fail +kms_cursor_legacy@short-flip-before-cursor-toggle,Fail +kms_hdmi_inject@inject-4k,Fail +kms_pipe_crc_basic@compare-crc-sanitycheck-nv12,Fail +kms_plane@pixel-format,Fail +kms_plane@pixel-format-source-clamping,Fail +kms_plane@plane-position-covered,Fail +kms_plane@plane-position-hole,Fail +kms_plane@plane-position-hole-dpms,Fail +kms_plane_alpha_blend@alpha-7efc,Fail +kms_plane_alpha_blend@coverage-7efc,Fail +kms_plane_alpha_blend@coverage-vs-premult-vs-constant,Fail +kms_plane_cursor@overlay,Fail +kms_rmfb@close-fd,Fail diff --git a/drivers/gpu/drm/ci/xfails/msm-sm8250-flakes.txt b/drivers/gpu/drm/ci/xfails/msm-sm8250-flakes.txt new file mode 100644 index ..0b55665184c1 --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/msm-sm8250-flakes.txt @@ -0,0 +1,3 @@ +kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size +kms_cursor_legacy@flip-vs-cursor-varying-size +kms_plane_cursor@viewport We are trying to add some docs, specially to the flakes, please check: https://lists.freedesktop.org/archives/dri-devel/2023-October/427982.html Could you add it for those? (I'm glad to see there are just a few flakes). Thanks Helen diff --git a/drivers/gpu/drm/ci/xfails/msm-sm8250-skips.txt b/drivers/gpu/drm/ci/xfails/msm-sm8250-skips.txt new file mode 100644 index ..c20422c58e4d --- /dev/null +++ b/drivers/gpu/drm/ci/xfails/msm-sm8250-skips.txt @@ -0,0 +1,8 @@ +# Suspend to RAM seems to be broken on this machine +.*suspend.* + +# reboots device +kms_plane_scaling.* + +# long execution time +kms_flip.*
Re: [PATCH 0/3] drm/ci: Add support for SM8250 Gitlab Runner
Hi Jessica, On 10/10/2023 19:25, Jessica Zhang wrote: Recently, we've registered a Gitlab runner for a Qualcomm RB5 device that will be hosted and maintained in Qualcomm labs. This series will add a corresponding CI job for testing SM8250 devices and add the skip/fails/flakes list. We were able to complete a successful run [1] with these changes. For now, we will keep the job as manual trigger only and drop that rule later after we stabilize the tests. [1] https://gitlab.freedesktop.org/drm/msm/-/jobs/50092719 --- Thank you for you patchset. I'm getting the following error: "serial.serialutil.SerialException: [Errno 2] could not open port /dev/ttyUSB0: [Errno 2] No such file or directory: '/dev/ttyUSB0'" https://gitlab.freedesktop.org/helen.fornazier/linux/-/jobs/51193215#L146 I'm wondering if I'm missing some configuration. I tested on top of drm-misc-next. Also, I'd like to add in the docs an entry about the devices we have, which tag they need, which dts they correspond to, which farm they are located, who to contact if there is any problem and maybe some comment about the device (how it is hooked up, the logs comes from uart or ssh, does it use fastboot, etc) if you find it useful. Would you mind adding an entry in the docs with this information for the sm8250? (Than I'll add the info of the other devices after yours). Jessica Zhang (3): drm/ci: Add SM8250 job to CI I would also move this patch to last, so we don't have a commit where things shouldn't work properly. Or maybe squash them all. Regards, Helen drm/ci: enable CONFIG_INTERCONNECT_QCOM_SM8250 for arm64 config drm/ci: Add skips, fails and flakes for SM8250 drivers/gpu/drm/ci/arm64.config | 1 + drivers/gpu/drm/ci/build.sh | 1 + drivers/gpu/drm/ci/test.yml | 15 + drivers/gpu/drm/ci/xfails/msm-sm8250-fails.txt | 29 + drivers/gpu/drm/ci/xfails/msm-sm8250-flakes.txt | 3 +++ drivers/gpu/drm/ci/xfails/msm-sm8250-skips.txt | 8 +++ 6 files changed, 57 insertions(+) --- base-commit: dcd88f8c63341ed11a8c5019408f62202cd9d1f2 change-id: 20230919-rb5-runner-77ec32bd61e7 Best regards,
Re: [PATCH Resend] Fix line Length
On 30/10/2023 08:36, Bagas Sanjaya wrote: On 30/10/2023 13:12, Julia Lawall wrote: On Mon, 30 Oct 2023, Bagas Sanjaya wrote: Hi Julia, The submitter touched one of CI scripts for the DRM subsystem. To test this patch, there must be a way to run these scripts locally (which may requires non-trivial setup). Instructions to test it is on the docs: https://docs.kernel.org/gpu/automated_testing.html?highlight=drm+ci#how-to-enable-automated-testing-on-your-tree Cc'ed DRM maintainers. There is a DRM outreachy project. I think that motivated this patch. Yes :) OK, thanks! Thanks Helen
Re: (subset) [PATCH v2] drm/doc: ci: Require more context for flaky tests
On 26/10/2023 12:31, Maxime Ripard wrote: Hi, On Thu, Oct 26, 2023 at 11:27:18AM -0300, Helen Koike wrote: On 26/10/2023 10:27, Maxime Ripard wrote: On Thu, Oct 26, 2023 at 09:08:03AM -0300, Helen Koike wrote: On 26/10/2023 09:01, Helen Koike wrote: On 26/10/2023 07:58, Maxime Ripard wrote: On Wed, 25 Oct 2023 16:24:41 +0200, Maxime Ripard wrote: Flaky tests can be very difficult to reproduce after the facts, which will make it even harder to ever fix. Let's document the metadata we agreed on to provide more context to anyone trying to address these fixes. [...] Applied to drm/drm-misc (drm-misc-next). Thanks! Could you also apply https://patchwork.kernel.org/project/dri-devel/cover/20231024004525.169002-1-helen.ko...@collabora.com/ (and the dependencies listed on it). For some reason, commit message 7/10 (drm/ci: increase i915 job timeout to 1h30m) looks incomplete in patchwork, but it looks fine in my branch: https://gitlab.freedesktop.org/helen.fornazier/linux/-/commits/for-drm-misc-wip/ Let me know if you prefer that I send it again or if you could pull from the branch. It was fine on lore.kernel.org and that's where I'm pulling from, so it all worked out :) Everything you asked for should be applied now Maxime Awesome, thank you! Sorry, just another request, could you please pull this other one updating MAINTAINERS? https://patchwork.kernel.org/project/linux-arm-msm/patch/20230919182249.153499-1-helen.ko...@collabora.com/ I don't mind, but the expectation (the one I had at least) was that you would do it :) If you don't have drm-misc access, please create an account, you have done way more than expected to get one already Nice! I just created this request https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/983 Would you mind approving it? Thanks! Helen Maxime
Re: (subset) [PATCH v2] drm/doc: ci: Require more context for flaky tests
On 26/10/2023 10:27, Maxime Ripard wrote: On Thu, Oct 26, 2023 at 09:08:03AM -0300, Helen Koike wrote: On 26/10/2023 09:01, Helen Koike wrote: On 26/10/2023 07:58, Maxime Ripard wrote: On Wed, 25 Oct 2023 16:24:41 +0200, Maxime Ripard wrote: Flaky tests can be very difficult to reproduce after the facts, which will make it even harder to ever fix. Let's document the metadata we agreed on to provide more context to anyone trying to address these fixes. [...] Applied to drm/drm-misc (drm-misc-next). Thanks! Could you also apply https://patchwork.kernel.org/project/dri-devel/cover/20231024004525.169002-1-helen.ko...@collabora.com/ (and the dependencies listed on it). For some reason, commit message 7/10 (drm/ci: increase i915 job timeout to 1h30m) looks incomplete in patchwork, but it looks fine in my branch: https://gitlab.freedesktop.org/helen.fornazier/linux/-/commits/for-drm-misc-wip/ Let me know if you prefer that I send it again or if you could pull from the branch. It was fine on lore.kernel.org and that's where I'm pulling from, so it all worked out :) Everything you asked for should be applied now Maxime Awesome, thank you! Sorry, just another request, could you please pull this other one updating MAINTAINERS? https://patchwork.kernel.org/project/linux-arm-msm/patch/20230919182249.153499-1-helen.ko...@collabora.com/ So get_maintainers.pl returns the right people and we don't forget to notify maintainers when flakes/fails/skips are updated. Thank again. Helen
Re: (subset) [PATCH v2] drm/doc: ci: Require more context for flaky tests
On 26/10/2023 09:01, Helen Koike wrote: On 26/10/2023 07:58, Maxime Ripard wrote: On Wed, 25 Oct 2023 16:24:41 +0200, Maxime Ripard wrote: Flaky tests can be very difficult to reproduce after the facts, which will make it even harder to ever fix. Let's document the metadata we agreed on to provide more context to anyone trying to address these fixes. [...] Applied to drm/drm-misc (drm-misc-next). Thanks! Could you also apply https://patchwork.kernel.org/project/dri-devel/cover/20231024004525.169002-1-helen.ko...@collabora.com/ (and the dependencies listed on it). For some reason, commit message 7/10 (drm/ci: increase i915 job timeout to 1h30m) looks incomplete in patchwork, but it looks fine in my branch: https://gitlab.freedesktop.org/helen.fornazier/linux/-/commits/for-drm-misc-wip/ Let me know if you prefer that I send it again or if you could pull from the branch. Thanks Helen Drm/ci in drm-misc is broken atm, there are some people asking me how to run it, and this unbreaks it. Thanks again Helen Thanks! Maxime
Re: (subset) [PATCH v2] drm/doc: ci: Require more context for flaky tests
On 26/10/2023 07:58, Maxime Ripard wrote: On Wed, 25 Oct 2023 16:24:41 +0200, Maxime Ripard wrote: Flaky tests can be very difficult to reproduce after the facts, which will make it even harder to ever fix. Let's document the metadata we agreed on to provide more context to anyone trying to address these fixes. [...] Applied to drm/drm-misc (drm-misc-next). Thanks! Could you also apply https://patchwork.kernel.org/project/dri-devel/cover/20231024004525.169002-1-helen.ko...@collabora.com/ (and the dependencies listed on it). Drm/ci in drm-misc is broken atm, there are some people asking me how to run it, and this unbreaks it. Thanks again Helen Thanks! Maxime
Re: [PATCH v2] drm/doc: ci: Require more context for flaky tests
On 25/10/2023 11:24, Maxime Ripard wrote:
Flaky tests can be very difficult to reproduce after the facts, which
will make it even harder to ever fix.
Let's document the metadata we agreed on to provide more context to
anyone trying to address these fixes.
Link:
https://lore.kernel.org/dri-devel/CAPj87rPbJ1V1-R7WMTHkDat2A4nwSd61Df9mdGH2PR=ZzxaU=q...@mail.gmail.com/
Acked-by: Daniel Vetter
Signed-off-by: Maxime Ripard
Acked-by: Helen Koike
---
Cc: Helen Koike
Changes from v1:
- Rephrase the sentence a bit to make it clearer we expect a bug report
by mail
---
Documentation/gpu/automated_testing.rst | 13 +
1 file changed, 13 insertions(+)
diff --git a/Documentation/gpu/automated_testing.rst
b/Documentation/gpu/automated_testing.rst
index 469b6fb65c30..792428a2bfdc 100644
--- a/Documentation/gpu/automated_testing.rst
+++ b/Documentation/gpu/automated_testing.rst
@@ -67,6 +67,19 @@ Lists the tests that for a given driver on a specific
hardware revision are
known to behave unreliably. These tests won't cause a job to fail regardless
of
the result. They will still be run.
+Each new flake entry must be associated with a link to the email reporting the
+bug to the author of the affected driver, the board name or Device Tree name of
+the board, the first kernel version affected, and an approximation of the
+failure rate.
+
+They should be provided under the following format::
+
+ # Bug Report: $LORE_OR_PATCHWORK_URL
+ # Board Name: broken-board.dtb
+ # Version: 6.6-rc1
+ # Failure Rate: 100
+ flaky-test
+
drivers/gpu/drm/ci/${DRIVER_NAME}-${HW_REVISION}-skips.txt
---
Re: [PATCH] drm/doc: ci: Require more context for flaky tests
On 23/10/2023 12:09, Maxime Ripard wrote: On Fri, Oct 20, 2023 at 01:33:59AM -0300, Helen Koike wrote: On 19/10/2023 13:51, Helen Koike wrote: On 19/10/2023 06:46, Maxime Ripard wrote: Flaky tests can be very difficult to reproduce after the facts, which will make it even harder to ever fix. Let's document the metadata we agreed on to provide more context to anyone trying to address these fixes. Link: https://lore.kernel.org/dri-devel/CAPj87rPbJ1V1-R7WMTHkDat2A4nwSd61Df9mdGH2PR=ZzxaU=q...@mail.gmail.com/ Signed-off-by: Maxime Ripard --- Documentation/gpu/automated_testing.rst | 13 + 1 file changed, 13 insertions(+) diff --git a/Documentation/gpu/automated_testing.rst b/Documentation/gpu/automated_testing.rst index 469b6fb65c30..2dd0e221c2c3 100644 --- a/Documentation/gpu/automated_testing.rst +++ b/Documentation/gpu/automated_testing.rst @@ -67,6 +67,19 @@ Lists the tests that for a given driver on a specific hardware revision are known to behave unreliably. These tests won't cause a job to fail regardless of the result. They will still be run. +Each new flake entry must be associated with a link to a bug report to What do you mean by but report? Just a link to an email to the mailing list is enough? Also, I had made a mistake to the first flakes lists, which I corrected with https://www.spinics.net/lists/kernel/msg4959629.html (there was a bug in my script which ended up erroneous adding a bunch of tests in the flake list, so I cleaned them up), I would like to kind request to let me add those documentation in a future patch to not block that patch series. Thanks Helen +the author of the affected driver, the board name or Device Tree name of +the board, the first kernel version affected, and an approximation of +the failure rate. + +They should be provided under the following format:: + + # Bug Report: $LORE_OR_PATCHWORK_URL I wonder if the commit adding the test into the flakes.txt file with and Acked-by from the device maintainer shouldn't be already considered the Bug Report. I guess it could, yes. I think I'd still prefer the link since it would allow to also evaluate if the issue is fixed or not now. + # Board Name: broken-board.dtb Maybe Board Name isn't required, since it is already in the name of the file. I have no idea how the i915 naming works, but on ARM at least the name of the file contains the name of the SoC, not the board where it was observed. right, yeah we could use the dtb to be more clear/precise, no problem. + # Version: 6.6-rc1 + # Failure Rate: 100 Maybe also: # Pipeline url: https://gitlab.freedesktop.org/helen.fornazier/linux/-/pipelines/1014435 Sounds like a good idea yeah :) Are those artifacts archived/deleted at some point or do they stick around forever? Good point, I asked the admins, they stick for 4 weeks (could be more, but it is not forever) :( All this info will complicated a bit the update-xfails.py script, but well, we can handle... (see https://patchwork.kernel.org/project/dri-devel/patch/20231020034124.136295-4-helen.ko...@collabora.com/ ) We need to update that script to make life easier. I guess we could just add a template for now? It would keep the script easy and yet still hint its user that we want more data ack Thanks Helen Vignesh sent a patch adding at least the pipeline url to the file https://patchwork.kernel.org/project/linux-arm-msm/patch/20231019070650.61159-9-vignesh.ra...@collabora.com/ but to meet this doc that needs to be updated too. Sure, I'll update it Maxime
[PATCH v3 10/10] drm/ci: docs: add step about how to request privileges
Clarify the procedure developer must follow to request privileges to run tests on Freedesktop gitlab CI. This measure was added to avoid untrusted people to misuse the infrastructure. Signed-off-by: Helen Koike Reviewed-by: David Heidelberg --- v2: - fix typo in commit message v3: -no changes --- Documentation/gpu/automated_testing.rst | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Documentation/gpu/automated_testing.rst b/Documentation/gpu/automated_testing.rst index 469b6fb65c30..8ec1878b44ab 100644 --- a/Documentation/gpu/automated_testing.rst +++ b/Documentation/gpu/automated_testing.rst @@ -86,10 +86,13 @@ https://gitlab.freedesktop.org/janedoe/linux/-/settings/ci_cd), change the CI/CD configuration file from .gitlab-ci.yml to drivers/gpu/drm/ci/gitlab-ci.yml. -3. Next time you push to this repository, you will see a CI pipeline being +3. Request to be added to the drm/ci-ok group so that your user has the +necessary privileges to run the CI on https://gitlab.freedesktop.org/drm/ci-ok + +4. Next time you push to this repository, you will see a CI pipeline being created (eg. https://gitlab.freedesktop.org/janedoe/linux/-/pipelines) -4. The various jobs will be run and when the pipeline is finished, all jobs +5. The various jobs will be run and when the pipeline is finished, all jobs should be green unless a regression has been found. -- 2.39.2
