[AMD Official Use Only - Internal Distribution Only]
Reviewed by: Monk.Liu <monk....@amd.com>
------------------------------------------
Monk Liu | Cloud-GPU Core team
------------------------------------------
-----Original Message-----
From: Horace Chen <horace.c...@amd.com>
Sent: Wednesday, March 24, 2021 12:18 PM
To: amd-gfx@lists.freedesktop.org
Cc: Grodzovsky, Andrey <andrey.grodzov...@amd.com>; Quan, Evan
<evan.q...@amd.com>; Chen, Horace <horace.c...@amd.com>; Tuikov, Luben
<luben.tui...@amd.com>; Koenig, Christian <christian.koe...@amd.com>; Deucher,
Alexander <alexander.deuc...@amd.com>; Xiao, Jack <jack.x...@amd.com>; Zhang,
Hawking <hawking.zh...@amd.com>; Liu, Monk <monk....@amd.com>; Xu, Feifei
<feifei...@amd.com>; Wang, Kevin(Yang) <kevin1.w...@amd.com>; Xiaojie Yuan
<xiaojie.y...@amd.com>
Subject: [PATCH] drm/amdgpu: move vram recover into sriov full access
[what]
currently driver recover vram after full access, which may hit a corner case
that meanwhile another whole gpu reset may be triggered by another VF, which
will cause vram recover fail then fail the whole device reset.
[how]
move the recover vram into full access. So another bad VF will not disturb the
recover sequence for this vf.
Signed-off-by: Horace Chen <horace.c...@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index bcb2c66437a2..23d3bb761319 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -4103,11 +4103,11 @@ static int amdgpu_device_reset_sriov(struct
amdgpu_device *adev,
amdgpu_amdkfd_post_reset(adev);
error:
- amdgpu_virt_release_full_gpu(adev, true);
if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) {
amdgpu_inc_vram_lost(adev);
r = amdgpu_device_recover_vram(adev);
}
+ amdgpu_virt_release_full_gpu(adev, true);
return r;
}
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
