summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/rs600.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-02-25 17:01:28 (GMT)
committerAlex Deucher <alexander.deucher@amd.com>2014-03-06 21:46:56 (GMT)
commitbc6a62955f6ea6aabe26292a21dbdd67f5b89b67 (patch)
treea2e3a7a1f45e3796ec72d47529d849f30ab099d1 /drivers/gpu/drm/radeon/rs600.c
parent14eedc32a3c0ec9dd70448a73763ee21feae3111 (diff)
downloadlinux-bc6a62955f6ea6aabe26292a21dbdd67f5b89b67.tar.xz
drm/radeon: resume old pm late
Moving the pm resume up in the init order to fix dpm seems to have regressed somes cases with the old pm code. Move it back to late resume. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rs600.c')
-rw-r--r--drivers/gpu/drm/radeon/rs600.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index fdcde76..72d3616 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -1048,8 +1048,6 @@ int rs600_resume(struct radeon_device *rdev)
/* Initialize surface registers */
radeon_surface_init(rdev);
- radeon_pm_resume(rdev);
-
rdev->accel_working = true;
r = rs600_startup(rdev);
if (r) {