diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3670-drm-amd-pp-Use-amdgpu-acpi-helper-functions-in-power.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3670-drm-amd-pp-Use-amdgpu-acpi-helper-functions-in-power.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3670-drm-amd-pp-Use-amdgpu-acpi-helper-functions-in-power.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3670-drm-amd-pp-Use-amdgpu-acpi-helper-functions-in-power.patch new file mode 100644 index 00000000..e6adc8e5 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3670-drm-amd-pp-Use-amdgpu-acpi-helper-functions-in-power.patch @@ -0,0 +1,89 @@ +From b07b8dca684c3c8413ffb55b9ad6137782039eba Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Tue, 27 Feb 2018 18:27:54 +0800 +Subject: [PATCH 3670/4131] drm/amd/pp: Use amdgpu acpi helper functions in + powerplay + +Change-Id: I52e5e999d04981a259c840b171b78227a2051ead +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 | 4 +--- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 7 +++---- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 1 - + 3 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +index 7e1bd11..2889788 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +@@ -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, +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +index 255b736..e8f04b0 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +@@ -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" +@@ -3614,13 +3613,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); +@@ -3842,7 +3841,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 +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +index 9b749af..d89145c 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +@@ -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" +-- +2.7.4 + |