diff options
| author | Alex Deucher <[email protected]> | 2019-11-25 16:11:18 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2019-11-26 17:22:31 +0000 |
| commit | dea8b900293df57b6545bc195b50bbb649fe9741 (patch) | |
| tree | 7c0db047e228fd4f8ecbbe34f108d6d31d698383 /drivers/gpu/drm/amd/amdgpu/cik.c | |
| parent | MAINTAINERS: Drop Rex Zhu for amdgpu powerplay (diff) | |
| download | kernel-dea8b900293df57b6545bc195b50bbb649fe9741.tar.gz kernel-dea8b900293df57b6545bc195b50bbb649fe9741.zip | |
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 <[email protected]>
Acked-by: Christian König <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c b/drivers/gpu/drm/amd/amdgpu/cik.c index 2d64d270725d..b22a10b2d201 100644 --- 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; } |