diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-04-03 15:53:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-04-03 15:53:37 +1000 |
| commit | 526da2436b899605386bfd7faefc59d2f7a9930a (patch) | |
| tree | 1ef522ba341e970c84682047f17d91f2a64939ea /drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | |
| parent | 227bcf2c55c80cf61144b4ac2d5a29babee35b8b (diff) | |
| parent | dce8bd9137b88735dd0efc4e2693213d98c15913 (diff) | |
| download | linux-526da2436b899605386bfd7faefc59d2f7a9930a.tar.gz linux-526da2436b899605386bfd7faefc59d2f7a9930a.tar.bz2 linux-526da2436b899605386bfd7faefc59d2f7a9930a.zip | |
Merge tag 'amd-drm-next-6.15-2025-03-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-6.15-2025-03-27:
amdgpu:
- Guard against potential division by 0 in fan code
- Zero RPM support for SMU 14.0.2
- Properly handle SI and CIK support being disabled
- PSR fixes
- DML2 fixes
- DP Link training fix
- Vblank fixes
- RAS fixes
- Partitioning fix
- SDMA fix
- SMU 13.0.x fixes
- Rom fetching fix
- MES fixes
- Queue reset fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250328004749.3392457-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index bed2603ae4c4..ebf1f63d0442 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -77,6 +77,7 @@ const char *ras_block_string[] = { "jpeg", "ih", "mpio", + "mmsch", }; const char *ras_mca_block_string[] = { |