Commit 86e8255f authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher

drm/amdgpu: add JPEG 4.0 RAS poison consumption handling

Register related irq handler.
Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea5309de
...@@ -81,6 +81,18 @@ static int jpeg_v4_0_sw_init(void *handle) ...@@ -81,6 +81,18 @@ static int jpeg_v4_0_sw_init(void *handle)
if (r) if (r)
return 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); r = amdgpu_jpeg_sw_init(adev);
if (r) if (r)
return r; return r;
...@@ -170,6 +182,8 @@ static int jpeg_v4_0_hw_fini(void *handle) ...@@ -170,6 +182,8 @@ static int jpeg_v4_0_hw_fini(void *handle)
RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS)) RREG32_SOC15(JPEG, 0, regUVD_JRBC_STATUS))
jpeg_v4_0_set_powergating_state(adev, AMD_PG_STATE_GATE); jpeg_v4_0_set_powergating_state(adev, AMD_PG_STATE_GATE);
amdgpu_irq_put(adev, &adev->jpeg.inst->irq, 0);
return 0; return 0;
} }
...@@ -527,6 +541,10 @@ static int jpeg_v4_0_process_interrupt(struct amdgpu_device *adev, ...@@ -527,6 +541,10 @@ static int jpeg_v4_0_process_interrupt(struct amdgpu_device *adev,
case VCN_4_0__SRCID__JPEG_DECODE: case VCN_4_0__SRCID__JPEG_DECODE:
amdgpu_fence_process(&adev->jpeg.inst->ring_dec); amdgpu_fence_process(&adev->jpeg.inst->ring_dec);
break; 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: default:
DRM_DEV_ERROR(adev->dev, "Unhandled interrupt: %d %d\n", DRM_DEV_ERROR(adev->dev, "Unhandled interrupt: %d %d\n",
entry->src_id, entry->src_data[0]); entry->src_id, entry->src_data[0]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment