diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 3cbf497b3604c..13ab66ac9a981 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2153,14 +2153,9 @@ static void amdgpu_ras_check_supported(struct amdgpu_device *adev)
 	} else {
 		/* driver only manages a few IP blocks RAS feature
 		 * when GPU is connected cpu through XGMI */
-		adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__SDMA |
-					 1 << AMDGPU_RAS_BLOCK__MMHUB);
-		/* This is temporary workaround to leverage ras_mask
-		 * to allow nable GFX RAS manually. Should be removed later
-		 */
-		if (amdgpu_ras_enable &&
-		    (amdgpu_ras_mask == 0xe))
-			adev->ras_hw_enabled |= 1 << AMDGPU_RAS_BLOCK__GFX;
+		adev->ras_hw_enabled |= (1 << AMDGPU_RAS_BLOCK__GFX |
+					   1 << AMDGPU_RAS_BLOCK__SDMA |
+					   1 << AMDGPU_RAS_BLOCK__MMHUB);
 	}
 
 	amdgpu_ras_get_quirks(adev);