drm/amdgpu: remove ras global recovery handling from ras_controller_int handler
authorLe Ma <Le.Ma@amd.com>
Mon, 21 Oct 2019 18:41:26 +0000 (02:41 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 5 Dec 2019 21:25:11 +0000 (16:25 -0500)
v2: add notification when ras controller interrupt generates

Signed-off-by: Le Ma <Le.Ma@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

index 0db458f..25231d6 100644 (file)
@@ -324,7 +324,12 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device
                                                RAS_CNTLR_INTERRUPT_CLEAR, 1);
                WREG32_SOC15(NBIO, 0, mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl);
 
-               amdgpu_ras_global_ras_isr(adev);
+               DRM_WARN("RAS controller interrupt triggered by NBIF error\n");
+
+               /* ras_controller_int is dedicated for nbif ras error,
+                * not the global interrupt for sync flood
+                */
+               amdgpu_ras_reset_gpu(adev, true);
        }
 }