leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis 2017-10-23 11:27:35 -04:00 committed by Alex Deucher
parent 8b95f4f730
commit d3daa2c786
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
View File

@ -225,11 +225,7 @@ static int uvd_v6_0_suspend(void *handle)
if (r) if (r)
return r; return r;
/* Skip this for APU for now */ return amdgpu_uvd_suspend(adev);
if (!(adev->flags & AMD_IS_APU))
r = amdgpu_uvd_suspend(adev);
return r;
} }
static int uvd_v6_0_resume(void *handle) static int uvd_v6_0_resume(void *handle)
@ -237,12 +233,10 @@ static int uvd_v6_0_resume(void *handle)
int r; int r;
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
/* Skip this for APU for now */ r = amdgpu_uvd_resume(adev);
if (!(adev->flags & AMD_IS_APU)) { if (r)
r = amdgpu_uvd_resume(adev); return r;
if (r)
return r;
}
return uvd_v6_0_hw_init(adev); return uvd_v6_0_hw_init(adev);
} }