From: Jonathan Kim Date: Thu, 19 Jan 2023 23:42:03 +0000 (-0500) Subject: drm/amdgpu: remove unconditional trap enable on add gfx11 queues X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=60cd9bb28b973764b43dfa836fc0ac26745d54bd;p=users%2Fjedix%2Flinux-maple.git drm/amdgpu: remove unconditional trap enable on add gfx11 queues commit 2de3769830346e68b3de0f4abc0d8e2625ad9dac upstream. Rebase of driver has incorrect unconditional trap enablement for GFX11 when adding mes queues. Reported-by: Graham Sider Signed-off-by: Jonathan Kim Reviewed-by: Graham Sider Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.1.x Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c index 725876b4f02e..32b0ea8757fa 100644 --- 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 amdgpu_mes *mes, 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;