diff options
| author | Chris Zankel | 2013-09-06 02:12:08 +0200 |
|---|---|---|
| committer | Chris Zankel | 2013-09-06 02:12:08 +0200 |
| commit | 0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd (patch) | |
| tree | fc0354e4da0ff5ab8b8eb65d60d9a8359d02634d /drivers/gpu/drm/radeon/r600_dpm.c | |
| parent | Linux 3.11-rc2 (diff) | |
| parent | Linux 3.11 (diff) | |
| download | kernel-qcow2-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.tar.gz kernel-qcow2-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.tar.xz kernel-qcow2-linux-0bc2ba94a65d2cd2ad01004d2d3f94f31c6064bd.zip | |
Merge tag 'v3.11' into for_next
Update Xtensa tree to Linux 3.11 (merging)
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_dpm.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_dpm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600_dpm.c b/drivers/gpu/drm/radeon/r600_dpm.c index b88f54b134ab..e5c860f4ccbe 100644 --- a/drivers/gpu/drm/radeon/r600_dpm.c +++ b/drivers/gpu/drm/radeon/r600_dpm.c @@ -278,9 +278,9 @@ bool r600_dynamicpm_enabled(struct radeon_device *rdev) void r600_enable_sclk_control(struct radeon_device *rdev, bool enable) { if (enable) - WREG32_P(GENERAL_PWRMGT, 0, ~SCLK_PWRMGT_OFF); + WREG32_P(SCLK_PWRMGT_CNTL, 0, ~SCLK_PWRMGT_OFF); else - WREG32_P(GENERAL_PWRMGT, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF); + WREG32_P(SCLK_PWRMGT_CNTL, SCLK_PWRMGT_OFF, ~SCLK_PWRMGT_OFF); } void r600_enable_mclk_control(struct radeon_device *rdev, bool enable) |