diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 09:10:55 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 09:10:55 +0200 |
| commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
| tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /drivers/gpu/drm/radeon/evergreen.c | |
| parent | of: Add support for ePAPR "stdout-path" property (diff) | |
| parent | of: add missing major vendors (diff) | |
| download | linux-d88cf7d7b4240b8df170ba105e414e476fb51cce.tar.xz linux-d88cf7d7b4240b8df170ba105e414e476fb51cce.zip | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 8a2c010b7dc5..27b0ff16082e 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -5299,7 +5299,8 @@ int evergreen_resume(struct radeon_device *rdev) /* init golden registers */ evergreen_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 = evergreen_startup(rdev); |