[PATCH] drm/amdgpu:fix uvd ring fini routine(v2)

[Christian König]

Am 20.09.2017 um 11:31 schrieb Monk Liu:
> fix missing finish uvd enc_ring.
> v2:
> since the adev pointer check in already in ring_fini
> so drop the check outsider
>
> Change-Id: Ib74237ca5adcb3b128c9b751fced0b7db7b09e86
> Signed-off-by: Monk Liu <Monk.Liu at amd.com>

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

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index 331e34a..e8bd50c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -269,6 +269,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
>   
>   int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
>   {
> +	int i;
>   	kfree(adev->uvd.saved_bo);
>   
>   	amd_sched_entity_fini(&adev->uvd.ring.sched, &adev->uvd.entity);
> @@ -279,6 +280,9 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)
>   
>   	amdgpu_ring_fini(&adev->uvd.ring);
>   
> +	for (i = 0; i < AMDGPU_MAX_UVD_ENC_RINGS; ++i)
> +		amdgpu_ring_fini(&adev->uvd.ring_enc[i]);
> +
>   	release_firmware(adev->uvd.fw);
>   
>   	return 0;