diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2014-02-25 12:01:28 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2014-03-06 16:46:56 -0500 |
| commit | bc6a62955f6ea6aabe26292a21dbdd67f5b89b67 (patch) | |
| tree | a2e3a7a1f45e3796ec72d47529d849f30ab099d1 /drivers/gpu/drm/radeon/rv770.c | |
| parent | 14eedc32a3c0ec9dd70448a73763ee21feae3111 (diff) | |
| download | linux-bc6a62955f6ea6aabe26292a21dbdd67f5b89b67.tar.gz linux-bc6a62955f6ea6aabe26292a21dbdd67f5b89b67.tar.bz2 linux-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/rv770.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 4e37a42305d8..fef310773aad 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -1811,7 +1811,8 @@ int rv770_resume(struct radeon_device *rdev) /* init golden registers */ rv770_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 = rv770_startup(rdev); |