[arch-commits] Commit in mesa/trunk (PKGBUILD intel-topology-query-fix-old-gens.patch)

[Laurent Carlier]

    Date: Wednesday, October 2, 2019 @ 16:33:12
  Author: lcarlier
Revision: 363662

upgpkg: mesa 19.2.0-2

fix FS#63945

Added:
  mesa/trunk/intel-topology-query-fix-old-gens.patch
Modified:
  mesa/trunk/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   11 ++++++--
 intel-topology-query-fix-old-gens.patch |   39 ++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-02 16:06:43 UTC (rev 363661)
+++ PKGBUILD	2019-10-02 16:33:12 UTC (rev 363662)
@@ -5,7 +5,7 @@
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
 pkgver=19.2.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
@@ -15,11 +15,13 @@
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
         LICENSE
-        glvnd.patch)
+        glvnd.patch
+	intel-topology-query-fix-old-gens.patch)
 sha512sums=('7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0'
             'SKIP'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7'
-            '3e5746dcd493bff3f04b26de6168b15d0f161de62c1c6657106b61cbb1ad4925cbf3a691d5055491e759f88dbe0362dc909e7d726f87528980662f26ceb6dcbc')
+            '3e5746dcd493bff3f04b26de6168b15d0f161de62c1c6657106b61cbb1ad4925cbf3a691d5055491e759f88dbe0362dc909e7d726f87528980662f26ceb6dcbc'
+            'a5e2ccef20edc81859255c66cb838c5244774d9d6c56dcfce2e462b6ddaa66ef7847242b050402305621c9c9e706629af30dd27c8466b6bd32d1be40cb3e53a0')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
               'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
@@ -29,7 +31,10 @@
 prepare() {
   cd mesa-$pkgver
 
+  # libglvnd-1.2.0 support
   patch -Np1 -i ${srcdir}/glvnd.patch
+  # Fix FS#63945
+  patch -Np1 -i ${srcdir}/intel-topology-query-fix-old-gens.patch
 }
 
 build() {

Added: intel-topology-query-fix-old-gens.patch
===================================================================
--- intel-topology-query-fix-old-gens.patch	                        (rev 0)
+++ intel-topology-query-fix-old-gens.patch	2019-10-02 16:33:12 UTC (rev 363662)
@@ -0,0 +1,39 @@
+From 712268730ec05897a6add995444123ac2af54382 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
+Date: Wed, 2 Oct 2019 17:13:06 +0300
+Subject: [PATCH] intel: fix topology query
+
+i915 will report ENODEV on generations prior to Haswell because there
+is no point in reporting values on those. This is prior any fusing
+could happen on parts with identical PCI ids.
+
+This query call was previously only triggered on generation that
+support performance queries, which happens to match generation for
+which i915 reports topology, but the commit pointed below started
+using it on all generations.
+
+Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
+Gitlab: https://gitlab.freedesktop.org/mesa/mesa/issues/1860
+Cc: <mesa-stable at lists.freedesktop.org>
+Fixes: 96e1c945f2 ("i965: Move device info initialization to common code")
+---
+ src/intel/dev/gen_device_info.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
+index 3953a1f4af3..85fa978f9c1 100644
+--- a/src/intel/dev/gen_device_info.c
++++ b/src/intel/dev/gen_device_info.c
+@@ -1320,6 +1320,9 @@ query_topology(struct gen_device_info *devinfo, int fd)
+    if (gen_ioctl(fd, DRM_IOCTL_I915_QUERY, &query))
+       return false;
+ 
++   if (item.length < 0)
++      return false;
++
+    struct drm_i915_query_topology_info *topo_info =
+       (struct drm_i915_query_topology_info *) calloc(1, item.length);
+    item.data_ptr = (uintptr_t) topo_info;
+-- 
+2.22.0
+