This is a note to let you know that I've just added the patch titled
drm/amd: Make fence wait in suballocator uninterruptible
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-make-fence-wait-in-suballocator-uninterruptible.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e2884fe84a83c562346eb9d92783a3576ce67177 Mon Sep 17 00:00:00 2001
From: Simon Pilkington <simonp.git@xxxxxxxxx>
Date: Fri, 1 Sep 2023 08:17:38 +0100
Subject: drm/amd: Make fence wait in suballocator uninterruptible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Simon Pilkington <simonp.git@xxxxxxxxx>
commit e2884fe84a83c562346eb9d92783a3576ce67177 upstream.
Commit c103a23f2f29
("drm/amd: Convert amdgpu to use suballocation helper.")
made the fence wait in amdgpu_sa_bo_new() interruptible but there is no
code to handle an interrupt. This caused the kernel to randomly explode
in high-VRAM-pressure situations so make it uninterruptible again.
Signed-off-by: Simon Pilkington <simonp.git@xxxxxxxxx>
Fixes: c103a23f2f29 ("drm/amd: Convert amdgpu to use suballocation helper.")
Reviewed-by: Christian König <christian.koenig@xxxxxxx>
Signed-off-by: Christian König <christian.koenig@xxxxxxx>
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2761
CC: stable@xxxxxxxxxxxxxxx # 6.4+
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
@@ -81,7 +81,7 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_ma
unsigned int size)
{
struct drm_suballoc *sa = drm_suballoc_new(&sa_manager->base, size,
- GFP_KERNEL, true, 0);
+ GFP_KERNEL, false, 0);
if (IS_ERR(sa)) {
*sa_bo = NULL;
Patches currently in stable-queue which might be from simonp.git@xxxxxxxxx are
queue-6.5/drm-amd-make-fence-wait-in-suballocator-uninterruptible.patch
queue-6.5/drm-radeon-make-fence-wait-in-suballocator-uninterrruptable.patch
