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

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

drm/amd/pp: Use amdgpu acpi helper functions in powerplay 



Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 589941e1

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

+1 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "pppcielanes.h"

#include "ppatomctrl.h"

#include "ppsmc.h"

#include "pp_acpi.h"

#include "amd_acpi.h"

#include "pp_psm.h"
@@ -895,8 +894,7 @@ 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 (acpi_atcs_functions_supported(hwmgr->device, ATCS_FUNCTION_PCIE_PERFORMANCE_REQUEST) &&

		acpi_atcs_functions_supported(hwmgr->device, ATCS_FUNCTION_PCIE_DEVICE_READY_NOTIFICATION))

	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,

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

+3 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/slab.h>

#include <asm/div64.h>

#include <drm/amdgpu_drm.h>

#include "pp_acpi.h"

#include "ppatomctrl.h"

#include "atombios.h"

#include "pptable_v1_0.h"
@@ -3615,13 +3614,13 @@ static int smu7_request_link_speed_change_before_state_change( 
	if (target_link_speed > current_link_speed) {

		switch (target_link_speed) {

		case PP_PCIEGen3:

			if (0 == acpi_pcie_perf_request(hwmgr->device, PCIE_PERF_REQ_GEN3, false))

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

				break;

			data->force_pcie_gen = PP_PCIEGen2;

			if (current_link_speed == PP_PCIEGen2)

				break;

		case PP_PCIEGen2:

			if (0 == acpi_pcie_perf_request(hwmgr->device, PCIE_PERF_REQ_GEN2, false))

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

				break;

		default:

			data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr);
@@ -3843,7 +3842,7 @@ static int smu7_notify_link_speed_change_after_state_change( 
				smu7_get_current_pcie_speed(hwmgr) > 0)

			return 0;



		if (acpi_pcie_perf_request(hwmgr->device, request, false)) {

		if (amdgpu_acpi_pcie_performance_request(hwmgr->adev, request, false)) {

			if (PP_PCIEGen2 == target_link_speed)

				pr_info("PSPP request to switch to Gen2 from Gen3 Failed!");

			else

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

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include "vega10_pptable.h"

#include "vega10_thermal.h"

#include "pp_debug.h"

#include "pp_acpi.h"

#include "amd_pcie_helpers.h"

#include "cgs_linux.h"

#include "ppinterrupt.h"