diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-18 01:15:17 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-18 01:15:17 +0200 |
commit | 11634bd6682d5979fa10fdc01cd74577827377bd (patch) | |
tree | 22e3a3e7439ba30b15498113d24017b89e58cd39 /drivers/gpu/drm/radeon/ci_dpm.c | |
parent | 1d9dbf154295aa33819b08340464ff15495e83d8 (diff) | |
parent | 4cf465b579c20bee868464f5d664f8d2d96cd370 (diff) | |
download | linux-11634bd6682d5979fa10fdc01cd74577827377bd.tar.bz2 |
Merge branches 'acpi-scan' and 'acpi-video'
* acpi-scan:
ACPI / documentation: Remove reference to acpi_platform_device_ids from enumeration.txt
* acpi-video:
ACPI / video: Add use_native_backlight quirk for HP ProBook 4540s
Revert "ACPI / video: change acpi-video brightness_switch_enabled default to 0"
Diffstat (limited to 'drivers/gpu/drm/radeon/ci_dpm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/ci_dpm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index 10dae4106c08..584090ac3eb9 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -1179,7 +1179,7 @@ static int ci_stop_dpm(struct radeon_device *rdev) tmp &= ~GLOBAL_PWRMGT_EN; WREG32_SMC(GENERAL_PWRMGT, tmp); - tmp = RREG32(SCLK_PWRMGT_CNTL); + tmp = RREG32_SMC(SCLK_PWRMGT_CNTL); tmp &= ~DYNAMIC_PM_EN; WREG32_SMC(SCLK_PWRMGT_CNTL, tmp); |