aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-09-02 05:01:23 -0400
committerDave Airlie <airlied@gmail.com>2013-09-04 18:19:31 -0400
commitab62e7686172767f79be9d0d9beac92e22a5e6da (patch)
treeb478d6d4bd7ba87e80687d37bc5d6bfae126ddb4
parentd30645ae1830f458b3a4908a2f869dd53e0c179b (diff)
drm/radeon: protect ACPI calls with CONFIG_ACPI
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Alex Deucher <Alexander.Deucher@amd.com> Signed-off-by: Dave Airlie <airlied@gmail.com>
-rw-r--r--drivers/gpu/drm/radeon/ci_dpm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 916630fdc796..3cce533397c6 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -4208,6 +4208,7 @@ static void ci_request_link_speed_change_before_state_change(struct radeon_devic
4208 pi->pspp_notify_required = false; 4208 pi->pspp_notify_required = false;
4209 if (target_link_speed > current_link_speed) { 4209 if (target_link_speed > current_link_speed) {
4210 switch (target_link_speed) { 4210 switch (target_link_speed) {
4211#ifdef CONFIG_ACPI
4211 case RADEON_PCIE_GEN3: 4212 case RADEON_PCIE_GEN3:
4212 if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN3, false) == 0) 4213 if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN3, false) == 0)
4213 break; 4214 break;
@@ -4217,6 +4218,7 @@ static void ci_request_link_speed_change_before_state_change(struct radeon_devic
4217 case RADEON_PCIE_GEN2: 4218 case RADEON_PCIE_GEN2:
4218 if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN2, false) == 0) 4219 if (radeon_acpi_pcie_performance_request(rdev, PCIE_PERF_REQ_PECI_GEN2, false) == 0)
4219 break; 4220 break;
4221#endif
4220 default: 4222 default:
4221 pi->force_pcie_gen = ci_get_current_pcie_speed(rdev); 4223 pi->force_pcie_gen = ci_get_current_pcie_speed(rdev);
4222 break; 4224 break;
@@ -4248,7 +4250,9 @@ static void ci_notify_link_speed_change_after_state_change(struct radeon_device
4248 (ci_get_current_pcie_speed(rdev) > 0)) 4250 (ci_get_current_pcie_speed(rdev) > 0))
4249 return; 4251 return;
4250 4252
4253#ifdef CONFIG_ACPI
4251 radeon_acpi_pcie_performance_request(rdev, request, false); 4254 radeon_acpi_pcie_performance_request(rdev, request, false);
4255#endif
4252 } 4256 }
4253} 4257}
4254 4258