[PATCH 4/5] drm/amdgpu: always recover VRAM during GPU recovery

[Zhang, Jerry(Junwei)]

On 09/11/2018 05:56 PM, Christian König wrote:
> It shouldn't add much overhead and we should make sure that critical
> VRAM content is always restored.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>
Acked-by: Junwei Zhang <Jerry.Zhang at amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 93476b8c2e72..5eba66ecf668 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2989,7 +2989,7 @@ static int amdgpu_device_recover_vram_from_shadow(struct amdgpu_device *adev,
>   }
>   
>   /**
> - * amdgpu_device_handle_vram_lost - Handle the loss of VRAM contents
> + * amdgpu_device_recover_vram - Recover some VRAM contents
>    *
>    * @adev: amdgpu_device pointer
>    *
> @@ -2998,7 +2998,7 @@ static int amdgpu_device_recover_vram_from_shadow(struct amdgpu_device *adev,
>    * the contents of VRAM might be lost.
>    * Returns 0 on success, 1 on failure.
>    */
> -static int amdgpu_device_handle_vram_lost(struct amdgpu_device *adev)
> +static int amdgpu_device_recover_vram(struct amdgpu_device *adev)
>   {
>   	struct amdgpu_ring *ring = adev->mman.buffer_funcs_ring;
>   	struct amdgpu_bo *bo, *tmp;
> @@ -3125,8 +3125,8 @@ static int amdgpu_device_reset(struct amdgpu_device *adev)
>   		}
>   	}
>   
> -	if (!r && ((need_full_reset && !(adev->flags & AMD_IS_APU)) || vram_lost))
> -		r = amdgpu_device_handle_vram_lost(adev);
> +	if (!r)
> +		r = amdgpu_device_recover_vram(adev);
>   
>   	return r;
>   }
> @@ -3172,7 +3172,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
>   	amdgpu_virt_release_full_gpu(adev, true);
>   	if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) {
>   		atomic_inc(&adev->vram_lost_counter);
> -		r = amdgpu_device_handle_vram_lost(adev);
> +		r = amdgpu_device_recover_vram(adev);
>   	}
>   
>   	return r;