diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rv6xx_dpm.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv6xx_dpm.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c index 8303de267ee5..65e33f387341 100644 --- a/drivers/gpu/drm/radeon/rv6xx_dpm.c +++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c | |||
@@ -1763,12 +1763,14 @@ void rv6xx_setup_asic(struct radeon_device *rdev) | |||
1763 | { | 1763 | { |
1764 | r600_enable_acpi_pm(rdev); | 1764 | r600_enable_acpi_pm(rdev); |
1765 | 1765 | ||
1766 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L0s) | 1766 | if (radeon_aspm != 0) { |
1767 | rv6xx_enable_l0s(rdev); | 1767 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L0s) |
1768 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L1) | 1768 | rv6xx_enable_l0s(rdev); |
1769 | rv6xx_enable_l1(rdev); | 1769 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_ASPM_L1) |
1770 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_TURNOFFPLL_ASPML1) | 1770 | rv6xx_enable_l1(rdev); |
1771 | rv6xx_enable_pll_sleep_in_l1(rdev); | 1771 | if (rdev->pm.dpm.platform_caps & ATOM_PP_PLATFORM_CAP_TURNOFFPLL_ASPML1) |
1772 | rv6xx_enable_pll_sleep_in_l1(rdev); | ||
1773 | } | ||
1772 | } | 1774 | } |
1773 | 1775 | ||
1774 | void rv6xx_dpm_display_configuration_changed(struct radeon_device *rdev) | 1776 | void rv6xx_dpm_display_configuration_changed(struct radeon_device *rdev) |