Module: Mesa Branch: master Commit: 2c1e4c4baa81caa876d387d3c9ced7d0e8ed33d6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c1e4c4baa81caa876d387d3c9ced7d0e8ed33d6
Author: Leo Liu <leo....@amd.com> Date: Tue Jan 19 17:29:33 2021 -0500 meson: bump drm amdgpu version to 2.4.105 To include the INFO ioctl query for video caps Signed-off-by: Leo Liu <leo....@amd.com> Reviewed-by: Michel Dänzer <mdaen...@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10095> --- .gitlab-ci.yml | 18 +++++++++--------- .gitlab-ci/container/build-libdrm.sh | 2 +- .gitlab-ci/lava-gitlab-ci.yml | 2 +- meson.build | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 219a89f7dfd..ff3031b8e58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -313,7 +313,7 @@ x86_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &x86_build "2021-02-19-strace" + MESA_IMAGE_TAG: &x86_build "2021-04-08-libdrm" .use-x86_build: extends: @@ -330,7 +330,7 @@ i386_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &i386_build "2021-02-08-container-reorg" + MESA_IMAGE_TAG: &i386_build "2021-04-08-libdrm" .use-i386_build: extends: @@ -347,7 +347,7 @@ ppc64el_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &ppc64el_build "2021-02-08-container-reorg" + MESA_IMAGE_TAG: &ppc64el_build "2021-04-08-libdrm" .use-ppc64el_build: extends: @@ -364,7 +364,7 @@ s390x_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &s390x_build "2021-02-08-container-reorg" + MESA_IMAGE_TAG: &s390x_build "2021-04-08-libdrm" .use-s390x_build: extends: @@ -381,7 +381,7 @@ android_build: extends: - .use-x86_build-base variables: - MESA_IMAGE_TAG: &android_build "2021-02-08-container-reorg" + MESA_IMAGE_TAG: &android_build "2021-04-08-libdrm" .use-android_build: extends: @@ -413,13 +413,13 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-gl "2021-03-31-piglit" + MESA_IMAGE_TAG: &x86_test-gl "2021-04-08-libdrm" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2021-03-31-piglit" + MESA_IMAGE_TAG: &x86_test-vk "2021-04-08-libdrm" # Debian 10 based ARM build image arm_build: @@ -427,7 +427,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - MESA_IMAGE_TAG: &arm_build "2021-04-07-lavacli-1-1" + MESA_IMAGE_TAG: &arm_build "2021-04-08-libdrm" .use-arm_build: extends: @@ -448,7 +448,7 @@ kernel+rootfs_arm64-baremetal: variables: DEBIAN_ARCH: "arm64" KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-02-17-5.11.tar.gz"; - MESA_ROOTFS_TAG: &arm-baremetal "2021-03-31-piglit" + MESA_ROOTFS_TAG: &arm-baremetal "2021-04-08-libdrm" MINIO_SUFFIX: "baremetal" # Kernel & rootfs for armhf baremetal testing diff --git a/.gitlab-ci/container/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh index 9484fc36d8d..6e6fde2855e 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.102 +export LIBDRM_VERSION=libdrm-2.4.105 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 554f30d6451..7f93aa13678 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -14,7 +14,7 @@ variables: KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"; INSTALL_KERNEL_MODULES: 1 - MESA_ROOTFS_TAG: &lava-rootfs "2021-03-31-piglit" + MESA_ROOTFS_TAG: &lava-rootfs "2021-04-08-libdrm" MINIO_SUFFIX: "lava" PIGLIT_BUILD_TARGETS: "piglit_replayer" diff --git a/meson.build b/meson.build index 9d77bdd7a0b..1f36cbbf3cc 100644 --- a/meson.build +++ b/meson.build @@ -1452,7 +1452,7 @@ dep_libdrm_radeon = null_dep dep_libdrm_nouveau = null_dep dep_libdrm_intel = null_dep -_drm_amdgpu_ver = '2.4.100' +_drm_amdgpu_ver = '2.4.105' _drm_radeon_ver = '2.4.71' _drm_nouveau_ver = '2.4.102' _drm_intel_ver = '2.4.75' _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
