drm/amdkfd: check more client ids in interrupt handler
authorTao Zhou <tao.zhou1@amd.com>
Wed, 6 Jan 2021 03:43:27 +0000 (11:43 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 8 Jan 2021 20:18:25 +0000 (15:18 -0500)
Add check for SExSH clients in kfd interrupt handler.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c

index 0ca0327a39e5057ca3cbf9b1fc73513c7004eec8..74a460be077bf8c138e9748d10ff7022f44c7564 100644 (file)
@@ -56,7 +56,11 @@ static bool event_interrupt_isr_v9(struct kfd_dev *dev,
            client_id != SOC15_IH_CLIENTID_SDMA7 &&
            client_id != SOC15_IH_CLIENTID_VMC &&
            client_id != SOC15_IH_CLIENTID_VMC1 &&
-           client_id != SOC15_IH_CLIENTID_UTCL2)
+           client_id != SOC15_IH_CLIENTID_UTCL2 &&
+           client_id != SOC15_IH_CLIENTID_SE0SH &&
+           client_id != SOC15_IH_CLIENTID_SE1SH &&
+           client_id != SOC15_IH_CLIENTID_SE2SH &&
+           client_id != SOC15_IH_CLIENTID_SE3SH)
                return false;
 
        /* This is a known issue for gfx9. Under non HWS, pasid is not set
@@ -111,7 +115,11 @@ static void event_interrupt_wq_v9(struct kfd_dev *dev,
        vmid = SOC15_VMID_FROM_IH_ENTRY(ih_ring_entry);
        context_id = SOC15_CONTEXT_ID0_FROM_IH_ENTRY(ih_ring_entry);
 
-       if (client_id == SOC15_IH_CLIENTID_GRBM_CP) {
+       if (client_id == SOC15_IH_CLIENTID_GRBM_CP ||
+           client_id == SOC15_IH_CLIENTID_SE0SH ||
+           client_id == SOC15_IH_CLIENTID_SE1SH ||
+           client_id == SOC15_IH_CLIENTID_SE2SH ||
+           client_id == SOC15_IH_CLIENTID_SE3SH) {
                if (source_id == SOC15_INTSRC_CP_END_OF_PIPE)
                        kfd_signal_event_interrupt(pasid, context_id, 32);
                else if (source_id == SOC15_INTSRC_SQ_INTERRUPT_MSG)