drm/amdgpu: flag vram lost on baco reset for VI/CIK

VI/CIK BACO was inflight when this fix landed for SOC15/NV.
Add the fix to VI/CIK as well.

Acked-by: Evan Quan <evan.quan@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c
index 2d64d270725d019e84aee05765aa26ecbcdc2a58..b22a10b2d2014ee7adbe4cf1521eb5b6a1467711 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik.c
@@ -1346,10 +1346,13 @@ static int cik_asic_reset(struct amdgpu_device *adev)
 {
        int r;
 
-       if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)
+       if (cik_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
+               if (!adev->in_suspend)
+                       amdgpu_inc_vram_lost(adev);
                r = smu7_asic_baco_reset(adev);
-       else
+       } else {
                r = cik_asic_pci_config_reset(adev);
+       }
 
        return r;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 78e5cdc0c05887307eb2e5864619207a7b870d92..f1b171e30774cc6fbd309ed7a69247c27e9a0b65 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -783,10 +783,13 @@ static int vi_asic_reset(struct amdgpu_device *adev)
 {
        int r;
 
-       if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)
+       if (vi_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
+               if (!adev->in_suspend)
+                       amdgpu_inc_vram_lost(adev);
                r = smu7_asic_baco_reset(adev);
-       else
+       } else {
                r = vi_asic_pci_config_reset(adev);
+       }
 
        return r;
 }