drm/amd/pp: Add #ifdef checks for CONFIG_ACPI
authorRex Zhu <Rex.Zhu@amd.com>
Tue, 6 Mar 2018 06:42:24 +0000 (14:42 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 7 Mar 2018 21:10:11 +0000 (16:10 -0500)
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>
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

index 4b6cf79..af1b22d 100644 (file)
@@ -902,8 +902,10 @@ void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr)
        phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_UVDDPM);
        phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM);
 
+#if defined(CONFIG_ACPI)
        if (amdgpu_acpi_is_pcie_performance_request_supported(hwmgr->adev))
                phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest);
+#endif
 
        phm_cap_set(hwmgr->platform_descriptor.platformCaps,
                PHM_PlatformCaps_DynamicPatchPowerState);
index d8c205c..d4d1d2e 100644 (file)
@@ -3596,6 +3596,7 @@ static int smu7_request_link_speed_change_before_state_change(
 
        if (target_link_speed > current_link_speed) {
                switch (target_link_speed) {
+#ifdef CONFIG_ACPI
                case PP_PCIEGen3:
                        if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN3, false))
                                break;
@@ -3605,6 +3606,7 @@ static int smu7_request_link_speed_change_before_state_change(
                case PP_PCIEGen2:
                        if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN2, false))
                                break;
+#endif
                default:
                        data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr);
                        break;