Commit 3189501e authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: update VCN/JPEG RAS setting 



Support VCN/JPEG RAS in both bare metal and SRIOV environment.

v2: update commit description.

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 248c9635

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+13 −11
Original line number Diff line number Diff line
@@ -2348,10 +2348,17 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev) 


		if (amdgpu_atomfirmware_sram_ecc_supported(adev)) {

			dev_info(adev->dev, "SRAM ECC is active.\n");

			if (!amdgpu_sriov_vf(adev)) {

			if (!amdgpu_sriov_vf(adev))

				adev->ras_hw_enabled |= ~(1 << AMDGPU_RAS_BLOCK__UMC |

							    1 << AMDGPU_RAS_BLOCK__DF);

			else

				adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__PCIE_BIF |

								1 << AMDGPU_RAS_BLOCK__SDMA |

								1 << AMDGPU_RAS_BLOCK__GFX);



			/* VCN/JPEG RAS can be supported on both bare metal and

			 * SRIOV environment

			 */

			if (adev->ip_versions[VCN_HWIP][0] == IP_VERSION(2, 6, 0) ||

			    adev->ip_versions[VCN_HWIP][0] == IP_VERSION(4, 0, 0))

				adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__VCN |
@@ -2359,11 +2366,6 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev) 
			else

				adev->ras_hw_enabled &= ~(1 << AMDGPU_RAS_BLOCK__VCN |

							1 << AMDGPU_RAS_BLOCK__JPEG);

			} else {

				adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__PCIE_BIF |

								1 << AMDGPU_RAS_BLOCK__SDMA |

								1 << AMDGPU_RAS_BLOCK__GFX);

			}

		} else {

			dev_info(adev->dev, "SRAM ECC is not presented.\n");

		}