drm/amdgpu: remove unconditional trap enable on add gfx11 queues
Subsystems (2)
PATCH 1/1 drm/amdgpu: remove unconditional trap enable on add gfx11 queues
Rebase of driver has incorrect unconditional trap enablement for GFX11 when adding mes queues.
Reported-by Graham Sider <[email protected]>
Signed-off-by Jonathan Kim <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +0 -1
@@ -190,19 +190,18 @@ static int mes_v11_0_add_hw_queue(struct amdgpu_mes *mes, mes_add_queue_pkt.queue_type =convert_to_mes_queue_type (input->queue_type); mes_add_queue_pkt.paging = input->paging; mes_add_queue_pkt.vm_context_cntl = vm_cntx_cntl; mes_add_queue_pkt.gws_base = input->gws_base; mes_add_queue_pkt.gws_size = input->gws_size; 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; mes_add_queue_pkt.gds_size = input->queue_size;if (!(((adev->mes.sched_version &AMDGPU_MES_VERSION_MASK ) >=4 ) && (adev->ip_versions[GC_HWIP ][0 ] >=IP_VERSION (11 ,0 ,0 )) && (adev->ip_versions[GC_HWIP ][0 ] <=IP_VERSION (11 ,0 ,3 )))) mes_add_queue_pkt.trap_en =1 ;
Signature · 1 line
2.25.1
[AMD Official Use Only - General]
Reviewed-by Graham Sider <[email protected]>
-----Original Message-----
From: Kim, Jonathan <[email protected]>
Sent: Thursday, January 19, 2023 7:44 PM
To: [email protected]
Cc: Sider, Graham <[email protected]>; Kuehling, Felix <[email protected]>; Kim, Jonathan <[email protected]>; Sider, Graham <[email protected]>
Subject: [PATCH] drm/amdgpu: remove unconditional trap enable on add gfx11 queues
Rebase of driver has incorrect unconditional trap enablement for GFX11 when adding mes queues.
Reported-by Graham Sider <[email protected]>
Signed-off-by Jonathan Kim <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 1 - 1 file changed, 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +0 -1
@@ -190,19 +190,18 @@ static int mes_v11_0_add_hw_queue(struct amdgpu_mes *mes, mes_add_queue_pkt.queue_type =convert_to_mes_queue_type (input->queue_type); mes_add_queue_pkt.paging = input->paging; mes_add_queue_pkt.vm_context_cntl = vm_cntx_cntl; mes_add_queue_pkt.gws_base = input->gws_base; mes_add_queue_pkt.gws_size = input->gws_size; 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; mes_add_queue_pkt.gds_size = input->queue_size;if (!(((adev->mes.sched_version &AMDGPU_MES_VERSION_MASK ) >=4 ) && (adev->ip_versions[GC_HWIP ][0 ] >=IP_VERSION (11 ,0 ,0 )) && (adev->ip_versions[GC_HWIP ][0 ] <=IP_VERSION (11 ,0 ,3 )))) mes_add_queue_pkt.trap_en =1 ;
--
2.25.1