drm/amdgpu: add JPEG 4.0 RAS poison consumption handling

Register related irq handler.

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
index aa5323c..3beb731 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
@@ -81,6 +81,18 @@ static int jpeg_v4_0_sw_init(void *handle)
        if (r)
                return r;
 
+       /* JPEG DJPEG POISON EVENT */
+       r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_VCN,
+                       VCN_4_0__SRCID_DJPEG0_POISON, &adev->jpeg.inst->irq);
+       if (r)
+               return r;
+
+       /* JPEG EJPEG POISON EVENT */
+       r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_VCN,
+                       VCN_4_0__SRCID_EJPEG0_POISON, &adev->jpeg.inst->irq);
+       if (r)
+               return r;
+
        r = amdgpu_jpeg_sw_init(adev);
        if (r)
                return r;
@@ -170,6 +182,8 @@ static int jpeg_v4_0_hw_fini(void *handle)
              RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS))
                jpeg_v4_0_set_powergating_state(adev, AMD_PG_STATE_GATE);
 
+       amdgpu_irq_put(adev, &adev->jpeg.inst->irq, 0);
+
        return 0;
 }
 
@@ -527,6 +541,10 @@ static int jpeg_v4_0_process_interrupt(struct amdgpu_device *adev,
        case VCN_4_0__SRCID__JPEG_DECODE:
                amdgpu_fence_process(&adev->jpeg.inst->ring_dec);
                break;
+       case VCN_4_0__SRCID_DJPEG0_POISON:
+       case VCN_4_0__SRCID_EJPEG0_POISON:
+               amdgpu_jpeg_process_poison_irq(adev, source, entry);
+               break;
        default:
                DRM_DEV_ERROR(adev->dev, "Unhandled interrupt: %d %d\n",
                          entry->src_id, entry->src_data[0]);