Skip to content
This repository has been archived by the owner on May 20, 2023. It is now read-only.

Commit

Permalink
upgpkg: linux-lts 5.10.77-3: fix gpu hang regression - FS#72620
Browse files Browse the repository at this point in the history
git-svn-id: file:///srv/repos/svn-packages/svn@427347 eb2447ed-0c53-47e4-bac8-5bc4a241df78
  • Loading branch information
andyrtr authored and svntogit committed Nov 4, 2021
1 parent 2f4de3e commit 4ea2153
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 3 deletions.
6 changes: 3 additions & 3 deletions trunk/PKGBUILD
Expand Up @@ -2,7 +2,7 @@

pkgbase=linux-lts
pkgver=5.10.77
pkgrel=2
pkgrel=3
pkgdesc='LTS Linux'
url="https://www.kernel.org/"
arch=(x86_64)
Expand All @@ -18,7 +18,7 @@ source=(
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
fix-gpu-hang.diff
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
Expand All @@ -41,7 +41,7 @@ prepare() {

# 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
patch -Rp1 -i ../fix-gpu-hang.diff

echo "Setting version..."
scripts/setlocalversion --save-scmversion
Expand Down
40 changes: 40 additions & 0 deletions trunk/fix-gpu-hang.diff
@@ -0,0 +1,40 @@
From c21b4002214c1c7e7b627b9b53375612f7aab6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@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@amd.com>
Reported-by: Erhard F. <erhard_f@mailbox.org>
Tested-by: Erhard F. <erhard_f@mailbox.org>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=214029
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=214447
CC: <stable@vger.kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20211020173211.2247-1-christian.koenig@amd.com
Signed-off-by: Greg Kroah-Hartman <gregkh@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

0 comments on commit 4ea2153

Please sign in to comment.