summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
diff options
context:
space:
mode:
authorGraham Sider <Graham.Sider@amd.com>2022-05-05 22:07:36 +0300
committerAlex Deucher <alexander.deucher@amd.com>2022-05-11 00:53:11 +0300
commit3055e5d155b246dd87766655a8a89af4ba8369af (patch)
treeb84ebaf14da66c031d792350f9ad6ea9a82bf8f5 /drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
parentde4c8a7b028ee16e340745de107b17555d8dc925 (diff)
downloadlinux-3055e5d155b246dd87766655a8a89af4ba8369af.tar.xz
drm/amdkfd: Update event_interrupt_isr_v11 return
Add amdgpu_no_queue_eviction_on_vm_fault condition to event_interrupt_isr_v11 return. If no queue eviction on vm fault specified, function should return false for client/source ids specifying vm fault. Signed-off-by: Graham Sider <Graham.Sider@amd.com> Reviewed-by: Mukul Joshi <mukul.joshi@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c')
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
index 1431f0961769..a6fcbeeb7428 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c
@@ -267,10 +267,11 @@ static bool event_interrupt_isr_v11(struct kfd_dev *dev,
source_id == SOC15_INTSRC_SQ_INTERRUPT_MSG ||
source_id == SOC15_INTSRC_CP_BAD_OPCODE ||
source_id == SOC21_INTSRC_SDMA_TRAP ||
- client_id == SOC21_IH_CLIENTID_VMC ||
- ((client_id == SOC21_IH_CLIENTID_GFX) &&
- (source_id == UTCL2_1_0__SRCID__FAULT)) /*||
- KFD_IRQ_IS_FENCE(client_id, source_id)*/;
+ /* KFD_IRQ_IS_FENCE(client_id, source_id) || */
+ (((client_id == SOC21_IH_CLIENTID_VMC) ||
+ ((client_id == SOC21_IH_CLIENTID_GFX) &&
+ (source_id == UTCL2_1_0__SRCID__FAULT))) &&
+ !amdgpu_no_queue_eviction_on_vm_fault);
}
static void event_interrupt_wq_v11(struct kfd_dev *dev,