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>
---
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
--
2.40.1
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 <dmitry.baryshkov@linaro.org> > Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> Acked-by: Helen Koike <helen.koike@collabora.com> > --- > > 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
On Wed, May 29, 2024 at 08:10:47AM +0530, 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 <dmitry.baryshkov@linaro.org> > Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> > --- > > 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 Let's land this, then I'll ask to uprev to dc2d7fb4f978048b87707ea9ec32da748b01b378, which fixes an issue with the writeback tests on MSM devices. > > DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git > DEQP_RUNNER_GIT_TAG: v0.15.0 > -- > 2.40.1 > -- With best wishes Dmitry
Hi Dmitry, On 29/05/24 13:39, Dmitry Baryshkov wrote: > On Wed, May 29, 2024 at 08:10:47AM +0530, 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 <dmitry.baryshkov@linaro.org> >> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> >> --- >> >> 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 > > Let's land this, then I'll ask to uprev to > dc2d7fb4f978048b87707ea9ec32da748b01b378, which fixes an issue with the > writeback tests on MSM devices. Sure. Once this is merged, we can uprev to the latest IGT. Regards, Vignesh > >> >> DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git >> DEQP_RUNNER_GIT_TAG: v0.15.0 >> -- >> 2.40.1 >> >
On 5/29/2024 2:48 AM, Vignesh Raman wrote: > Hi Dmitry, > > On 29/05/24 13:39, Dmitry Baryshkov wrote: >> On Wed, May 29, 2024 at 08:10:47AM +0530, 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 <dmitry.baryshkov@linaro.org> >>> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> >>> --- >>> >>> 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 >> >> Let's land this, then I'll ask to uprev to >> dc2d7fb4f978048b87707ea9ec32da748b01b378, which fixes an issue with the >> writeback tests on MSM devices. > > Sure. Once this is merged, we can uprev to the latest IGT. > > Regards, > Vignesh > Thanks, yes moving to latest IGT after this is merged will be great. >> >>> DEQP_RUNNER_GIT_URL: >>> https://gitlab.freedesktop.org/anholt/deqp-runner.git >>> DEQP_RUNNER_GIT_TAG: v0.15.0 >>> -- >>> 2.40.1 >>> >>
© 2016 - 2024 Red Hat, Inc.