diff options
| author |   John Clements <john.clements@amd.com> | 2020-10-21 16:20:42 +0800 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2020-10-21 23:06:23 -0400 |
| commit | e4eeceb73cb06b8fa379b94cbba77e6a0a032e43 (patch) | |
| tree | 7cb3125b72e8fdfaa606375f2cbf85a3a8053628 /drivers/gpu | |
| parent | drm/amd/pm: fix pcie information for sienna cichlid (diff) | |
| download | linux-dev-e4eeceb73cb06b8fa379b94cbba77e6a0a032e43.tar.xz linux-dev-e4eeceb73cb06b8fa379b94cbba77e6a0a032e43.zip | |
Revert drm/amdgpu: disable sienna chichlid UMC RAS
This reverts commit 265c280a4807419249644156654e5c40a235ea84.
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 8bf6a7c056bc..4e36551ab50b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1986,7 +1986,8 @@ static int amdgpu_ras_check_asic_type(struct amdgpu_device *adev) { if (adev->asic_type != CHIP_VEGA10 && adev->asic_type != CHIP_VEGA20 && - adev->asic_type != CHIP_ARCTURUS) + adev->asic_type != CHIP_ARCTURUS && + adev->asic_type != CHIP_SIENNA_CICHLID) return 1; else return 0; @@ -2030,7 +2031,6 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev, *supported = amdgpu_ras_enable == 0 ? 0 : *hw_supported & amdgpu_ras_mask; - adev->ras_features = *supported; } |