This is a note to let you know that I've just added the patch titled
drm/radeon: make fence wait in suballocator uninterrruptable
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-radeon-make-fence-wait-in-suballocator-uninterrruptable.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 dcbad727513d277144aee482b2ffbcd2255c37aa Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Wed, 6 Sep 2023 15:55:17 -0400
Subject: drm/radeon: make fence wait in suballocator uninterrruptable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit dcbad727513d277144aee482b2ffbcd2255c37aa upstream.
Commit 254986e324ad ("drm/radeon: Use the drm suballocation manager implementation.")
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.
Fixes: 254986e324ad ("drm/radeon: Use the drm suballocation manager implementation.")
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2769
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
CC: stable@xxxxxxxxxxxxxxx # 6.4+
CC: Simon Pilkington <simonp.git@xxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20230906195517.1345717-1-alexander.deucher@xxxxxxx
Signed-off-by: Christian König <christian.koenig@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/radeon_sa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/radeon/radeon_sa.c
+++ b/drivers/gpu/drm/radeon/radeon_sa.c
@@ -123,7 +123,7 @@ int radeon_sa_bo_new(struct radeon_sa_ma
unsigned int size, unsigned int align)
{
struct drm_suballoc *sa = drm_suballoc_new(&sa_manager->base, size,
- GFP_KERNEL, true, align);
+ GFP_KERNEL, false, align);
if (IS_ERR(sa)) {
*sa_bo = NULL;
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-6.5/drm-amd-display-fix-2nd-dpia-encoder-assignment.patch
queue-6.5/drm-amdkfd-insert-missing-tlb-flush-on-gfx10-and-later.patch
queue-6.5/drm-amd-display-adjust-the-mst-resume-flow.patch
queue-6.5/drm-amdgpu-update-ring-scheduler-info-as-needed.patch
queue-6.5/drm-amd-display-add-dpia-link-encoder-assignment-fix.patch
queue-6.5/drm-amd-display-blocking-invalid-420-modes-on-hdmi-t.patch-12335
queue-6.5/drm-amd-display-fix-underflow-issue-on-175hz-timing.patch
queue-6.5/drm-amd-display-blocking-invalid-420-modes-on-hdmi-t.patch
queue-6.5/drm-amd-display-use-dtbclk-as-refclk-instead-of-dpre.patch
queue-6.5/drm-amdgpu-increase-soft-ih-ring-size.patch
queue-6.5/revert-drm-amd-disable-s-g-for-apus-when-64gb-or-more-host-memory.patch
queue-6.5/drm-amd-display-use-max-memclk-variable-when-setting.patch
queue-6.5/drm-radeon-make-fence-wait-in-suballocator-uninterrruptable.patch
queue-6.5/drm-amd-display-fix-the-white-screen-issue-when-64gb-dram.patch
