diff options
| author |   Graham Sider <Graham.Sider@amd.com> | 2022-05-05 15:07:36 -0400 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2022-05-10 17:53:11 -0400 |
| commit | 3055e5d155b246dd87766655a8a89af4ba8369af (patch) | |
| tree | b84ebaf14da66c031d792350f9ad6ea9a82bf8f5 | |
| parent | drm/amdgpu: Disable SDMA WPTR_POLL_ENABLE for sdma_v6_0 (diff) | |
| download | linux-dev-3055e5d155b246dd87766655a8a89af4ba8369af.tar.xz linux-dev-3055e5d155b246dd87766655a8a89af4ba8369af.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 |
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, |