Commit 49379032 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu: don't increment vram lost if we are in hibernation

We reset the GPU as part of our hibernation sequence so we need
to make sure we don't mark vram as lost in that case.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=111879Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8225630e
...@@ -317,9 +317,11 @@ static int nv_asic_reset(struct amdgpu_device *adev) ...@@ -317,9 +317,11 @@ static int nv_asic_reset(struct amdgpu_device *adev)
struct smu_context *smu = &adev->smu; struct smu_context *smu = &adev->smu;
if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) { if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
if (!adev->in_suspend)
amdgpu_inc_vram_lost(adev); amdgpu_inc_vram_lost(adev);
ret = smu_baco_reset(smu); ret = smu_baco_reset(smu);
} else { } else {
if (!adev->in_suspend)
amdgpu_inc_vram_lost(adev); amdgpu_inc_vram_lost(adev);
ret = nv_asic_mode1_reset(adev); ret = nv_asic_mode1_reset(adev);
} }
......
...@@ -558,11 +558,13 @@ static int soc15_asic_reset(struct amdgpu_device *adev) ...@@ -558,11 +558,13 @@ static int soc15_asic_reset(struct amdgpu_device *adev)
{ {
switch (soc15_asic_reset_method(adev)) { switch (soc15_asic_reset_method(adev)) {
case AMD_RESET_METHOD_BACO: case AMD_RESET_METHOD_BACO:
if (!adev->in_suspend)
amdgpu_inc_vram_lost(adev); amdgpu_inc_vram_lost(adev);
return soc15_asic_baco_reset(adev); return soc15_asic_baco_reset(adev);
case AMD_RESET_METHOD_MODE2: case AMD_RESET_METHOD_MODE2:
return soc15_mode2_reset(adev); return soc15_mode2_reset(adev);
default: default:
if (!adev->in_suspend)
amdgpu_inc_vram_lost(adev); amdgpu_inc_vram_lost(adev);
return soc15_asic_mode1_reset(adev); return soc15_asic_mode1_reset(adev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment