Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bd188d0 authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: fix the UVD suspend sequence order 



Fixes suspend issues with UVD.

Signed-off-by: default avatarLeo Liu <leo.liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
parent 5146419e

drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c

+2 −2
Original line number Diff line number Diff line
@@ -224,11 +224,11 @@ static int uvd_v4_2_suspend(void *handle) 
	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	r = uvd_v4_2_hw_fini(adev);

	r = amdgpu_uvd_suspend(adev);

	if (r)

		return r;



	r = amdgpu_uvd_suspend(adev);

	r = uvd_v4_2_hw_fini(adev);

	if (r)

		return r;

drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c

+2 −2
Original line number Diff line number Diff line
@@ -220,11 +220,11 @@ static int uvd_v5_0_suspend(void *handle) 
	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	r = uvd_v5_0_hw_fini(adev);

	r = amdgpu_uvd_suspend(adev);

	if (r)

		return r;



	r = amdgpu_uvd_suspend(adev);

	r = uvd_v5_0_hw_fini(adev);

	if (r)

		return r;

drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c

+2 −2
Original line number Diff line number Diff line
@@ -214,11 +214,11 @@ static int uvd_v6_0_suspend(void *handle) 
	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	r = uvd_v6_0_hw_fini(adev);

	r = amdgpu_uvd_suspend(adev);

	if (r)

		return r;



	r = amdgpu_uvd_suspend(adev);

	r = uvd_v6_0_hw_fini(adev);

	if (r)

		return r;