Skip to content

Commit d3daa2c

Browse files
Tom St Denisalexdeucher
authored andcommitted
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: 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>
1 parent 8b95f4f commit d3daa2c

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -225,24 +225,18 @@ static int uvd_v6_0_suspend(void *handle)
225225
if (r)
226226
return r;
227227

228-
/* Skip this for APU for now */
229-
if (!(adev->flags & AMD_IS_APU))
230-
r = amdgpu_uvd_suspend(adev);
231-
232-
return r;
228+
return amdgpu_uvd_suspend(adev);
233229
}
234230

235231
static int uvd_v6_0_resume(void *handle)
236232
{
237233
int r;
238234
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
239235

240-
/* Skip this for APU for now */
241-
if (!(adev->flags & AMD_IS_APU)) {
242-
r = amdgpu_uvd_resume(adev);
243-
if (r)
244-
return r;
245-
}
236+
r = amdgpu_uvd_resume(adev);
237+
if (r)
238+
return r;
239+
246240
return uvd_v6_0_hw_init(adev);
247241
}
248242

0 commit comments

Comments
 (0)