There are cases where HSA is not initialized when adding queues and
the ADD_QUEUE API should clear the MES process context instead of
SET_SHADER_DEBUGGER.

The only time ADD_QUEUE.skip_process_ctx_clear is required is for
debugger use cases and a debugged process is always runtime enabled
when adding a queue.

Tested-by: Shikai Guo <shikai....@amd.com>
Signed-off-by: Jonathan Kim <jonathan....@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index 6d07a5dd2648..77159b03a422 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -227,8 +227,10 @@ static int add_queue_mes(struct device_queue_manager *dqm, 
struct queue *q,
        queue_input.tba_addr = qpd->tba_addr;
        queue_input.tma_addr = qpd->tma_addr;
        queue_input.trap_en = !kfd_dbg_has_cwsr_workaround(q->device);
-       queue_input.skip_process_ctx_clear = 
qpd->pqm->process->debug_trap_enabled ||
-                                            
kfd_dbg_has_ttmps_always_setup(q->device);
+       queue_input.skip_process_ctx_clear =
+               qpd->pqm->process->runtime_info.runtime_state == 
DEBUG_RUNTIME_STATE_ENABLED &&
+                                               
(qpd->pqm->process->debug_trap_enabled ||
+                                                
kfd_dbg_has_ttmps_always_setup(q->device));
 
        queue_type = convert_to_mes_queue_type(q->properties.type);
        if (queue_type < 0) {
-- 
2.34.1

Reply via email to