From 2cf6a2858d9382850776948b578147b12c03a91f Mon Sep 17 00:00:00 2001 From: Dmitry Rogozhkin Date: Sun, 5 Mar 2023 08:17:49 -0800 Subject: [PATCH] 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 --- docker/ubuntu20.04/intel-gfx/Dockerfile | 2 +- docker/ubuntu20.04/native/Dockerfile | 2 +- .../ubuntu20.04/selfbuild-prodkmd/Dockerfile | 2 +- docker/ubuntu20.04/selfbuild/Dockerfile | 2 +- docker/ubuntu22.04/intel-gfx/Dockerfile | 2 +- templates/intel-gpu-tools.m4 | 21 ++----------------- 6 files changed, 7 insertions(+), 24 deletions(-) diff --git a/docker/ubuntu20.04/intel-gfx/Dockerfile b/docker/ubuntu20.04/intel-gfx/Dockerfile index b32382f5..7f54e46c 100644 --- 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 index 482f4f65..66e008fe 100644 --- 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 index 300e6c49..d47a5231 100644 --- 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 index 1f1c6981..77bb7308 100644 --- 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 index ffa4fa8f..c613e167 100644 --- 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 index 425aa9ae..1497ad0a 100644 --- 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 -# 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 -# Cc: Petri Latvala -# Cc: Zbigniew Kempczynski -# Cc: Dixit Ashutosh -# Reviewed-by: Zbigniew Kempczyński -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