Skip to content

Commit

Permalink
drm/amdgpu: Enable GFX RAS by default
Browse files Browse the repository at this point in the history
Enable GFX RAS under generic RAS enablement path

Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: John Clements <john.clements@amd.com>
Change-Id: I41ccc83bee77c4f0c0f50379581cbaf0902a6afd
(cherry picked from commit a0020492cbeff6952d49b00148ff8b5fd47f4422)
(cherry picked from commit 1abe53dc78f9c2a495256ca8c1b08c08c38648a2)
  • Loading branch information
John Clements authored and Kent Russell committed Oct 13, 2021
1 parent 618513b commit 9d2b459
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit 9d2b459

Please sign in to comment.