summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/ni.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-02-25 21:01:28 +0400
committerAlex Deucher <alexander.deucher@amd.com>2014-03-07 01:46:56 +0400
commitbc6a62955f6ea6aabe26292a21dbdd67f5b89b67 (patch)
treea2e3a7a1f45e3796ec72d47529d849f30ab099d1 /drivers/gpu/drm/radeon/ni.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/ni.c')
-rw-r--r--drivers/gpu/drm/radeon/ni.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index ea932ac66fc6..bf6300cfd62d 100644
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
@@ -2105,7 +2105,8 @@ int cayman_resume(struct radeon_device *rdev)
/* init golden registers */
ni_init_golden_registers(rdev);
- radeon_pm_resume(rdev);
+ if (rdev->pm.pm_method == PM_METHOD_DPM)
+ radeon_pm_resume(rdev);
rdev->accel_working = true;
r = cayman_startup(rdev);