diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-07-11 10:42:33 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-07-11 10:42:33 +0200 |
commit | 011b1134b82c2750d83a299a1369c678845de45a (patch) | |
tree | a6a2ba6bfa62b02cb7b00a67c6f449d965140e5a /drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | |
parent | d329605287020c3d1c3b0dadc63d8208e7251382 (diff) | |
parent | ddae0ca2a8fe12d0e24ab10ba759c3fbd755ada8 (diff) | |
download | linux-011b1134b82c2750d83a299a1369c678845de45a.tar.gz linux-011b1134b82c2750d83a299a1369c678845de45a.tar.bz2 linux-011b1134b82c2750d83a299a1369c678845de45a.zip |
Merge branch 'sched/urgent' into sched/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h index c8980d5f6540..7021c4a66fb5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h @@ -46,7 +46,7 @@ struct amdgpu_iv_entry; #define AMDGPU_RAS_GPU_ERR_HBM_BIST_TEST(x) AMDGPU_GET_REG_FIELD(x, 7, 7) #define AMDGPU_RAS_GPU_ERR_SOCKET_ID(x) AMDGPU_GET_REG_FIELD(x, 10, 8) #define AMDGPU_RAS_GPU_ERR_AID_ID(x) AMDGPU_GET_REG_FIELD(x, 12, 11) -#define AMDGPU_RAS_GPU_ERR_HBM_ID(x) AMDGPU_GET_REG_FIELD(x, 13, 13) +#define AMDGPU_RAS_GPU_ERR_HBM_ID(x) AMDGPU_GET_REG_FIELD(x, 14, 13) #define AMDGPU_RAS_GPU_ERR_BOOT_STATUS(x) AMDGPU_GET_REG_FIELD(x, 31, 31) #define AMDGPU_RAS_BOOT_STATUS_POLLING_LIMIT 1000 |