提交 d3daa2c7 编写于 作者: T Tom St Denis 提交者: Alex Deucher

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: NTom St Denis <tom.stdenis@amd.com>
Acked-by: NAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: NLeo Liu <leo.liu@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 8b95f4f7
...@@ -225,11 +225,7 @@ static int uvd_v6_0_suspend(void *handle) ...@@ -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) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册