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

[Christian König]

Acked-by: Christian König <christian.koenig at amd.com>

Am 26.11.19 um 04:11 schrieb Quan, Evan:
> Acked-by: Evan Quan <evan.quan at amd.com>
>
>> -----Original Message-----
>> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex
>> Deucher
>> Sent: Tuesday, November 26, 2019 12:13 AM
>> To: amd-gfx at lists.freedesktop.org
>> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
>> Subject: [PATCH] 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.
>>
>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/cik.c | 7 +++++--
>> drivers/gpu/drm/amd/amdgpu/vi.c  | 7 +++++--
>>   2 files changed, 10 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/cik.c
>> b/drivers/gpu/drm/amd/amdgpu/cik.c
>> index 968bc706b94d..1dfe4a1337cf 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/cik.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/cik.c
>> @@ -1363,10 +1363,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 871c0b8c6b0b..e4f4201b3c34
>> 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/vi.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/vi.c
>> @@ -804,10 +804,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;
>>   }
>> --
>> 2.23.0
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.free
>> desktop.org%2Fmailman%2Flistinfo%2Famd-
>> gfx&data=02%7C01%7Cevan.quan%40amd.com%7C8a58026b66d248b27e
>> 2208d771c25518%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C1%7C637
>> 102951814200617&sdata=7lKNfG8NpzBKslKIoOvseyl2awlM1DcxSNntv%2F
>> UACjw%3D&reserved=0
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx