summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Clements <john.clements@amd.com>2020-10-21 16:20:42 +0800
committerJohn Clements <john.clements@amd.com>2020-10-30 11:35:28 +0800
commitbd8209f4ca4cd34083d6d341d83b46fc11b8f056 (patch)
tree11beea090bf44d6b93e6729a35b2fd12200b32a4
parentb18a1416e629f52d96c967ffbc24a06ce23450ab (diff)
Revert drm/amdgpu: disable sienna chichlid UMC RAS
This reverts commit bbb645ecdf474d6134cb082693da95bcc9738131. Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com> Signed-off-by: John Clements <john.clements@amd.com> Change-Id: Ic89ba09069643a5bf9d90ffca48bf54e0aa77272
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c4
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 9e5ab7a8240f..6c57521b21fe 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -1942,7 +1942,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;
@@ -1986,7 +1987,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;
}