Skip to content

Commit

Permalink
drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7
Browse files Browse the repository at this point in the history
The workaround is not required anymor and would result in
hangs during suspend/resume cycles if the uvd block were busy.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Tom St Denis authored and Alex Deucher committed Oct 26, 2017
1 parent fa2cd03 commit 4a0144b
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
Original file line number Diff line number Diff line change
@@ -592,24 +592,18 @@ static int uvd_v7_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_v7_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 = amdgpu_uvd_resume(adev);
if (r)
return r;

return uvd_v7_0_hw_init(adev);
}

0 comments on commit 4a0144b

Please sign in to comment.