aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r520.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-02-25 12:01:28 -0500
committerAlex Deucher <alexander.deucher@amd.com>2014-03-06 16:46:56 -0500
commitbc6a62955f6ea6aabe26292a21dbdd67f5b89b67 (patch)
treea2e3a7a1f45e3796ec72d47529d849f30ab099d1 /drivers/gpu/drm/radeon/r520.c
parentdrm/radeon: TTM must be init with cpu-visible VRAM, v2 (diff)
downloadlinux-dev-bc6a62955f6ea6aabe26292a21dbdd67f5b89b67.tar.xz
linux-dev-bc6a62955f6ea6aabe26292a21dbdd67f5b89b67.zip
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/r520.c')
-rw-r--r--drivers/gpu/drm/radeon/r520.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index e209eb75024f..98d6053c36c6 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -240,8 +240,6 @@ int r520_resume(struct radeon_device *rdev)
/* Initialize surface registers */
radeon_surface_init(rdev);
- radeon_pm_resume(rdev);
-
rdev->accel_working = true;
r = r520_startup(rdev);
if (r) {