UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alex Deucher 2019-11-25 11:11:18 -05:00
parent a0c2a84dda
commit dea8b90029
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/amd/amdgpu/cik.c
View File

@ -1346,10 +1346,13 @@ static int cik_asic_reset(struct amdgpu_device *adev)
{ {
int r; 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); r = smu7_asic_baco_reset(adev);
else } else {
r = cik_asic_pci_config_reset(adev); r = cik_asic_pci_config_reset(adev);
}
return r; return r;
} }

7
drivers/gpu/drm/amd/amdgpu/vi.c
View File

@ -783,10 +783,13 @@ static int vi_asic_reset(struct amdgpu_device *adev)
{ {
int r; 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); r = smu7_asic_baco_reset(adev);
else } else {
r = vi_asic_pci_config_reset(adev); r = vi_asic_pci_config_reset(adev);
}
return r; return r;
} }