[arch-commits] Commit in mesa/trunk (2 files)

[Laurent Carlier]

    Date: Saturday, April 24, 2021 @ 16:03:23
  Author: lcarlier
Revision: 413832

upgpkg: mesa 21.0.3-2: fix FS#70554

Added:
  mesa/trunk/0001-amd-common-Add-missing-line-from-backport-for-cohere.patch
Modified:
  mesa/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch |   29 ++++++++++
 PKGBUILD                                                        |   11 +++
 2 files changed, 39 insertions(+), 1 deletion(-)

Added: 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch
===================================================================
--- 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch	                        (rev 0)
+++ 0001-amd-common-Add-missing-line-from-backport-for-cohere.patch	2021-04-24 16:03:23 UTC (rev 413832)
@@ -0,0 +1,29 @@
+From 93eb334093467272ad3028a62c515df3fb88bcb5 Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
+Date: Sat, 24 Apr 2021 16:23:43 +0200
+Subject: [PATCH] amd/common: Add missing line from backport for coherency.
+
+The line initializing the variable was missed.
+
+Fixes: ccc4abdbf4b ("ac/gpu_info: fix more non-coherent RB and GL2 combinations")
+Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
+---
+ src/amd/common/ac_gpu_info.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c
+index 47e6b8c332f..44728827197 100644
+--- a/src/amd/common/ac_gpu_info.c
++++ b/src/amd/common/ac_gpu_info.c
+@@ -710,6 +710,8 @@ bool ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
+       info->num_tcc_blocks = info->max_tcc_blocks;
+    }
+ 
++   info->tcc_rb_non_coherent = !util_is_power_of_two_or_zero(info->num_tcc_blocks);
++
+    info->mc_arb_ramcfg = amdinfo->mc_arb_ramcfg;
+    info->gb_addr_config = amdinfo->gb_addr_cfg;
+    if (info->chip_class >= GFX9) {
+-- 
+2.31.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-24 13:43:43 UTC (rev 413831)
+++ PKGBUILD	2021-04-24 16:03:23 UTC (rev 413832)
@@ -7,7 +7,7 @@
 pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=21.0.3
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
              'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
@@ -16,9 +16,11 @@
 url="https://www.mesa3d.org/"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+        0001-amd-common-Add-missing-line-from-backport-for-cohere.patch
         LICENSE)
 sha512sums=('4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f'
             'SKIP'
+            'f47c227dc888f2030491eaad42d42150539f2c9fc3bbc76d0fd46dc2d85482f520d929b01314cabb963dd36cc3729967f40c7bbfde28fc655024ef52d9fc71b7'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
@@ -27,6 +29,13 @@
               '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan at pnwbakers.com>
               '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at engestrom.ch>
 
+prepare() {
+  cd mesa-$pkgver
+
+  # fix FS#70554 - https://gitlab.freedesktop.org/mesa/mesa/-/issues/4691
+  patch -Np1 -i ../0001-amd-common-Add-missing-line-from-backport-for-cohere.patch
+}
+
 build() {
   arch-meson mesa-$pkgver build \
     -D b_lto=true \