diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 08:10:55 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 08:10:55 +0100 |
| commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
| tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /drivers/gpu/drm/radeon/rv515.c | |
| parent | 676e1b2fcd9dbb47a59baac13d089621d22c68b8 (diff) | |
| parent | 6f976267da0e2c873c4b4aaacaf08266d1d1797d (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'drivers/gpu/drm/radeon/rv515.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv515.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index 98e8138ff779..237dd29d9f1c 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -586,8 +586,6 @@ int rv515_resume(struct radeon_device *rdev) /* Initialize surface registers */ radeon_surface_init(rdev); - radeon_pm_resume(rdev); - rdev->accel_working = true; r = rv515_startup(rdev); if (r) { |