This is a note to let you know that I've just added the patch titled
drm/amdgpu: remove unconditional trap enable on add gfx11 queues
to the 6.1-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-amdgpu-remove-unconditional-trap-enable-on-add-gfx11-queues.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 2de3769830346e68b3de0f4abc0d8e2625ad9dac Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jonathan.kim@xxxxxxx>
Date: Thu, 19 Jan 2023 18:42:03 -0500
Subject: drm/amdgpu: remove unconditional trap enable on add gfx11 queues
From: Jonathan Kim <jonathan.kim@xxxxxxx>
commit 2de3769830346e68b3de0f4abc0d8e2625ad9dac upstream.
Rebase of driver has incorrect unconditional trap enablement
for GFX11 when adding mes queues.
Reported-by: Graham Sider <graham.sider@xxxxxxx>
Signed-off-by: Jonathan Kim <jonathan.kim@xxxxxxx>
Reviewed-by: Graham Sider <graham.sider@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # 6.1.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 1 -
1 file changed, 1 deletion(-)
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -192,7 +192,6 @@ static int mes_v11_0_add_hw_queue(struct
mes_add_queue_pkt.trap_handler_addr = input->tba_addr;
mes_add_queue_pkt.tma_addr = input->tma_addr;
mes_add_queue_pkt.is_kfd_process = input->is_kfd_process;
- mes_add_queue_pkt.trap_en = 1;
/* For KFD, gds_size is re-used for queue size (needed in MES for AQL queues) */
mes_add_queue_pkt.is_aql_queue = input->is_aql_queue;
Patches currently in stable-queue which might be from jonathan.kim@xxxxxxx are
queue-6.1/drm-amdgpu-remove-unconditional-trap-enable-on-add-gfx11-queues.patch
