Commit fb120e84 authored by Ruili Ji's avatar Ruili Ji Committed by Alex Deucher
Browse files

drm/amdkfd: To enable traps for GC_11_0_4 and up 



Flag trap_en should be enabled for trap handler.

Signed-off-by: default avatarRuili Ji <ruiliji2@amd.com>
Signed-off-by: default avatarAaron Liu <aaron.liu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e6b27cf5

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	queue_input.skip_process_ctx_clear = qpd->pqm->process->debug_trap_enabled;



	queue_type = convert_to_mes_queue_type(q->properties.type);
@@ -1807,7 +1807,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,