Mesa (main): meson: Bump libdrm for amdgpu to 2.4.107.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jul 5 17:52:16 UTC 2021
Module: Mesa
Branch: main
Commit: c88d1bace33d3d8905a674c1358dc952adb231ed
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c88d1bace33d3d8905a674c1358dc952adb231ed
Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date: Fri Jul 2 15:29:52 2021 +0200
meson: Bump libdrm for amdgpu to 2.4.107.
For capture/replay va stability.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10570>
---
.gitlab-ci.yml | 24 ++++++++++++------------
.gitlab-ci/container/build-libdrm.sh | 2 +-
meson.build | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a240d51fc1..56b90ce2f71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -304,7 +304,7 @@ x86_build-base:
- .fdo.container-build at debian
- .container
variables:
- MESA_IMAGE_TAG: &x86_build-base "2021-06-11-remove-unzip"
+ MESA_IMAGE_TAG: &x86_build-base "2021-07-02-bump-libdrm"
.use-x86_build-base:
extends:
@@ -322,7 +322,7 @@ x86_build:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &x86_build "2021-06-11-remove-unzip"
+ MESA_IMAGE_TAG: &x86_build "2021-07-02-bump-libdrm"
.use-x86_build:
extends:
@@ -339,7 +339,7 @@ i386_build:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &i386_build "2021-04-13-bullseye"
+ MESA_IMAGE_TAG: &i386_build "2021-07-02-bump-libdrm"
.use-i386_build:
extends:
@@ -356,7 +356,7 @@ ppc64el_build:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &ppc64el_build "2021-04-13-bullseye"
+ MESA_IMAGE_TAG: &ppc64el_build "2021-07-02-bump-libdrm"
.use-ppc64el_build:
extends:
@@ -373,7 +373,7 @@ s390x_build:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &s390x_build "2021-04-13-bullseye"
+ MESA_IMAGE_TAG: &s390x_build "2021-07-02-bump-libdrm"
.use-s390x_build:
extends:
@@ -390,7 +390,7 @@ android_build:
extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &android_build "2021-04-08-libdrm"
+ MESA_IMAGE_TAG: &android_build "2021-07-02-bump-libdrm"
.use-android_build:
extends:
@@ -406,7 +406,7 @@ android_build:
x86_test-base:
extends: x86_build-base
variables:
- MESA_IMAGE_TAG: &x86_test-base "2021-06-13-deqp-runner"
+ MESA_IMAGE_TAG: &x86_test-base "2021-07-02-bump-libdrm"
.use-x86_test-base:
extends:
@@ -424,13 +424,13 @@ x86_test-gl:
variables:
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2"
- MESA_IMAGE_TAG: &x86_test-gl "2021-06-30-vk-gl-cts-1.2.6.2"
+ MESA_IMAGE_TAG: &x86_test-gl "2021-07-02-bump-libdrm"
# Debian 11 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
- MESA_IMAGE_TAG: &x86_test-vk "2021-06-30-vk-gl-cts-1.2.6.2"
+ MESA_IMAGE_TAG: &x86_test-vk "2021-07-02-bump-libdrm"
# Debian 11 based ARM build image
arm_build:
@@ -440,7 +440,7 @@ arm_build:
tags:
- aarch64
variables:
- MESA_IMAGE_TAG: &arm_build "2021-06-11-remove-unzip"
+ MESA_IMAGE_TAG: &arm_build "2021-07-02-bump-libdrm"
.use-arm_build:
extends:
@@ -459,7 +459,7 @@ arm_build:
variables:
GIT_STRATEGY: fetch
KERNEL_URL: *kernel-rootfs-url
- MESA_ROOTFS_TAG: &kernel-rootfs "2021-06-30-vk-gl-cts-1.2.6.2"
+ MESA_ROOTFS_TAG: &kernel-rootfs "2021-07-02-bump-libdrm"
DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
script:
- .gitlab-ci/container/lava_build.sh
@@ -514,7 +514,7 @@ arm_test:
FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
MESA_ARM_BUILD_TAG: *arm_build
- MESA_IMAGE_TAG: &arm_test "2021-06-29-drop-webdav"
+ MESA_IMAGE_TAG: &arm_test "2021-07-02-bump-libdrm"
MESA_ROOTFS_TAG: *kernel-rootfs
.use-arm_test:
diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh
index 6e6fde2855e..e765f9322f8 100644
--- a/.gitlab-ci/container/build-libdrm.sh
+++ b/.gitlab-ci/container/build-libdrm.sh
@@ -2,7 +2,7 @@
set -ex
-export LIBDRM_VERSION=libdrm-2.4.105
+export LIBDRM_VERSION=libdrm-2.4.107
wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
diff --git a/meson.build b/meson.build
index c515f7fcacf..303414c4c3e 100644
--- a/meson.build
+++ b/meson.build
@@ -1493,7 +1493,7 @@ dep_libdrm_radeon = null_dep
dep_libdrm_nouveau = null_dep
dep_libdrm_intel = null_dep
-_drm_amdgpu_ver = '2.4.105'
+_drm_amdgpu_ver = '2.4.107'
_drm_radeon_ver = '2.4.71'
_drm_nouveau_ver = '2.4.102'
_drm_intel_ver = '2.4.75'
More information about the mesa-commit
mailing list