Commit 858a2bba authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

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



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: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5bdd0b72

drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c

+10 −7
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include "amdgpu_connectors.h"

#include "amdgpu_trace.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_ras.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

	 * ack the interrupt if it is there

	 */

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__PCIE_BIF)) {

		if (adev->nbio.funcs &&

		    adev->nbio.funcs->handle_ras_controller_intr_no_bifring)

			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 &&

		    adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring)

			adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring(adev);

	}



	return ret;

}