Skip to contentSkip to conversation

drm: ci: fixes

PATCH Superseded Vignesh Raman 2 participants 10 messages Sep 14, 2023 – Sep 22, 2023

Subsystems (11)

v4 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Vignesh Raman

author maintainer
#0 lore raw

v4 cover drm: ci: fixes

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. This series is intended for drm branch drm-next.

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/[email protected]/

Vignesh Raman (7):
drm: ci: igt_runner: Remove todo
drm: ci: Force db410c to host mode
drm: ci: virtio: Update ci variables
drm: ci: Enable regulator
drm: ci: Update xfails
drm: ci: Enable new jobs
drm: ci: Use scripts/config to enable/disable configs

 drivers/gpu/drm/ci/arm64.config                  |  1 +
 drivers/gpu/drm/ci/build.sh                      | 16 ++++++++--------
 drivers/gpu/drm/ci/igt_runner.sh                 |  1 -
 drivers/gpu/drm/ci/test.yml                      | 16 +++++-----------
 .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt    |  1 -
 drivers/gpu/drm/ci/xfails/i915-cml-fails.txt     |  1 -
 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt    |  2 ++
 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt    |  1 +
 .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt  |  2 --
 .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 16 ++++++++++++++++
 drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt |  2 ++
 .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt |  1 +
 .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt  |  4 ++--
 .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt |  3 +++
 14 files changed, 41 insertions(+), 26 deletions(-)
Signature · 1 line
2.40.1
author maintainer
#1 lore raw

PATCH v4 1/7 drm: ci: igt_runner: Remove todo

/sys/kernel/debug/dri/*/state exist for every atomic KMS driver. We do not test non-atomic drivers, so remove the todo.

---

v2:
- No changes

v3:
- No changes

v4:
- No changes

---
 drivers/gpu/drm/ci/igt_runner.sh | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/ci/igt_runner.sh +0 -1
index 2bb759165063..5bf130ac57c9 100755
@@ -15,7 +15,6 @@ cat /sys/kernel/debug/device_component/*
 '
 
 # Dump drm state to confirm that kernel was able to find a connected display:
-# TODO this path might not exist for all drivers.. maybe run modetest instead?
 set +e
 cat /sys/kernel/debug/dri/*/state
 set -e
Signature · 1 line
2.40.1
author maintainer
#2 lore raw

PATCH v4 2/7 drm: ci: Force db410c to host mode

In reply to Vignesh Raman

Force db410c to host mode to fix network issue which results in failure
to mount root fs via NFS.
See https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/cb72a629b8c15c80a54dda510743cefd1c4b65b8

Use apq8016-sbc-usb-host.dtb which allows the USB controllers to work in host mode.

---

v2:
- Use fdtoverlay command to merge overlay dtbo with the base dtb instead of modifying the kernel sources

v3:
- drm-ci scripts to use device tree overlay from arch/arm64/boot/dts/qcom and compile base device tree with overlay support

v4:
- 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/[email protected]/
---
 drivers/gpu/drm/ci/build.sh | 2 +-
 drivers/gpu/drm/ci/test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/ci/build.sh +1 -1
index 7b014287a041..58b71538f489 100644
@@ -19,7 +19,7 @@ if [[ "$KERNEL_ARCH" = "arm64" ]]; then
     DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb"
-    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtb"
drivers/gpu/drm/ci/test.yml +1 -1
index 6473cddaa7a9..56009e5495cc 100644
@@ -102,7 +102,7 @@ msm:apq8016:
   stage: msm
   variables:
     DRIVER_NAME: msm
-    BM_DTB: https://${PIPELINE_ARTIFACTS_BASE}/arm64/apq8016-sbc.dtb
+    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"
     RUNNER_TAG: google-freedreno-db410c
Signature · 1 line
2.40.1
author maintainer
#3 lore raw

PATCH v4 3/7 drm: ci: virtio: Update ci variables

In reply to Vignesh Raman

Update ci variables to fix the below error, ERROR - Igt error: malloc(): corrupted top size ERROR - Igt error: Received signal SIGABRT. ERROR - Igt error: Stack trace:
ERROR - Igt error: #0 [fatal_sig_handler+0x17b]

---

v2:
- No changes

v3:
- No changes

v4:
- No changes

---
 drivers/gpu/drm/ci/test.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/ci/test.yml +4 -1
index 56009e5495cc..e8503a533be0 100644
@@ -316,8 +316,11 @@ virtio_gpu:none:
   stage: virtio-gpu
   variables:
     CROSVM_GALLIUM_DRIVER: llvmpipe
-    DRIVER_NAME: virtio_gpu
+    DRIVER_NAME: virtio
     GPU_VERSION: none
+    CROSVM_MEMORY: 12288
+    CROSVM_CPU: $FDO_CI_CONCURRENT
+    CROSVM_GPU_ARGS: "vulkan=true,gles=false,backend=virglrenderer,egl=true,surfaceless=true"
   extends:
     - .test-gl
   tags:
Signature · 1 line
2.40.1
author maintainer
#4 lore raw

PATCH v4 4/7 drm: ci: Enable regulator

In reply to Vignesh Raman

Enable CONFIG_REGULATOR_DA9211=y to fix mt8173 boot issue.

---

v2:
- No changes

v3:
- Remove CONFIG_RTC_DRV_MT6397=y as it is already enabled in defconfig

v4:
- No changes

---
 drivers/gpu/drm/ci/arm64.config | 1 +
 1 file changed, 1 insertion(+)
drivers/gpu/drm/ci/arm64.config +1 -0
index 817e18ddfd4f..ca95e141a7ae 100644
@@ -184,6 +184,7 @@ CONFIG_HW_RANDOM_MTK=y
 CONFIG_MTK_DEVAPC=y
 CONFIG_PWM_MTK_DISP=y
 CONFIG_MTK_CMDQ=y
+CONFIG_REGULATOR_DA9211=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
Signature · 1 line
2.40.1
author maintainer
#5 lore raw

PATCH v4 5/7 drm: ci: Update xfails

In reply to Vignesh Raman

Update amdgpu-stoney-fails, mediatek-mt8173-flakes, mediatek-mt8173-fails, rockchip-rk3399-fails, rockchip-rk3399-flakes, rockchip-rk3288-flakes, i915-cml-fails, i915-cml-flakes, msm-apq8016-flakes files.

Add tests that fail sometimes into the *-flakes file and tests that are failing into the *-fails file.

---

v2:
- No changes

v3:
- No changes

v4:
- No changes

---
 .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt    |  1 -
 drivers/gpu/drm/ci/xfails/i915-cml-fails.txt     |  1 -
 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt    |  2 ++
 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt    |  1 +
 .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt  |  2 --
 .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 16 ++++++++++++++++
 drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt |  2 ++
 .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt |  1 +
 .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt  |  4 ++--
 .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt |  3 +++
 10 files changed, 27 insertions(+), 6 deletions(-)
drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt +0 -1
index bd9392536e7c..58bfded8a3fc 100644
@@ -1,7 +1,6 @@
 kms_addfb_basic@bad-pitch-65536,Fail
 kms_addfb_basic@bo-too-small,Fail
 kms_async_flips@invalid-async-flip,Fail
-kms_atomic@plane-immutable-zpos,Fail
 kms_atomic_transition@plane-toggle-modeset-transition,Fail
 kms_bw@linear-tiling-1-displays-2560x1440p,Fail
 kms_bw@linear-tiling-1-displays-3840x2160p,Fail
drivers/gpu/drm/ci/xfails/i915-cml-fails.txt +0 -1
index 6139b410e767..5f513c638beb 100644
@@ -1,4 +1,3 @@
-kms_color@ctm-0-25,Fail
 kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
 kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
 kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt +2 -0
index 0514a7b3fdb0..f06f1a5b16f9 100644
@@ -7,6 +7,8 @@ kms_bw@linear-tiling-3-displays-3840x2160p
 kms_bw@linear-tiling-4-displays-1920x1080p
 kms_bw@linear-tiling-4-displays-2560x1440p
 kms_bw@linear-tiling-4-displays-3840x2160p
+kms_color@ctm-0-25
+kms_cursor_legacy@torture-move
 kms_draw_crc@draw-method-xrgb8888-render-xtiled
 kms_flip@flip-vs-suspend
 kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling
drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt +1 -0
index fc41d13a2d56..3aee1f11ee90 100644
@@ -8,6 +8,7 @@ kms_bw@linear-tiling-3-displays-3840x2160p
 kms_bw@linear-tiling-4-displays-1920x1080p
 kms_bw@linear-tiling-4-displays-2560x1440p
 kms_bw@linear-tiling-4-displays-3840x2160p
+kms_cursor_legacy@torture-bo
 kms_flip@blocking-wf_vblank
 kms_flip@wf_vblank-ts-check
 kms_flip@wf_vblank-ts-check-interruptible
drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt +0 -2
index 671916067dba..c8e64bbfd480 100644
@@ -1,5 +1,4 @@
 kms_3d,Fail
-kms_addfb_basic@addfb25-bad-modifier,Fail
 kms_bw@linear-tiling-1-displays-1920x1080p,Fail
 kms_bw@linear-tiling-1-displays-2560x1440p,Fail
 kms_bw@linear-tiling-1-displays-3840x2160p,Fail
@@ -11,7 +10,6 @@ kms_bw@linear-tiling-3-displays-2560x1440p,Fail
 kms_bw@linear-tiling-3-displays-3840x2160p,Fail
 kms_color@pipe-A-invalid-gamma-lut-sizes,Fail
 kms_color@pipe-B-invalid-gamma-lut-sizes,Fail
-kms_force_connector_basic@force-connector-state,Fail
 kms_force_connector_basic@force-edid,Fail
 kms_force_connector_basic@force-load-detect,Fail
 kms_force_connector_basic@prune-stale-modes,Fail
drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt +16 -0
index e69de29bb2d1..9ed6722df2c2 100644
@@ -0,0 +1,16 @@
+core_setmaster_vs_auth
+kms_addfb_basic@addfb25-bad-modifier
+kms_color@invalid-gamma-lut-sizes
+kms_cursor_legacy@cursor-vs-flip-atomic
+kms_cursor_legacy@cursor-vs-flip-legacy
+kms_force_connector_basic@force-connector-state
+kms_hdmi_inject@inject-4k
+kms_plane_scaling@plane-scaler-with-pixel-format-unity-scaling
+kms_plane_scaling@plane-upscale-with-modifiers-20x20
+kms_plane_scaling@plane-upscale-with-pixel-format-20x20
+kms_plane_scaling@plane-upscale-with-rotation-20x20
+kms_plane_scaling@planes-downscale-factor-0-25-upscale-20x20
+kms_plane_scaling@planes-downscale-factor-0-5-upscale-20x20
+kms_plane_scaling@planes-downscale-factor-0-75-upscale-20x20
+kms_prop_blob@invalid-set-prop
+kms_prop_blob@invalid-set-prop-any
drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt +2 -0
index 0e3b60d3fade..cd48a8c1d569 100644
@@ -1,3 +1,5 @@
+kms_cursor_legacy@forked-bo
+kms_cursor_legacy@forked-move
 kms_force_connector_basic@force-connector-state
 kms_force_connector_basic@force-edid
 kms_force_connector_basic@force-load-detect
drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt +1 -0
index 45c54c75c899..081fe6f8d488 100644
@@ -1,6 +1,7 @@
 kms_addfb_basic@addfb25-bad-modifier
 kms_cursor_crc@.*
 kms_flip@basic-flip-vs-wf_vblank
+kms_flip@blocking-wf_vblank
 kms_invalid_mode@int-max-clock,Crash
 kms_pipe_crc_basic@.*
 kms_properties@connector-properties-atomic,Crash
drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt +2 -2
index 6db08ba6b008..029a3be3164d 100644
@@ -2,14 +2,13 @@ kms_color@legacy-gamma,Fail
 kms_color@pipe-A-legacy-gamma,Fail
 kms_color@pipe-B-legacy-gamma,Fail
 kms_flip@basic-flip-vs-wf_vblank,Fail
-kms_flip@blocking-wf_vblank,Fail
 kms_flip@dpms-vs-vblank-race,Fail
 kms_flip@flip-vs-absolute-wf_vblank,Fail
 kms_flip@flip-vs-absolute-wf_vblank-interruptible,Fail
 kms_flip@flip-vs-blocking-wf-vblank,Fail
 kms_flip@flip-vs-panning,Fail
 kms_flip@flip-vs-panning-interruptible,Fail
-kms_flip@flip-vs-wf_vblank-interruptible,Fail
+kms_flip@modeset-vs-vblank-race,Fail
 kms_flip@plain-flip-fb-recreate,Fail
 kms_flip@plain-flip-fb-recreate-interruptible,Fail
 kms_flip@plain-flip-ts-check,Fail
@@ -35,3 +34,4 @@ kms_plane_multiple@atomic-pipe-B-tiling-none,Fail
 kms_plane_multiple@tiling-none,Fail
 kms_prime@basic-crc,Fail
 kms_rmfb@close-fd,Fail
+kms_universal_plane@universal-plane-pipe-B-functional,Fail
drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt +3 -0
index 4c0539b4beaf..869426a02cbd 100644
@@ -1,7 +1,10 @@
 
+kms_color@gamma
 kms_cursor_crc@.*
+kms_flip@blocking-wf_vblank
 kms_flip@dpms-vs-vblank-race-interruptible
 kms_flip@flip-vs-expired-vblank
+kms_flip@flip-vs-wf_vblank-interruptible
 kms_flip@modeset-vs-vblank-race-interruptible
 kms_pipe_crc_basic@.*
 kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-A
Signature · 1 line
2.40.1
#6 lore raw

Re: [PATCH v4 5/7] drm: ci: Update xfails

Hi o/

Quoted 21 lines · Vignesh Raman

Update amdgpu-stoney-fails, mediatek-mt8173-flakes, mediatek-mt8173-fails, rockchip-rk3399-fails, rockchip-rk3399-flakes, rockchip-rk3288-flakes, i915-cml-fails, i915-cml-flakes, msm-apq8016-flakes files.

Add tests that fail sometimes into the *-flakes file and tests that are failing into the *-fails file.

---

v2:
- No changes

v3:
- No changes

v4:
- No changes

Quoted 12 lines
---
  .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt    |  1 -
  drivers/gpu/drm/ci/xfails/i915-cml-fails.txt     |  1 -
  drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt    |  2 ++
  drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt    |  1 +
  .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt  |  2 --
  .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 16 ++++++++++++++++
  drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt |  2 ++
  .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt |  1 +
  .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt  |  4 ++--
  .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt |  3 +++
  10 files changed, 27 insertions(+), 6 deletions(-)

I found an error in the script that updates the flakes from a pipeline, it was adding errors in *-flakes.txt instead of *-fails.txt even when it was consistently failing.

I have a partial fix where it works if -flakes.txt is empty (otherwise it duplicates flakes and fails) https://gitlab.freedesktop.org/-/snippets/7655

Could you please regenerate these files with this new version of the script?
Btw, I'm improving the script and I'll submit a RFC proposing to include it as a handy tool in ci folder.

Thanks,
Helen

Quoted 148 lines
drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt +0 -1
index bd9392536e7c..58bfded8a3fc 100644
@@ -1,7 +1,6 @@
  kms_addfb_basic@bad-pitch-65536,Fail
  kms_addfb_basic@bo-too-small,Fail
  kms_async_flips@invalid-async-flip,Fail
-kms_atomic@plane-immutable-zpos,Fail
  kms_atomic_transition@plane-toggle-modeset-transition,Fail
  kms_bw@linear-tiling-1-displays-2560x1440p,Fail
  kms_bw@linear-tiling-1-displays-3840x2160p,Fail
drivers/gpu/drm/ci/xfails/i915-cml-fails.txt +0 -1
index 6139b410e767..5f513c638beb 100644
@@ -1,4 +1,3 @@
-kms_color@ctm-0-25,Fail
  kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail
  kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail
  kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail
drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt +2 -0
index 0514a7b3fdb0..f06f1a5b16f9 100644
@@ -7,6 +7,8 @@ kms_bw@linear-tiling-3-displays-3840x2160p
  kms_bw@linear-tiling-4-displays-1920x1080p
  kms_bw@linear-tiling-4-displays-2560x1440p
  kms_bw@linear-tiling-4-displays-3840x2160p
+kms_color@ctm-0-25
+kms_cursor_legacy@torture-move
  kms_draw_crc@draw-method-xrgb8888-render-xtiled
  kms_flip@flip-vs-suspend
  kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling
drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt +1 -0
index fc41d13a2d56..3aee1f11ee90 100644
@@ -8,6 +8,7 @@ kms_bw@linear-tiling-3-displays-3840x2160p
  kms_bw@linear-tiling-4-displays-1920x1080p
  kms_bw@linear-tiling-4-displays-2560x1440p
  kms_bw@linear-tiling-4-displays-3840x2160p
+kms_cursor_legacy@torture-bo
  kms_flip@blocking-wf_vblank
  kms_flip@wf_vblank-ts-check
  kms_flip@wf_vblank-ts-check-interruptible
drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt +0 -2
index 671916067dba..c8e64bbfd480 100644
@@ -1,5 +1,4 @@
  kms_3d,Fail
-kms_addfb_basic@addfb25-bad-modifier,Fail
  kms_bw@linear-tiling-1-displays-1920x1080p,Fail
  kms_bw@linear-tiling-1-displays-2560x1440p,Fail
  kms_bw@linear-tiling-1-displays-3840x2160p,Fail
@@ -11,7 +10,6 @@ kms_bw@linear-tiling-3-displays-2560x1440p,Fail
  kms_bw@linear-tiling-3-displays-3840x2160p,Fail
  kms_color@pipe-A-invalid-gamma-lut-sizes,Fail
  kms_color@pipe-B-invalid-gamma-lut-sizes,Fail
-kms_force_connector_basic@force-connector-state,Fail
  kms_force_connector_basic@force-edid,Fail
  kms_force_connector_basic@force-load-detect,Fail
  kms_force_connector_basic@prune-stale-modes,Fail
drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt +16 -0
index e69de29bb2d1..9ed6722df2c2 100644
@@ -0,0 +1,16 @@
+core_setmaster_vs_auth
+kms_addfb_basic@addfb25-bad-modifier
+kms_color@invalid-gamma-lut-sizes
+kms_cursor_legacy@cursor-vs-flip-atomic
+kms_cursor_legacy@cursor-vs-flip-legacy
+kms_force_connector_basic@force-connector-state
+kms_hdmi_inject@inject-4k
+kms_plane_scaling@plane-scaler-with-pixel-format-unity-scaling
+kms_plane_scaling@plane-upscale-with-modifiers-20x20
+kms_plane_scaling@plane-upscale-with-pixel-format-20x20
+kms_plane_scaling@plane-upscale-with-rotation-20x20
+kms_plane_scaling@planes-downscale-factor-0-25-upscale-20x20
+kms_plane_scaling@planes-downscale-factor-0-5-upscale-20x20
+kms_plane_scaling@planes-downscale-factor-0-75-upscale-20x20
+kms_prop_blob@invalid-set-prop
+kms_prop_blob@invalid-set-prop-any
drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt +2 -0
index 0e3b60d3fade..cd48a8c1d569 100644
@@ -1,3 +1,5 @@
+kms_cursor_legacy@forked-bo
+kms_cursor_legacy@forked-move
  kms_force_connector_basic@force-connector-state
  kms_force_connector_basic@force-edid
  kms_force_connector_basic@force-load-detect
drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt +1 -0
index 45c54c75c899..081fe6f8d488 100644
@@ -1,6 +1,7 @@
  kms_addfb_basic@addfb25-bad-modifier
  kms_cursor_crc@.*
  kms_flip@basic-flip-vs-wf_vblank
+kms_flip@blocking-wf_vblank
  kms_invalid_mode@int-max-clock,Crash
  kms_pipe_crc_basic@.*
  kms_properties@connector-properties-atomic,Crash
drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt +2 -2
index 6db08ba6b008..029a3be3164d 100644
@@ -2,14 +2,13 @@ kms_color@legacy-gamma,Fail
  kms_color@pipe-A-legacy-gamma,Fail
  kms_color@pipe-B-legacy-gamma,Fail
  kms_flip@basic-flip-vs-wf_vblank,Fail
-kms_flip@blocking-wf_vblank,Fail
  kms_flip@dpms-vs-vblank-race,Fail
  kms_flip@flip-vs-absolute-wf_vblank,Fail
  kms_flip@flip-vs-absolute-wf_vblank-interruptible,Fail
  kms_flip@flip-vs-blocking-wf-vblank,Fail
  kms_flip@flip-vs-panning,Fail
  kms_flip@flip-vs-panning-interruptible,Fail
-kms_flip@flip-vs-wf_vblank-interruptible,Fail
+kms_flip@modeset-vs-vblank-race,Fail
  kms_flip@plain-flip-fb-recreate,Fail
  kms_flip@plain-flip-fb-recreate-interruptible,Fail
  kms_flip@plain-flip-ts-check,Fail
@@ -35,3 +34,4 @@ kms_plane_multiple@atomic-pipe-B-tiling-none,Fail
  kms_plane_multiple@tiling-none,Fail
  kms_prime@basic-crc,Fail
  kms_rmfb@close-fd,Fail
+kms_universal_plane@universal-plane-pipe-B-functional,Fail
drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt +3 -0
index 4c0539b4beaf..869426a02cbd 100644
@@ -1,7 +1,10 @@
 
+kms_color@gamma
  kms_cursor_crc@.*
+kms_flip@blocking-wf_vblank
  kms_flip@dpms-vs-vblank-race-interruptible
  kms_flip@flip-vs-expired-vblank
+kms_flip@flip-vs-wf_vblank-interruptible
  kms_flip@modeset-vs-vblank-race-interruptible
  kms_pipe_crc_basic@.*
  kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-A
author maintainer
#7 lore raw

PATCH v4 6/7 drm: ci: Enable new jobs

In reply to Vignesh Raman

Enable the following jobs, as the issues noted in the TODO comments have been resolved. This will ensure that these jobs are now included and executed as part of the CI/CD pipeline.

msm:apq8016:
TODO: current issue: it is not fiding the NFS root. Fix and remove this rule.

mediatek:mt8173:
TODO: current issue: device is hanging. Fix and remove this rule.

virtio_gpu:none:
TODO: current issue: malloc(): corrupted top size. Fix and remove this rule.

---

v2:
- Reworded the commit message

v3:
- No changes

v4:
- No changes

---
 drivers/gpu/drm/ci/test.yml | 9 ---------
 1 file changed, 9 deletions(-)
drivers/gpu/drm/ci/test.yml +0 -9
index e8503a533be0..ef694f619c3f 100644
@@ -108,9 +108,6 @@ msm:apq8016:
     RUNNER_TAG: google-freedreno-db410c
   script:
     - ./install/bare-metal/fastboot.sh
-  rules:
-    # TODO: current issue: it is not fiding the NFS root. Fix and remove this rule.
-    - when: never
 
 msm:apq8096:
   extends:
@@ -273,9 +270,6 @@ mediatek:mt8173:
     DEVICE_TYPE: mt8173-elm-hana
     GPU_VERSION: mt8173
     RUNNER_TAG: mesa-ci-x86-64-lava-mt8173-elm-hana
-  rules:
-    # TODO: current issue: device is hanging. Fix and remove this rule.
-    - when: never
 
 mediatek:mt8183:
   extends:
@@ -333,6 +327,3 @@ virtio_gpu:none:
     - debian/x86_64_test-gl
     - testing:x86_64
     - igt:x86_64
-  rules:
-    # TODO: current issue: malloc(): corrupted top size. Fix and remove this rule.
-    - when: never
\ No newline at end of file
Signature · 1 line
2.40.1
author maintainer
#8 lore raw

PATCH v4 7/7 drm: ci: Use scripts/config to enable/disable configs

In reply to Vignesh Raman

Instead of modifying files in git to enable/disable configs, use scripts/config on the .config file which will be used for building the kernel.

---

v2:
- Added a new patch in the series to use scripts/config to enable/disable configs

v3:
- No changes

v4:
- No changes

---
 drivers/gpu/drm/ci/build.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/ci/build.sh +7 -7
index 58b71538f489..bfe161b47951 100644
@@ -70,19 +70,19 @@ if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then
     fi
 fi
 
-for opt in $ENABLE_KCONFIGS; do
-  echo CONFIG_$opt=y >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config
-done
-for opt in $DISABLE_KCONFIGS; do
-  echo CONFIG_$opt=n >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config
-done
-
 if [[ -n "${MERGE_FRAGMENT}" ]]; then
     ./scripts/kconfig/merge_config.sh ${DEFCONFIG} drivers/gpu/drm/ci/${MERGE_FRAGMENT}
 else
     make `basename ${DEFCONFIG}`
 fi
 
+for opt in $ENABLE_KCONFIGS; do
+    ./scripts/config --enable CONFIG_$opt
+done
+for opt in $DISABLE_KCONFIGS; do
+    ./scripts/config --disable CONFIG_$opt
+done
+
 make ${KERNEL_IMAGE_NAME}
 
 mkdir -p /lava-files/
Signature · 1 line
2.40.1
#9 lore raw
In reply to Vignesh Raman
Quoted 16 lines · Vignesh Raman

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. This series is intended for drm branch drm-next.

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

Quoted 4 lines

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/[email protected]/

Jfyi, this patch got applied, see https://lore.kernel.org/lkml/[email protected]/

Regards,
Helen

Quoted 26 lines

Vignesh Raman (7):
drm: ci: igt_runner: Remove todo
drm: ci: Force db410c to host mode
drm: ci: virtio: Update ci variables
drm: ci: Enable regulator
drm: ci: Update xfails
drm: ci: Enable new jobs
drm: ci: Use scripts/config to enable/disable configs

  drivers/gpu/drm/ci/arm64.config                  |  1 +
  drivers/gpu/drm/ci/build.sh                      | 16 ++++++++--------
  drivers/gpu/drm/ci/igt_runner.sh                 |  1 -
  drivers/gpu/drm/ci/test.yml                      | 16 +++++-----------
  .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt    |  1 -
  drivers/gpu/drm/ci/xfails/i915-cml-fails.txt     |  1 -
  drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt    |  2 ++
  drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt    |  1 +
  .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt  |  2 --
  .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 16 ++++++++++++++++
  drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt |  2 ++
  .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt |  1 +
  .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt  |  4 ++--
  .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt |  3 +++
  14 files changed, 41 insertions(+), 26 deletions(-)