[PATCH] drm/amdkfd: to fix cwsr hang issue

[Ji, Ruili]

From: Ruili Ji <ruili...@amd.com>

Starting from GC_11_0_4, flag trap_en should be enabled for trap handler.

Signed-off-by: Ruili Ji <ruili...@amd.com>
Signed-off-by: Aaron Liu <aaron....@amd.com>
Reviewed-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 ++--
 1 file changed, 2 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 0c1be91a87c6..b695d7a3058c 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -227,7 +227,7 @@ 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_GC_VERSION(q->device) < IP_VERSION(11, 0, 0) 
||
-                             KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0, 0) 
||
+                             KFD_GC_VERSION(q->device) > IP_VERSION(11, 0, 3) 
||
                              q->properties.is_dbg_wa;
        queue_input.skip_process_ctx_clear = 
qpd->pqm->process->debug_trap_enabled;
 
@@ -1808,7 +1808,7 @@ static int create_queue_cpsch(struct device_queue_manager 
*dqm, struct queue *q,
        q->properties.is_evicted = !!qpd->evicted;
        q->properties.is_dbg_wa = qpd->pqm->process->debug_trap_enabled &&
                        KFD_GC_VERSION(q->device) >= IP_VERSION(11, 0, 0) &&
-                       KFD_GC_VERSION(q->device) < IP_VERSION(12, 0, 0);
+                       KFD_GC_VERSION(q->device) <= IP_VERSION(11, 0, 3);
 
        if (qd)
                mqd_mgr->restore_mqd(mqd_mgr, &q->mqd, q->mqd_mem_obj, 
&q->gart_mqd_addr,
-- 
2.40.1