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

Commit d3daa2c7 authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Remove workaround check for UVD6 on APUs 



On APUs the uvd6 driver was skipping proper suspend/resume routines resulting
in a broken state upon resume.

Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarLeo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8b95f4f7

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

+5 −11
Original line number Diff line number Diff line
@@ -225,11 +225,7 @@ static int uvd_v6_0_suspend(void *handle) 
	if (r)

		return r;



	/* Skip this for APU for now */

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

		r = amdgpu_uvd_suspend(adev);



	return r;

	return amdgpu_uvd_suspend(adev);

}



static int uvd_v6_0_resume(void *handle)
@@ -237,12 +233,10 @@ 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;

	}



	return uvd_v6_0_hw_init(adev);

}