docker/igt: update to v1.27.1

v1.27.x series is the first tagged series officially supporting discrete GPUs. Issue: VSMGWL-62119 Signed-off-by: Dmitry Rogozhkin <[email protected]>
intel · Mar 7, 2023 · 2cf6a28 · 2cf6a28
1 parent b722908
commit 2cf6a28
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 24 deletions.
diff --git a/docker/ubuntu20.04/intel-gfx/Dockerfile b/docker/ubuntu20.04/intel-gfx/Dockerfile
@@ -211,7 +211,7 @@ RUN apt-get update && \
 ARG IGT_REPO=https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
 RUN git clone $IGT_REPO /opt/build/igt
 RUN cd /opt/build/igt \
-  && git checkout 1869d560c550ac273f495076ead46f8a337fc20b \
+  && git checkout v1.27.1 \
   && meson build \
   --buildtype=release \
   --prefix=/opt/intel/samples \

diff --git a/docker/ubuntu20.04/native/Dockerfile b/docker/ubuntu20.04/native/Dockerfile
@@ -181,7 +181,7 @@ RUN apt-get update && \
 ARG IGT_REPO=https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
 RUN git clone $IGT_REPO /opt/build/igt
 RUN cd /opt/build/igt \
-  && git checkout 1869d560c550ac273f495076ead46f8a337fc20b \
+  && git checkout v1.27.1 \
   && meson build \
   --buildtype=release \
   --prefix=/opt/intel/samples \

diff --git a/docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile b/docker/ubuntu20.04/selfbuild-prodkmd/Dockerfile
@@ -378,7 +378,7 @@ RUN apt-get update && \
 ARG IGT_REPO=https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
 RUN git clone $IGT_REPO /opt/build/igt
 RUN cd /opt/build/igt \
-  && git checkout 1869d560c550ac273f495076ead46f8a337fc20b \
+  && git checkout v1.27.1 \
   && meson build \
   --buildtype=release \
   --prefix=/opt/intel/samples \

diff --git a/docker/ubuntu20.04/selfbuild/Dockerfile b/docker/ubuntu20.04/selfbuild/Dockerfile
@@ -378,7 +378,7 @@ RUN apt-get update && \
 ARG IGT_REPO=https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
 RUN git clone $IGT_REPO /opt/build/igt
 RUN cd /opt/build/igt \
-  && git checkout 1869d560c550ac273f495076ead46f8a337fc20b \
+  && git checkout v1.27.1 \
   && meson build \
   --buildtype=release \
   --prefix=/opt/intel/samples \

diff --git a/docker/ubuntu22.04/intel-gfx/Dockerfile b/docker/ubuntu22.04/intel-gfx/Dockerfile
@@ -211,7 +211,7 @@ RUN apt-get update && \
 ARG IGT_REPO=https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
 RUN git clone $IGT_REPO /opt/build/igt
 RUN cd /opt/build/igt \
-  && git checkout 1869d560c550ac273f495076ead46f8a337fc20b \
+  && git checkout v1.27.1 \
   && meson build \
   --buildtype=release \
   --prefix=/opt/intel/samples \

diff --git a/templates/intel-gpu-tools.m4 b/templates/intel-gpu-tools.m4
@@ -20,25 +20,8 @@ dnl # SOFTWARE.
 dnl #
 include(begin.m4)
 
-# We need igt older than the following commit to be able to select desired device
-# for intel_gpu_top on multi-gpu systems:
-#
-# commit a627439eb5e39d927306055b1e540ef5940d7396
-# Author: Ayaz A Siddiqui <[email protected]>
-# Date:   Fri Oct 23 23:21:58 2020 +0530
-#
-#    lib/igt_device_scan: Select intel as default vendor for intel_gpu_top
-#
-#    intel_gpu_top is selecting first discrete device as default drm subsystem.
-#    In case of multi-gpu system if the first device is not intel gpu
-#    then it will lead to an error while running intel_gpu_top.
-#
-#    Signed-off-by: Ayaz A Siddiqui <[email protected]>
-#    Cc: Petri Latvala <[email protected]>
-#    Cc: Zbigniew Kempczynski <[email protected]>
-#    Cc: Dixit Ashutosh <[email protected]>
-#    Reviewed-by: Zbigniew Kempczyński <[email protected]>
-DECLARE(`IGT_VER',`1869d560c550ac273f495076ead46f8a337fc20b')
+dnl v1.27 is the first tagged version supporting discrete Intel GPUs
+DECLARE(`IGT_VER',`v1.27.1')
 
 define(`IGT_BUILD_DEPS',`ca-certificates gcc bison flex git libcairo-dev libdrm-dev dnl
   libdw-dev libkmod-dev libpciaccess-dev libpixman-1-dev libprocps-dev libudev-dev dnl