diff options
| author | Tao Zhou <[email protected]> | 2023-06-21 02:30:43 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2023-06-30 17:11:35 +0000 |
| commit | 4ff96bcc0d40b66bf3ddd6010830e9a4f9b85d53 (patch) | |
| tree | f7a1f90c657c4c1b00ef6a862cfbc883174ceea5 /drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | |
| parent | drm/amd/pm: add abnormal fan detection for smu 13.0.0 (diff) | |
| download | kernel-4ff96bcc0d40b66bf3ddd6010830e9a4f9b85d53.tar.gz kernel-4ff96bcc0d40b66bf3ddd6010830e9a4f9b85d53.zip | |
drm/amdgpu: check RAS irq existence for VCN/JPEG
No RAS irq is allowed.
Signed-off-by: Tao Zhou <[email protected]>
Reviewed-by: Hawking Zhang <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c index 3add4b4f0667..2ff2897fd1db 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c @@ -255,7 +255,8 @@ int amdgpu_jpeg_ras_late_init(struct amdgpu_device *adev, struct ras_common_if * if (amdgpu_ras_is_supported(adev, ras_block->block)) { for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) { - if (adev->jpeg.harvest_config & (1 << i)) + if (adev->jpeg.harvest_config & (1 << i) || + !adev->jpeg.inst[i].ras_poison_irq.funcs) continue; r = amdgpu_irq_get(adev, &adev->jpeg.inst[i].ras_poison_irq, 0); |