diff options
| author | Vignesh Raman <vignesh.raman@collabora.com> | 2024-05-29 08:10:47 +0530 |
|---|---|---|
| committer | Helen Koike <helen.koike@collabora.com> | 2024-06-06 11:36:50 -0300 |
| commit | 225d3de749d0c76564a59aaa3e5b772fce6f0cf7 (patch) | |
| tree | 09d203209b5886117a18579615946f5680bbc6fd /drivers/gpu/drm/ci | |
| parent | 0493be3ba118ecb928afd9fe807ef77aa42755ae (diff) | |
| download | lwn-225d3de749d0c76564a59aaa3e5b772fce6f0cf7.tar.gz lwn-225d3de749d0c76564a59aaa3e5b772fce6f0cf7.zip | |
drm/ci: uprev IGT
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
Diffstat (limited to 'drivers/gpu/drm/ci')
| -rw-r--r-- | drivers/gpu/drm/ci/build-igt.sh | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/ci/gitlab-ci.yml | 2 |
2 files changed, 5 insertions, 1 deletions
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 |