]> www.infradead.org Git - users/hch/configfs.git/commitdiff
drm/ci: uprev IGT
authorVignesh Raman <vignesh.raman@collabora.com>
Wed, 29 May 2024 02:40:47 +0000 (08:10 +0530)
committerHelen Koike <helen.koike@collabora.com>
Thu, 6 Jun 2024 14:36:50 +0000 (11:36 -0300)
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 <dmitry.baryshkov@linaro.org>
Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Helen Koike <helen.koike@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240529024049.356327-5-vignesh.raman@collabora.com
drivers/gpu/drm/ci/build-igt.sh
drivers/gpu/drm/ci/gitlab-ci.yml

index b7d2a49a6db3865b3641ef5c554df06e579621b4..eddb5f782a5e7531290752aab2a42a29aff1f9a5 100644 (file)
@@ -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
index 8f32de63d92eb31593073cb9e438fcb8fce3429c..1b29c3b6406bd2a5900fb88868f4748c6d2e3bd8 100644 (file)
@@ -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