diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3817-drm-amd-pp-Clean-up-header-file-for-Vega10.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3817-drm-amd-pp-Clean-up-header-file-for-Vega10.patch | 138 |
1 files changed, 138 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3817-drm-amd-pp-Clean-up-header-file-for-Vega10.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3817-drm-amd-pp-Clean-up-header-file-for-Vega10.patch new file mode 100644 index 00000000..9b064dd3 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3817-drm-amd-pp-Clean-up-header-file-for-Vega10.patch @@ -0,0 +1,138 @@ +From 9e42b8479327ddf6c13e5e65b0ee0fa47cd01b56 Mon Sep 17 00:00:00 2001 +From: Rex Zhu <Rex.Zhu@amd.com> +Date: Fri, 16 Mar 2018 15:26:15 +0800 +Subject: [PATCH 3817/4131] drm/amd/pp: Clean up header file for Vega10 + +Change-Id: If8afeab878f696fa12695e2387770291882b2de8 +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Evan Quan <evan.quan@amd.com> +Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> +--- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 11 ++++++++++- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 2 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 1 - + drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 11 +---------- + drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 5 ----- + 6 files changed, 13 insertions(+), 18 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +index 0e82f90..52db8d3 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +@@ -28,7 +28,6 @@ + + #include "hwmgr.h" + #include "amd_powerplay.h" +-#include "vega10_smumgr.h" + #include "hardwaremanager.h" + #include "ppatomfwctrl.h" + #include "atomfirmware.h" +@@ -5023,6 +5022,16 @@ static const struct pp_hwmgr_func vega10_hwmgr_funcs = { + .set_power_limit = vega10_set_power_limit, + }; + ++int vega10_enable_smc_features(struct pp_hwmgr *hwmgr, ++ bool enable, uint32_t feature_mask) ++{ ++ int msg = enable ? PPSMC_MSG_EnableSmuFeatures : ++ PPSMC_MSG_DisableSmuFeatures; ++ ++ return smum_send_msg_to_smc_with_parameter(hwmgr, ++ msg, feature_mask); ++} ++ + int vega10_hwmgr_init(struct pp_hwmgr *hwmgr) + { + hwmgr->hwmgr_func = &vega10_hwmgr_funcs; +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +index 8f6c2cb..5339ea1 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +@@ -440,5 +440,7 @@ int vega10_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate); + int vega10_update_samu_dpm(struct pp_hwmgr *hwmgr, bool bgate); + int vega10_update_acp_dpm(struct pp_hwmgr *hwmgr, bool bgate); + int vega10_enable_disable_vce_dpm(struct pp_hwmgr *hwmgr, bool enable); ++int vega10_enable_smc_features(struct pp_hwmgr *hwmgr, ++ bool enable, uint32_t feature_mask); + + #endif /* _VEGA10_HWMGR_H_ */ +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c +index b1f74c7..12a7da8 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c +@@ -24,7 +24,6 @@ + #include "hwmgr.h" + #include "vega10_hwmgr.h" + #include "vega10_powertune.h" +-#include "vega10_smumgr.h" + #include "vega10_ppsmc.h" + #include "vega10_inc.h" + #include "pp_debug.h" +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +index 0c1707a..0147267 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +@@ -23,7 +23,6 @@ + + #include "vega10_thermal.h" + #include "vega10_hwmgr.h" +-#include "vega10_smumgr.h" + #include "vega10_ppsmc.h" + #include "vega10_inc.h" + #include "pp_soc15.h" +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +index af848de..1743bda 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +@@ -25,6 +25,7 @@ + #include "vega10_inc.h" + #include "pp_soc15.h" + #include "vega10_smumgr.h" ++#include "vega10_hwmgr.h" + #include "vega10_ppsmc.h" + #include "smu9_driver_if.h" + #include "ppatomctrl.h" +@@ -238,16 +239,6 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr, + return 0; + } + +-int vega10_enable_smc_features(struct pp_hwmgr *hwmgr, +- bool enable, uint32_t feature_mask) +-{ +- int msg = enable ? PPSMC_MSG_EnableSmuFeatures : +- PPSMC_MSG_DisableSmuFeatures; +- +- return vega10_send_msg_to_smc_with_parameter(hwmgr, +- msg, feature_mask); +-} +- + static int vega10_get_smc_features(struct pp_hwmgr *hwmgr, + uint32_t *features_enabled) + { +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h +index e8f8f78..424e868 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h +@@ -23,8 +23,6 @@ + #ifndef _VEGA10_SMUMANAGER_H_ + #define _VEGA10_SMUMANAGER_H_ + +-#include "vega10_hwmgr.h" +- + #define MAX_SMU_TABLE 5 + + struct smu_table_entry { +@@ -44,9 +42,6 @@ struct vega10_smumgr { + struct smu_table_array smu_tables; + }; + +-int vega10_enable_smc_features(struct pp_hwmgr *hwmgr, +- bool enable, uint32_t feature_mask); +- + + #endif + +-- +2.7.4 + |