aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/uvd_v4_2.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-08-28 18:12:59 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-08-30 16:31:12 -0400
commit2ce529dac71ae7753981a587932d074fdb248608 (patch)
tree4e41ab114f1404642f6b44c7f5dced56ec6487a0 /drivers/gpu/drm/radeon/uvd_v4_2.c
parentradeon kms: fix uninitialised hotplug work usage in r100_irq_process() (diff)
downloadlinux-dev-2ce529dac71ae7753981a587932d074fdb248608.tar.xz
linux-dev-2ce529dac71ae7753981a587932d074fdb248608.zip
drm/radeon: split out radeon_uvd_resume from uvd_v4_2_resume
For powergating, we just need to re-init the registers, there is no need to restore the uvd BOs. This just adds needless work when powergating uvd for playback while the system is on. We only need to restore the uvd BOs on an actual resume from suspend or when the driver loads. This fixes multi-stream UVD playback on KB systems. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/uvd_v4_2.c')
-rw-r--r--drivers/gpu/drm/radeon/uvd_v4_2.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/uvd_v4_2.c b/drivers/gpu/drm/radeon/uvd_v4_2.c
index d7e480786098..d04d5073eef2 100644
--- a/drivers/gpu/drm/radeon/uvd_v4_2.c
+++ b/drivers/gpu/drm/radeon/uvd_v4_2.c
@@ -39,11 +39,6 @@ int uvd_v4_2_resume(struct radeon_device *rdev)
{
uint64_t addr;
uint32_t size;
- int r;
-
- r = radeon_uvd_resume(rdev);
- if (r)
- return r;
/* programm the VCPU memory controller bits 0-27 */
addr = rdev->uvd.gpu_addr >> 3;