aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2018-03-06 01:42:24 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-03-07 16:10:11 -0500
commit37a94791a0977500e4309fc03e4b2513384eaa6d (patch)
tree1cef955b4a1466d40ed99f07c6b7743ac2804549 /drivers/gpu
parent586b9a4d7de9508ef714e5e913406376ba9c9623 (diff)
drm/amd/pp: Add #ifdef checks for CONFIG_ACPI
Fix compiling error when CONFIG_ACPI not enabled. Change-Id: I5f901adbc799c10b30e5ea79f8f44760e749fae1 Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c2
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
index 4b6cf795243c..af1b22d964fd 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
@@ -902,8 +902,10 @@ void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr)
902 phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_UVDDPM); 902 phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_UVDDPM);
903 phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM); 903 phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM);
904 904
905#if defined(CONFIG_ACPI)
905 if (amdgpu_acpi_is_pcie_performance_request_supported(hwmgr->adev)) 906 if (amdgpu_acpi_is_pcie_performance_request_supported(hwmgr->adev))
906 phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest); 907 phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest);
908#endif
907 909
908 phm_cap_set(hwmgr->platform_descriptor.platformCaps, 910 phm_cap_set(hwmgr->platform_descriptor.platformCaps,
909 PHM_PlatformCaps_DynamicPatchPowerState); 911 PHM_PlatformCaps_DynamicPatchPowerState);
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index d8c205cf8f12..d4d1d2e7e233 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -3596,6 +3596,7 @@ static int smu7_request_link_speed_change_before_state_change(
3596 3596
3597 if (target_link_speed > current_link_speed) { 3597 if (target_link_speed > current_link_speed) {
3598 switch (target_link_speed) { 3598 switch (target_link_speed) {
3599#ifdef CONFIG_ACPI
3599 case PP_PCIEGen3: 3600 case PP_PCIEGen3:
3600 if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN3, false)) 3601 if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN3, false))
3601 break; 3602 break;
@@ -3605,6 +3606,7 @@ static int smu7_request_link_speed_change_before_state_change(
3605 case PP_PCIEGen2: 3606 case PP_PCIEGen2:
3606 if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN2, false)) 3607 if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN2, false))
3607 break; 3608 break;
3609#endif
3608 default: 3610 default:
3609 data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr); 3611 data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr);
3610 break; 3612 break;