[AMD Official Use Only - General]

Reviewed-by: Candice Li <[email protected]>



Thanks,
Candice

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tao Zhou
Sent: Thursday, June 29, 2023 6:01 PM
To: [email protected]; Li, Candice <[email protected]>; Zhang, 
Hawking <[email protected]>; Yang, Stanley <[email protected]>; Chai, 
Thomas <[email protected]>
Cc: Zhou1, Tao <[email protected]>
Subject: [PATCH] drm/amdgpu: skip address adjustment for GFX RAS injection

The address parameter of GFX RAS injection isn't related to XGMI node
number, keep it unchanged.

Signed-off-by: Tao Zhou <[email protected]>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 046659bd4f9e..5371fbd3fe17 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -1163,7 +1163,8 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev,
        }

        /* Calculate XGMI relative offset */
-       if (adev->gmc.xgmi.num_physical_nodes > 1) {
+       if (adev->gmc.xgmi.num_physical_nodes > 1 &&
+           info->head.block != AMDGPU_RAS_BLOCK__GFX) {
                block_info.address =
                        amdgpu_xgmi_get_relative_phy_addr(adev,
                                                          block_info.address);
--
2.35.1

Reply via email to