[arch-commits] Commit in linux-lts/trunk (PKGBUILD fix-gpu-hang.patch)

[Andreas Radke]

    Date: Wednesday, November 3, 2021 @ 18:09:10
  Author: andyrtr
Revision: 427064

upgpkg: linux-lts 5.10.77-2: fix gpu hang regression - FS#72620

Added:
  linux-lts/trunk/fix-gpu-hang.patch
Modified:
  linux-lts/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 ++++++++--
 fix-gpu-hang.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-03 17:31:55 UTC (rev 427063)
+++ PKGBUILD	2021-11-03 18:09:10 UTC (rev 427064)
@@ -2,7 +2,7 @@
 
 pkgbase=linux-lts
 pkgver=5.10.77
-pkgrel=1
+pkgrel=2
 pkgdesc='LTS Linux'
 url="https://www.kernel.org/"
 arch=(x86_64)
@@ -18,6 +18,7 @@
   config         # the main kernel config file
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-gcc-plugins-modern-gcc-plugin-infrastructure-requres.patch
+  fix-gpu-hang.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -28,7 +29,8 @@
             'SKIP'
             '1bd3c9f284c568ca751db050e456f2053fc8f1ebfd6f7b2ef7d7e9f0ac6544df'
             '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e'
-            'bb935ad2467637966185b88d18a3f9be2f37d3acdc71ed361eae326ca898d6fc')
+            'bb935ad2467637966185b88d18a3f9be2f37d3acdc71ed361eae326ca898d6fc'
+            '8ca93ae059d95aa709b4e09d7e1ff4f31b4247745b2306f949520089998830b5')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -37,6 +39,10 @@
 prepare() {
   cd $_srcname
 
+  # fix amd gpu hang - https://bugs.archlinux.org/task/72620
+  # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.77&id=c21b4002214c1c7e7b627b9b53375612f7aab6db
+  patch -Rp1 -i ../fix-gpu-hang.patch
+
   echo "Setting version..."
   scripts/setlocalversion --save-scmversion
   echo "-$pkgrel" > localversion.10-pkgrel

Added: fix-gpu-hang.patch
===================================================================
--- fix-gpu-hang.patch	                        (rev 0)
+++ fix-gpu-hang.patch	2021-11-03 18:09:10 UTC (rev 427064)
@@ -0,0 +1,40 @@
+From c21b4002214c1c7e7b627b9b53375612f7aab6db Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig at amd.com>
+Date: Wed, 20 Oct 2021 19:19:46 +0200
+Subject: drm/ttm: fix memleak in ttm_transfered_destroy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit 0db55f9a1bafbe3dac750ea669de9134922389b5 upstream.
+
+We need to cleanup the fences for ghost objects as well.
+
+Signed-off-by: Christian König <christian.koenig at amd.com>
+Reported-by: Erhard F. <erhard_f at mailbox.org>
+Tested-by: Erhard F. <erhard_f at mailbox.org>
+Reviewed-by: Huang Rui <ray.huang at amd.com>
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=214029
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=214447
+CC: <stable at vger.kernel.org>
+Link: https://patchwork.freedesktop.org/patch/msgid/20211020173211.2247-1-christian.koenig@amd.com
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+---
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
+index fb2a25f8408fc..8fba425a76268 100644
+--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
++++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
+@@ -322,6 +322,7 @@ static void ttm_transfered_destroy(struct ttm_buffer_object *bo)
+ 	struct ttm_transfer_obj *fbo;
+ 
+ 	fbo = container_of(bo, struct ttm_transfer_obj, base);
++	dma_resv_fini(&fbo->base.base._resv);
+ 	ttm_bo_put(fbo->bo);
+ 	kfree(fbo);
+ }
+-- 
+cgit 1.2.3-1.el7
+