drm/amdgpu: Enable software RAS in vcn v4_0_3
authorHawking Zhang <Hawking.Zhang@amd.com>
Thu, 28 Sep 2023 09:00:31 +0000 (17:00 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 20 Oct 2023 19:11:26 +0000 (15:11 -0400)
Set VCN/JPEG RAS masks to enable software RAS for
VCN and JPEG.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

index a4384f0eb8bfb033535a2e91ecab222ffd8ca4f4..0df15d8560850ce37c8c1d92c176707481808806 100644 (file)
@@ -2622,7 +2622,9 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev)
                        if (amdgpu_ip_version(adev, VCN_HWIP, 0) ==
                                    IP_VERSION(2, 6, 0) ||
                            amdgpu_ip_version(adev, VCN_HWIP, 0) ==
-                                   IP_VERSION(4, 0, 0))
+                                   IP_VERSION(4, 0, 0) ||
+                           amdgpu_ip_version(adev, VCN_HWIP, 0) ==
+                                   IP_VERSION(4, 0, 3))
                                adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__VCN |
                                                        1 << AMDGPU_RAS_BLOCK__JPEG);
                        else