drm/amdgpu: Fix ineffective ras_mask settings

Check amdgpu_ras_mask to fix ineffective ras_mask setting
due to special asic without sram ecc enable but with poison
supported.

Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 2c94de305c696cb7456db8309488a1b84b352ff8..8ebab6f22e5a59079603acd27d8e50c766f12321 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -3652,6 +3652,7 @@ int amdgpu_ras_is_supported(struct amdgpu_device *adev,
             block == AMDGPU_RAS_BLOCK__SDMA ||
             block == AMDGPU_RAS_BLOCK__VCN ||
             block == AMDGPU_RAS_BLOCK__JPEG) &&
+               (amdgpu_ras_mask & (1 << block)) &&
            amdgpu_ras_is_poison_mode_supported(adev) &&
            amdgpu_ras_get_ras_block(adev, block, 0))
                ret = 1;