diff options
| author | Stanley.Yang <Stanley.Yang@amd.com> | 2026-07-14 17:45:50 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2026-07-28 19:17:31 -0400 |
| commit | 149f894a2a8bac181af7b979180e7578e2190bb0 (patch) | |
| tree | cfae292e7cd8f7f51335e0c2eef89fc7f8ecc110 | |
| parent | 1e1534778e21f12f2f9e9bc13781d386e97cd03e (diff) | |
| download | linux-next-149f894a2a8bac181af7b979180e7578e2190bb0.tar.gz linux-next-149f894a2a8bac181af7b979180e7578e2190bb0.zip | |
drm/amdgpu/ras: use vram_base_offset for UMC inject address
Cover both XGMI hive offset and A+A platform MC FB offset in one calculation.
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>
| -rw-r--r-- | drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c index c2285fde8b3c..f9ee297a6745 100644 --- a/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c +++ b/drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c @@ -73,15 +73,6 @@ static int amdgpu_ras_trigger_error_end(struct ras_core_context *ras_core, return 0; } -static uint64_t local_addr_to_xgmi_global_addr(struct ras_core_context *ras_core, - uint64_t addr) -{ - struct amdgpu_device *adev = (struct amdgpu_device *)ras_core->dev; - struct amdgpu_xgmi *xgmi = &adev->gmc.xgmi; - - return (addr + xgmi->physical_node_id * xgmi->node_segment_size); -} - /* * UMC error injection is dispatched by the RAS TA using the injection method * carried in struct ras_cmd_inject_error_req. Only the "coherent" methods @@ -154,9 +145,11 @@ static int amdgpu_ras_inject_error(struct ras_core_context *ras_core, return RAS_CMD__ERROR_INVALID_INPUT_DATA; } - /* Calculate XGMI relative offset */ - if (adev->gmc.xgmi.num_physical_nodes > 1) - req->address = local_addr_to_xgmi_global_addr(ras_core, req->address); + /* + * Calculate XGMI relative offset if in XGMI hive, + * adapt to A+A platform with mc fb offset calculated. + */ + req->address += adev->vm_manager.vram_base_offset; } } |