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

Commit 1f445210 authored by Leo Liu's avatar Leo Liu Committed by Alex Deucher
Browse files

drm/amdgpu: fix UVD suspend and resume for VI APU 



User space passed the same handle before suspend and after resume,
so we have remove the session and handle destroy, and keep the
firmware untouched.

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 2bd188d0

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

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

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



	/* Skip this for APU for now */

	if (!(adev->flags & AMD_IS_APU)) {

		r = amdgpu_uvd_suspend(adev);

		if (r)

			return r;



	}

	r = uvd_v6_0_hw_fini(adev);

	if (r)

		return r;
@@ -230,10 +232,12 @@ static int uvd_v6_0_resume(void *handle) 
	int r;

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



	/* Skip this for APU for now */

	if (!(adev->flags & AMD_IS_APU)) {

		r = amdgpu_uvd_resume(adev);

		if (r)

			return r;



	}

	r = uvd_v6_0_hw_init(adev);

	if (r)

		return r;