Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37a94791 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/pp: Add #ifdef checks for CONFIG_ACPI 



Fix compiling error when CONFIG_ACPI not enabled.

Change-Id: I5f901adbc799c10b30e5ea79f8f44760e749fae1
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
parent 586b9a4d

drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -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_UVDDPM);

	phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM);

	phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM);





#if defined(CONFIG_ACPI)

	if (amdgpu_acpi_is_pcie_performance_request_supported(hwmgr->adev))

	if (amdgpu_acpi_is_pcie_performance_request_supported(hwmgr->adev))

		phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest);

		phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest);

#endif





	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_DynamicPatchPowerState);

		PHM_PlatformCaps_DynamicPatchPowerState);

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -3596,6 +3596,7 @@ static int smu7_request_link_speed_change_before_state_change( 




	if (target_link_speed > current_link_speed) {

	if (target_link_speed > current_link_speed) {

		switch (target_link_speed) {

		switch (target_link_speed) {

#ifdef CONFIG_ACPI

		case PP_PCIEGen3:

		case PP_PCIEGen3:

			if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN3, false))

			if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN3, false))

				break;

				break;
@@ -3605,6 +3606,7 @@ static int smu7_request_link_speed_change_before_state_change( 
		case PP_PCIEGen2:

		case PP_PCIEGen2:

			if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN2, false))

			if (0 == amdgpu_acpi_pcie_performance_request(hwmgr->adev, PCIE_PERF_REQ_GEN2, false))

				break;

				break;

#endif

		default:

		default:

			data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr);

			data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr);

			break;

			break;