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

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
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include "pppcielanes.h" #include "pppcielanes.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "ppsmc.h" #include "ppsmc.h"
#include "pp_acpi.h"
#include "amd_acpi.h" #include "amd_acpi.h"
#include "pp_psm.h" #include "pp_psm.h"
...@@ -895,8 +894,7 @@ void hwmgr_init_default_caps(struct pp_hwmgr *hwmgr) ...@@ -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_UVDDPM);
phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM); phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_VCEDPM);
if (acpi_atcs_functions_supported(hwmgr->device, ATCS_FUNCTION_PCIE_PERFORMANCE_REQUEST) && if (amdgpu_acpi_is_pcie_performance_request_supported(hwmgr->adev))
acpi_atcs_functions_supported(hwmgr->device, ATCS_FUNCTION_PCIE_DEVICE_READY_NOTIFICATION))
phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest); phm_cap_set(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_PCIEPerformanceRequest);
phm_cap_set(hwmgr->platform_descriptor.platformCaps, phm_cap_set(hwmgr->platform_descriptor.platformCaps,
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/div64.h> #include <asm/div64.h>
#include <drm/amdgpu_drm.h> #include <drm/amdgpu_drm.h>
#include "pp_acpi.h"
#include "ppatomctrl.h" #include "ppatomctrl.h"
#include "atombios.h" #include "atombios.h"
#include "pptable_v1_0.h" #include "pptable_v1_0.h"
...@@ -3615,13 +3614,13 @@ static int smu7_request_link_speed_change_before_state_change( ...@@ -3615,13 +3614,13 @@ 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) {
case PP_PCIEGen3: 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; break;
data->force_pcie_gen = PP_PCIEGen2; data->force_pcie_gen = PP_PCIEGen2;
if (current_link_speed == PP_PCIEGen2) if (current_link_speed == PP_PCIEGen2)
break; break;
case PP_PCIEGen2: 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; break;
default: default:
data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr); data->force_pcie_gen = smu7_get_current_pcie_speed(hwmgr);
...@@ -3843,7 +3842,7 @@ static int smu7_notify_link_speed_change_after_state_change( ...@@ -3843,7 +3842,7 @@ static int smu7_notify_link_speed_change_after_state_change(
smu7_get_current_pcie_speed(hwmgr) > 0) smu7_get_current_pcie_speed(hwmgr) > 0)
return 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) if (PP_PCIEGen2 == target_link_speed)
pr_info("PSPP request to switch to Gen2 from Gen3 Failed!"); pr_info("PSPP request to switch to Gen2 from Gen3 Failed!");
else else
......
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
#include "vega10_pptable.h" #include "vega10_pptable.h"
#include "vega10_thermal.h" #include "vega10_thermal.h"
#include "pp_debug.h" #include "pp_debug.h"
#include "pp_acpi.h"
#include "amd_pcie_helpers.h" #include "amd_pcie_helpers.h"
#include "cgs_linux.h" #include "cgs_linux.h"
#include "ppinterrupt.h" #include "ppinterrupt.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment