Merge tag 'drm-next-2022-06-03-1' of git://anongit.freedesktop.org/drm/drm

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_irq.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index ea3e8c66211fd31ef66afa3185861a24de6faa3b..b4cf8717f554eaa4163b73bd87dac91026d93e81 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -193,20 +193,7 @@ static irqreturn_t amdgpu_irq_handler(int irq, void *arg)
        if (ret == IRQ_HANDLED)
                pm_runtime_mark_last_busy(dev->dev);
 
-       /* For the hardware that cannot enable bif ring for both ras_controller_irq
-         * and ras_err_evnet_athub_irq ih cookies, the driver has to poll status
-        * 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.ras &&
-                   adev->nbio.ras->handle_ras_controller_intr_no_bifring)
-                       adev->nbio.ras->handle_ras_controller_intr_no_bifring(adev);
-
-               if (adev->nbio.ras &&
-                   adev->nbio.ras->handle_ras_err_event_athub_intr_no_bifring)
-                       adev->nbio.ras->handle_ras_err_event_athub_intr_no_bifring(adev);
-       }
+       amdgpu_ras_interrupt_fatal_error_handler(adev);
 
        return ret;
 }