iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: pull ras controller int status only when ras enabled

Browse Source 
ras_controller_irq and athub_err_event_irq are only registered
when PCIE_BIF ras is marked as supported. as the result, the driver
also just need pull the int status in such case.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Hawking Zhang 2019-11-18 18:17:12 +08:00 committed by Alex Deucher
parent 5bdd0b72d6
commit 858a2bbad6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
View File

@ -55,6 +55,7 @@
#include "amdgpu_connectors.h" #include "amdgpu_connectors.h"
#include "amdgpu_trace.h" #include "amdgpu_trace.h"
#include "amdgpu_amdkfd.h" #include "amdgpu_amdkfd.h"
#include "amdgpu_ras.h"
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
@ -162,6 +163,7 @@ irqreturn_t amdgpu_irq_handler(int irq, void *arg)
* register to check whether the interrupt is triggered or not, and properly * register to check whether the interrupt is triggered or not, and properly
* ack the interrupt if it is there * ack the interrupt if it is there
*/ */
if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__PCIE_BIF)) {
if (adev->nbio.funcs && if (adev->nbio.funcs &&
adev->nbio.funcs->handle_ras_controller_intr_no_bifring) adev->nbio.funcs->handle_ras_controller_intr_no_bifring)
adev->nbio.funcs->handle_ras_controller_intr_no_bifring(adev); adev->nbio.funcs->handle_ras_controller_intr_no_bifring(adev);
@ -169,6 +171,7 @@ irqreturn_t amdgpu_irq_handler(int irq, void *arg)
if (adev->nbio.funcs && if (adev->nbio.funcs &&
adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring) adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring)
adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring(adev); adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring(adev);
}
return ret; return ret;
} }