diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-24 13:54:50 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-24 13:54:50 +0200 |
| commit | f452cbd326dfa57c6f4ca8bc37879bf189f29cff (patch) | |
| tree | 830e766a9296497ade2d35da6a7836d0860622c4 /drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | |
| parent | 70102d77ff22dd88a0111b1c3bac5099ac5d0425 (diff) | |
| parent | 289af45508ca890585f329376d16e08f41f75bd5 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get the exynos fbdev updates.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h index ef38f4c93df0..17b3d1992e80 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h @@ -583,6 +583,10 @@ amdgpu_ras_block_to_ta(enum amdgpu_ras_block block) { return TA_RAS_BLOCK__FUSE; case AMDGPU_RAS_BLOCK__MCA: return TA_RAS_BLOCK__MCA; + case AMDGPU_RAS_BLOCK__VCN: + return TA_RAS_BLOCK__VCN; + case AMDGPU_RAS_BLOCK__JPEG: + return TA_RAS_BLOCK__JPEG; default: WARN_ONCE(1, "RAS ERROR: unexpected block id %d\n", block); return TA_RAS_BLOCK__UMC; |