drm/amd/powerplay: move the API shared by SMU v11 to smu_v11_0.c
Subsystems (3)
PATCH 1/17 drm/amd/powerplay: move the API shared by SMU v11 to smu_v11_0.c
To fit our original desgin and this can help to maintain clear code layer.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 16 --------------- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 +- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ---- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 ++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++-- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 20 +++++++++++++++++-- 7 files changed, 26 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -16
@@ -675,22 +675,6 @@ static int smu_late_init(void *handle)return 0 ; } -int smu_get_atom_data_table (struct smu_context *smu,uint32_t table, -uint16_t *size,uint8_t *frev,uint8_t *crev, -uint8_t **addr) -{ -struct amdgpu_device *adev = smu->adev; -uint16_t data_start; - -if (!amdgpu_atom_parse_data_header (adev->mode_info.atom_context, table, - size, frev, crev, &data_start)) -return -EINVAL ; - - *addr = (uint8_t *)adev->mode_info.atom_context->bios + data_start; - -return 0 ; -} -static int smu_init_fb_allocations (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -1
@@ -488,7 +488,7 @@ static int arcturus_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -4
@@ -674,10 +674,6 @@ int smu_baco_exit(struct smu_context *smu);int smu_mode2_reset (struct smu_context *smu); -extern int smu_get_atom_data_table (struct smu_context *smu,uint32_t table, -uint16_t *size,uint8_t *frev,uint8_t *crev, -uint8_t **addr); -extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +4 -0
@@ -175,6 +175,10 @@ int smu_v11_0_fini_power(struct smu_context *smu);int smu_v11_0_check_fw_status (struct smu_context *smu); +int smu_v11_0_get_atom_data_table (struct smu_context *smu,uint32_t table, +uint16_t *size,uint8_t *frev,uint8_t *crev, +uint8_t **addr); +int smu_v11_0_setup_pptable (struct smu_context *smu);int smu_v11_0_get_vbios_bootup_values (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +2 -2
@@ -467,7 +467,7 @@ static int navi10_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;
@@ -487,7 +487,7 @@ static int navi10_append_powerplay_table(struct smu_context *smu) sizeof(*smc_dpm_table) - sizeof(smc_dpm_table->table_header));break ;case 7 :/* nv12 */ - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table_v4_7);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +1 -1
@@ -398,7 +398,7 @@ static int sienna_cichlid_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +18 -2
@@ -370,6 +370,22 @@ static int smu_v11_0_set_pptable_v2_1(struct smu_context *smu, void **table,return 0 ; } +int smu_v11_0_get_atom_data_table (struct smu_context *smu,uint32_t table, +uint16_t *size,uint8_t *frev,uint8_t *crev, +uint8_t **addr) +{ +struct amdgpu_device *adev = smu->adev; +uint16_t data_start; + +if (!amdgpu_atom_parse_data_header (adev->mode_info.atom_context, table, + size, frev, crev, &data_start)) +return -EINVAL ; + + *addr = (uint8_t *)adev->mode_info.atom_context->bios + data_start; + +return 0 ; +} +int smu_v11_0_setup_pptable (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;
@@ -406,7 +422,7 @@ int smu_v11_0_setup_pptable(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, powerplayinfo); - ret =smu_get_atom_data_table (smu, index, &atom_table_size, &frev, &crev, + ret =smu_v11_0_get_atom_data_table (smu, index, &atom_table_size, &frev, &crev, (uint8_t **)&table);if (ret)return ret;
@@ -621,7 +637,7 @@ int smu_v11_0_get_vbios_bootup_values(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, firmwareinfo); - ret =smu_get_atom_data_table (smu, index, &size, &frev, &crev, + ret =smu_v11_0_get_atom_data_table (smu, index, &size, &frev, &crev, (uint8_t **)&header);if (ret)return ret;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/17 drm/amd/powerplay: unify swSMU index to asic specific index mapping
By this we can drop redundant code.
--- drivers/gpu/drm/amd/powerplay/Makefile | 4 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 29 ++- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 51 +++-- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 50 +++++ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 15 -- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 56 ++++-- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 174 ++++++++++-------- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 156 +++++++++------- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 118 ++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 32 ++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 36 +++- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 5 +- 12 files changed, 526 insertions(+), 200 deletions(-) create mode 100644 drivers/gpu/drm/amd/powerplay/smu_cmn.c create mode 100644 drivers/gpu/drm/amd/powerplay/smu_cmn.h
drivers/gpu/drm/amd/powerplay/Makefile +3 -1
@@ -35,7 +35,9 @@ AMD_POWERPLAY = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/powerplay/,$( include $(AMD_POWERPLAY) -POWER_MGR = amd_powerplay.o amdgpu_smu.o smu_v11_0.o smu_v12_0.o arcturus_ppt.o navi10_ppt.o renoir_ppt.o sienna_cichlid_ppt.o +POWER_MGR = amd_powerplay.o amdgpu_smu.o smu_v11_0.o \ + smu_v12_0.o arcturus_ppt.o navi10_ppt.o \ + renoir_ppt.o sienna_cichlid_ppt.o smu_cmn.o AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR))
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +22 -7
@@ -34,6 +34,7 @@#include "sienna_cichlid_ppt.h" #include "renoir_ppt.h" #include "amd_pcie.h" +#include "smu_cmn.h" /* * DO NOT use these for err/warn/info/debug messages.
@@ -94,7 +95,9 @@ size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf) feature_mask[1], feature_mask[0]);for (i =0 ; i <SMU_FEATURE_COUNT ; i++) { - feature_index =smu_feature_get_index (smu, i); + feature_index =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + i);if (feature_index <0 )continue ; sort_feature[feature_index] = i;
@@ -392,7 +395,9 @@ int smu_update_table(struct smu_context *smu, enum smu_table_id table_index, intstruct smu_table_context *smu_table = &smu->smu_table;struct amdgpu_device *adev = smu->adev;struct smu_table *table = &smu_table->driver_table; -int table_id =smu_table_get_index (smu, table_index); +int table_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_TABLE , + table_index);uint32_t table_size;int ret =0 ;if (!table_data || table_id >=SMU_TABLE_COUNT || table_id <0 )
@@ -533,7 +538,9 @@ int smu_feature_is_enabled(struct smu_context *smu, enum smu_feature_mask mask)if (smu->is_apu)return 1 ; - feature_id =smu_feature_get_index (smu, mask); + feature_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + mask);if (feature_id <0 )return 0 ;
@@ -552,7 +559,9 @@ int smu_feature_set_enabled(struct smu_context *smu, enum smu_feature_mask mask,struct smu_feature *feature = &smu->smu_feature;int feature_id; - feature_id =smu_feature_get_index (smu, mask); + feature_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + mask);if (feature_id <0 )return -EINVAL ;
@@ -569,7 +578,9 @@ int smu_feature_is_supported(struct smu_context *smu, enum smu_feature_mask maskint feature_id;int ret =0 ; - feature_id =smu_feature_get_index (smu, mask); + feature_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + mask);if (feature_id <0 )return 0 ;
@@ -1300,7 +1311,9 @@ static int smu_disable_dpms(struct smu_context *smu)*/ if (use_baco &&smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT )) { features_to_disable =U64_MAX & - ~(1ULL <<smu_feature_get_index (smu,SMU_FEATURE_BACO_BIT )); + ~(1ULL <<smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , +SMU_FEATURE_BACO_BIT )); ret =smu_feature_update_enable_state (smu, features_to_disable,0 );
@@ -1868,7 +1881,9 @@ int smu_set_mp1_state(struct smu_context *smu, }/* some asics may not support those messages */ -if (smu_msg_get_index (smu, msg) <0 ) { +if (smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_MSG , + msg) <0 ) {mutex_unlock (&smu->mutex);return 0 ; }
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +40 -11
181 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +50 -0
68 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +0 -15
@@ -51,21 +51,6 @@#define MAX_DPM_LEVELS 16#define MAX_PCIE_CONF 2 -#define CLK_MAP (clk, index) \ - [SMU_##clk] = {1, (index)} - -#define FEA_MAP (fea) \ - [SMU_FEATURE_##fea##_BIT] = {1, FEATURE_##fea##_BIT} - -#define TAB_MAP (tab) \ - [SMU_TABLE_##tab] = {1, TABLE_##tab} - -#define PWR_MAP (tab) \ - [SMU_POWER_SOURCE_##tab] = {1, POWER_SOURCE_##tab} - -#define WORKLOAD_MAP (profile, workload) \ - [profile] = {1, (workload)} -#define CTF_OFFSET_EDGE 5#define CTF_OFFSET_HOTSPOT 5#define CTF_OFFSET_MEM 5
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +43 -13
187 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +95 -79
252 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +93 -63
282 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_cmn.c new file +118 -0
118 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_cmn.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __SMU_CMN_H__ +#define __SMU_CMN_H__ + +#include "amdgpu_smu.h" + +int smu_cmn_to_asic_specific_index (struct smu_context *smu, +enum smu_cmn2asic_mapping_type type, +uint32_t index); + +#endif
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +26 -10
@@ -36,6 +36,7 @@#include "soc15_common.h" #include "atom.h" #include "amdgpu_ras.h" +#include "smu_cmn.h" #include "asic_reg/thm/thm_11_0_2_offset.h" #include "asic_reg/thm/thm_11_0_2_sh_mask.h"
@@ -107,7 +108,9 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,struct amdgpu_device *adev = smu->adev;int ret =0 , index =0 ; - index =smu_msg_get_index (smu, msg); + index =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_MSG , + msg);if (index <0 )return index == -EACCES ?0 : index;
@@ -947,11 +950,13 @@ smu_v11_0_get_max_sustainable_clock(struct smu_context *smu, uint32_t *clock,int ret =0 ;int clk_id; -if ((smu_msg_get_index (smu, SMU_MSG_GetDcModeMaxDpmFreq) <0 ) || - (smu_msg_get_index (smu, SMU_MSG_GetMaxDpmFreq) <0 )) +if ((smu_cmn_to_asic_specific_index (smu,CMN2ASIC_MAPPING_MSG , SMU_MSG_GetDcModeMaxDpmFreq) <0 ) || + (smu_cmn_to_asic_specific_index (smu,CMN2ASIC_MAPPING_MSG , SMU_MSG_GetMaxDpmFreq) <0 ))return 0 ; - clk_id =smu_clk_get_index (smu, clock_select); + clk_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_CLK , + clock_select);if (clk_id <0 )return -EINVAL ;
@@ -1062,7 +1067,8 @@ int smu_v11_0_get_current_power_limit(struct smu_context *smu,if (!smu_feature_is_enabled (smu,SMU_FEATURE_PPT_BIT ))return -EINVAL ; - power_src =smu_power_get_index (smu, + power_src =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_PWR , smu->adev->pm.ac_power ?SMU_POWER_SOURCE_AC :SMU_POWER_SOURCE_DC );
@@ -1718,7 +1724,9 @@ int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type creturn 0 ; } - clk_id =smu_clk_get_index (smu, clk_type); + clk_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_CLK , + clk_type);if (clk_id <0 ) { ret = -EINVAL ; goto failed;
@@ -1750,7 +1758,9 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu,int ret =0 , clk_id =0 ;uint32_t param; - clk_id =smu_clk_get_index (smu, clk_type); + clk_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_CLK , + clk_type);if (clk_id <0 )return clk_id;
@@ -1794,7 +1804,9 @@ int smu_v11_0_set_hard_freq_limited_range(struct smu_context *smu,if (!smu_clk_dpm_is_enabled (smu, clk_type))return 0 ; - clk_id =smu_clk_get_index (smu, clk_type); + clk_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_CLK , + clk_type);if (clk_id <0 )return clk_id;
@@ -1923,7 +1935,9 @@ int smu_v11_0_set_power_source(struct smu_context *smu, {int pwr_source; - pwr_source =smu_power_get_index (smu, (uint32_t )power_src); + pwr_source =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_PWR , + (uint32_t )power_src);if (pwr_source <0 )return -EINVAL ;
@@ -1947,7 +1961,9 @@ int smu_v11_0_get_dpm_freq_by_index(struct smu_context *smu,if (!smu_clk_dpm_is_enabled (smu, clk_type))return 0 ; - clk_id =smu_clk_get_index (smu, clk_type); + clk_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_CLK , + clk_type);if (clk_id <0 )return clk_id;
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +4 -1
@@ -29,6 +29,7 @@#include "smu_v12_0.h" #include "soc15_common.h" #include "atom.h" +#include "smu_cmn.h" #include "asic_reg/mp/mp_12_0_0_offset.h" #include "asic_reg/mp/mp_12_0_0_sh_mask.h"
@@ -95,7 +96,9 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu,struct amdgpu_device *adev = smu->adev;int ret =0 , index =0 ; - index =smu_msg_get_index (smu, msg); + index =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_MSG , + msg);if (index <0 )return index;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/17 drm/amd/powerplay: drop unused code
In reply to Evan QuanThose code were obsoleted by new common APIsmu_cmn_to_asic_specific_index().
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 119 ------------------ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 6 - drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 11 -- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 6 - drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 118 ----------------- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 85 ------------- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 114 ----------------- drivers/gpu/drm/amd/powerplay/smu_internal.h | 6 - 8 files changed, 465 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -119
@@ -206,118 +206,6 @@ static const struct cmn2asic_mapping arcturus_workload_map[PP_SMC_POWER_PROFILE_ WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT), }; -static int arcturus_get_smu_msg_index (struct smu_context *smc,uint32_t index) -{ -#if 0 -struct smu_11_0_msg_mapping mapping; - -if (index >=SMU_MSG_MAX_COUNT ) -return -EINVAL ; - - mapping = arcturus_message_map[index]; -if (!(mapping.valid_mapping)) -return -EINVAL ; - -if (amdgpu_sriov_vf (smc->adev) && !mapping.valid_in_vf) -return -EACCES ; - -return mapping.map_to; -#endif -return 0 ; -} - -static int arcturus_get_smu_clk_index (struct smu_context *smc,uint32_t index) -{ -#if 0 -struct smu_11_0_cmn2aisc_mapping mapping; - -if (index >=SMU_CLK_COUNT ) -return -EINVAL ; - - mapping = arcturus_clk_map[index]; -if (!(mapping.valid_mapping)) { -dev_warn (smc->adev->dev,"Unsupported SMU clk: %d\n" , index); -return -EINVAL ; - } - -return mapping.map_to; -#endif -return 0 ; -} - -static int arcturus_get_smu_feature_index (struct smu_context *smc,uint32_t index) -{ -#if 0 -struct smu_11_0_cmn2aisc_mapping mapping; - -if (index >=SMU_FEATURE_COUNT ) -return -EINVAL ; - - mapping = arcturus_feature_mask_map[index]; -if (!(mapping.valid_mapping)) { -return -EINVAL ; - } - -return mapping.map_to; -#endif -return 0 ; -} - -static int arcturus_get_smu_table_index (struct smu_context *smc,uint32_t index) -{ -#if 0 -struct smu_11_0_cmn2aisc_mapping mapping; - -if (index >=SMU_TABLE_COUNT ) -return -EINVAL ; - - mapping = arcturus_table_map[index]; -if (!(mapping.valid_mapping)) { -dev_warn (smc->adev->dev,"Unsupported SMU table: %d\n" , index); -return -EINVAL ; - } - -return mapping.map_to; -#endif -return 0 ; -} - -static int arcturus_get_pwr_src_index (struct smu_context *smc,uint32_t index) -{ -#if 0 -struct smu_11_0_cmn2aisc_mapping mapping; - -if (index >=SMU_POWER_SOURCE_COUNT ) -return -EINVAL ; - - mapping = arcturus_pwr_src_map[index]; -if (!(mapping.valid_mapping)) { -dev_warn (smc->adev->dev,"Unsupported SMU power source: %d\n" , index); -return -EINVAL ; - } - -return mapping.map_to; -#endif -return 0 ; -} - -static int arcturus_get_workload_type (struct smu_context *smu,enum PP_SMC_POWER_PROFILE profile) -{ -#if 0 -struct smu_11_0_cmn2aisc_mapping mapping; - -if (profile >PP_SMC_POWER_PROFILE_CUSTOM ) -return -EINVAL ; - - mapping = arcturus_workload_map[profile]; -if (!(mapping.valid_mapping)) -return -EINVAL ; - -return mapping.map_to; -#endif -return 0 ; -} -static int arcturus_tables_init (struct smu_context *smu,struct smu_table *tables) {struct smu_table_context *smu_table = &smu->smu_table;
@@ -2338,13 +2226,6 @@ static void arcturus_log_thermal_throttling_event(struct smu_context *smu) }static const struct pptable_funcs arcturus_ppt_funcs = { -/* translate smu index into arcturus specific index */ - .get_smu_msg_index = arcturus_get_smu_msg_index, - .get_smu_clk_index = arcturus_get_smu_clk_index, - .get_smu_feature_index = arcturus_get_smu_feature_index, - .get_smu_table_index = arcturus_get_smu_table_index, - .get_smu_power_index= arcturus_get_pwr_src_index, - .get_workload_type = arcturus_get_workload_type,/* internal structurs allocations */ .tables_init = arcturus_tables_init, .alloc_dpm_context = arcturus_allocate_dpm_context,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -6
@@ -452,12 +452,6 @@ struct i2c_adapter;struct pptable_funcs {int (*alloc_dpm_context)(struct smu_context *smu); -int (*get_smu_msg_index)(struct smu_context *smu,uint32_t index); -int (*get_smu_clk_index)(struct smu_context *smu,uint32_t index); -int (*get_smu_feature_index)(struct smu_context *smu,uint32_t index); -int (*get_smu_table_index)(struct smu_context *smu,uint32_t index); -int (*get_smu_power_index)(struct smu_context *smu,uint32_t index); -int (*get_workload_type)(struct smu_context *smu,enum PP_SMC_POWER_PROFILE profile);int (*run_btc)(struct smu_context *smu);int (*get_allowed_feature_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num);enum amd_pm_state_type (*get_current_power_state)(struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +0 -11
@@ -61,17 +61,6 @@ static const struct smu_temperature_range smu11_thermal_policy[] = { 120000, 120000, 120000, 120000, 120000, 120000, 120000, 120000, 120000}, }; -struct smu_11_0_msg_mapping { -int valid_mapping; -int map_to; -int valid_in_vf; -}; - -struct smu_11_0_cmn2aisc_mapping { -int valid_mapping; -int map_to; -}; - struct smu_11_0_max_sustainable_clocks { uint32_t display_clock; uint32_t phy_clock;
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +0 -6
@@ -31,12 +31,6 @@#define MP1_Public 0x03b00000#define MP1_SRAM 0x03c00004 - -struct smu_12_0_cmn2aisc_mapping { -int valid_mapping; -int map_to; -}; -int smu_v12_0_send_msg_without_waiting (struct smu_context *smu,uint16_t msg);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0 -118
130 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0 -85
109 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +0 -114
126 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_internal.h +0 -6
@@ -68,12 +68,6 @@#define smu_apply_clocks_adjust_rules (smu) smu_ppt_funcs(apply_clocks_adjust_rules, 0, smu)#define smu_notify_smc_display_config (smu) smu_ppt_funcs(notify_smc_display_config, 0, smu)#define smu_set_cpu_power_state (smu) smu_ppt_funcs(set_cpu_power_state, 0, smu) -#define smu_msg_get_index (smu, msg) smu_ppt_funcs(get_smu_msg_index, -EINVAL, smu, msg) -#define smu_clk_get_index (smu, clk) smu_ppt_funcs(get_smu_clk_index, -EINVAL, smu, clk) -#define smu_feature_get_index (smu, fea) smu_ppt_funcs(get_smu_feature_index, -EINVAL, smu, fea) -#define smu_table_get_index (smu, tab) smu_ppt_funcs(get_smu_table_index, -EINVAL, smu, tab) -#define smu_power_get_index (smu, src) smu_ppt_funcs(get_smu_power_index, -EINVAL, smu, src) -#define smu_workload_get_type (smu, type) smu_ppt_funcs(get_workload_type, -EINVAL, smu, type)#define smu_run_btc (smu) smu_ppt_funcs(run_btc, 0, smu)#define smu_get_allowed_feature_mask (smu, feature_mask, num) smu_ppt_funcs(get_allowed_feature_mask, 0, smu, feature_mask, num)#define smu_store_cc6_data (smu, st, cc6_dis, pst_dis, pst_sw_dis) smu_ppt_funcs(store_cc6_data, 0, smu, st, cc6_dis, pst_dis, pst_sw_dis)
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/17 drm/amd/powerplay: move clock dpm enablement check to smu_v11/v12
In reply to Evan QuanAs those APIs of smu_v11/v12 are more widely called. And they need this check also.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 --- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 3 +++ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -3
@@ -249,9 +249,6 @@ int smu_set_soft_freq_range(struct smu_context *smu, {int ret =0 ; -if (!smu_clk_dpm_is_enabled (smu, clk_type)) -return 0 ; -mutex_lock (&smu->mutex);if (smu->ppt_funcs->set_soft_freq_limited_range)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3 -0
@@ -1758,6 +1758,9 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu,int ret =0 , clk_id =0 ;uint32_t param; +if (!smu_clk_dpm_is_enabled (smu, clk_type)) +return 0 ; + clk_id =smu_cmn_to_asic_specific_index (smu,CMN2ASIC_MAPPING_CLK , clk_type);
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +3 -0
@@ -328,6 +328,9 @@ int smu_v12_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_ {int ret =0 ; +if (!smu_clk_dpm_is_enabled (smu, clk_type)) +return 0 ; +switch (clk_type) {case SMU_GFXCLK :case SMU_SCLK :
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/17 drm/amd/powerplay: move dpm feature support checking to smu_cmn.c
In reply to Evan QuanConsidering it is shared by all ASICs and smu_cmn.c should be the right place.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 21 ------------------ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 -- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 8 +++---- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 8 +++---- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 22 +++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 3 +++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 4 ++-- 7 files changed, 35 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -21
@@ -569,27 +569,6 @@ int smu_feature_set_enabled(struct smu_context *smu, enum smu_feature_mask mask, enable); } -int smu_feature_is_supported (struct smu_context *smu,enum smu_feature_mask mask) -{ -struct smu_feature *feature = &smu->smu_feature; -int feature_id; -int ret =0 ; - - feature_id =smu_cmn_to_asic_specific_index (smu, -CMN2ASIC_MAPPING_FEATURE , - mask); -if (feature_id <0 ) -return 0 ; - -WARN_ON (feature_id > feature->feature_num); - -mutex_lock (&feature->mutex); - ret =test_bit (feature_id, feature->supported); -mutex_unlock (&feature->mutex); - -return ret; -} -static int smu_set_funcs (struct amdgpu_device *adev) {struct smu_context *smu = &adev->smu;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -2
@@ -727,8 +727,6 @@ extern int smu_feature_is_enabled(struct smu_context *smu, enum smu_feature_mask mask);extern int smu_feature_set_enabled (struct smu_context *smu,enum smu_feature_mask mask,bool enable); -extern int smu_feature_is_supported (struct smu_context *smu, -enum smu_feature_mask mask);int smu_update_table (struct smu_context *smu,enum smu_table_id table_index,int argument,void *table_data,bool drv2smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +4 -4
@@ -1265,8 +1265,8 @@ static int navi10_display_config_changed(struct smu_context *smu)int ret =0 ;if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && -smu_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) && -smu_feature_is_supported (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { +smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) && +smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays, smu->display_config->num_display,NULL );
@@ -1543,13 +1543,13 @@ static int navi10_notify_smc_display_config(struct smu_context *smu) min_clocks.dcef_clock_in_sr = smu->display_config->min_dcef_deep_sleep_set_clk; min_clocks.memory_clock = smu->display_config->min_mem_set_clock; -if (smu_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { clock_req.clock_type = amd_pp_dcef_clock; clock_req.clock_freq_in_khz = min_clocks.dcef_clock *10 ; ret =smu_v11_0_display_clock_voltage_request (smu, &clock_req);if (!ret) { -if (smu_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetMinDeepSleepDcefclk, min_clocks.dcef_clock_in_sr/100,
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +4 -4
@@ -1056,8 +1056,8 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu)int ret =0 ;if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && -smu_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) && -smu_feature_is_supported (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { +smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) && +smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) {#if 0 ret = smu_send_smc_msg_with_param(smu, SMU_MSG_NumOfDisplays, smu->display_config->num_display,
@@ -1336,13 +1336,13 @@ static int sienna_cichlid_notify_smc_display_config(struct smu_context *smu) min_clocks.dcef_clock_in_sr = smu->display_config->min_dcef_deep_sleep_set_clk; min_clocks.memory_clock = smu->display_config->min_mem_set_clock; -if (smu_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { clock_req.clock_type = amd_pp_dcef_clock; clock_req.clock_freq_in_khz = min_clocks.dcef_clock *10 ; ret =smu_v11_0_display_clock_voltage_request (smu, &clock_req);if (!ret) { -if (smu_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetMinDeepSleepDcefclk, min_clocks.dcef_clock_in_sr/100,
drivers/gpu/drm/amd/powerplay/smu_cmn.c +22 -0
@@ -116,3 +116,25 @@ int smu_cmn_to_asic_specific_index(struct smu_context *smu,return -EINVAL ; } } + +int smu_cmn_feature_is_supported (struct smu_context *smu, +enum smu_feature_mask mask) +{ +struct smu_feature *feature = &smu->smu_feature; +int feature_id; +int ret =0 ; + + feature_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + mask); +if (feature_id <0 ) +return 0 ; + +WARN_ON (feature_id > feature->feature_num); + +mutex_lock (&feature->mutex); + ret =test_bit (feature_id, feature->supported); +mutex_unlock (&feature->mutex); + +return ret; +}
drivers/gpu/drm/amd/powerplay/smu_cmn.h +3 -0
@@ -29,4 +29,7 @@ int smu_cmn_to_asic_specific_index(struct smu_context *smu,enum smu_cmn2asic_mapping_type type, uint32_t index); +int smu_cmn_feature_is_supported (struct smu_context *smu, +enum smu_feature_mask mask); +#endif
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +2 -2
@@ -1230,7 +1230,7 @@ smu_v11_0_auto_fan_control(struct smu_context *smu, bool auto_fan_control) {int ret =0 ; -if (!smu_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT ))return 0 ; ret =smu_feature_set_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT , auto_fan_control);
@@ -1598,7 +1598,7 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu)return false;/* Arcturus does not support this bit mask */ -if (smu_feature_is_supported (smu,SMU_FEATURE_BACO_BIT ) && +if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_BACO_BIT ) && !smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ))return false;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/17 drm/amd/powerplay: move dpm feature enablement checking to smu_cmn.c
In reply to Evan QuanConsidering it is shared by all ASICs and smu_cmn.c should be the right place.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 23 ------------ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 29 ++++++++------- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 31 ++++++++-------- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 11 +++--- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 37 ++++++++++--------- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 24 ++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 3 ++ drivers/gpu/drm/amd/powerplay/smu_internal.h | 1 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 20 +++++----- 10 files changed, 95 insertions(+), 87 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -23
@@ -527,29 +527,6 @@ static int smu_get_driver_allowed_feature_mask(struct smu_context *smu)return ret; } -int smu_feature_is_enabled (struct smu_context *smu,enum smu_feature_mask mask) -{ -struct smu_feature *feature = &smu->smu_feature; -int feature_id; -int ret =0 ; - -if (smu->is_apu) -return 1 ; - feature_id =smu_cmn_to_asic_specific_index (smu, -CMN2ASIC_MAPPING_FEATURE , - mask); -if (feature_id <0 ) -return 0 ; - -WARN_ON (feature_id > feature->feature_num); - -mutex_lock (&feature->mutex); - ret =test_bit (feature_id, feature->enabled); -mutex_unlock (&feature->mutex); - -return ret; -} -int smu_feature_set_enabled (struct smu_context *smu,enum smu_feature_mask mask,bool enable) {
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +15 -14
@@ -279,7 +279,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* socclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.soc_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_SOCCLK , dpm_table);
@@ -297,7 +297,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* gfxclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.gfx_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_GFXCLK , dpm_table);
@@ -315,7 +315,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* memclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.uclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_UCLK , dpm_table);
@@ -333,7 +333,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* fclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.fclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_FCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_FCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_FCLK , dpm_table);
@@ -649,31 +649,31 @@ static int arcturus_get_current_clk_freq_by_table(struct smu_context *smu,* We can use Average_* for dpm disabled case. * But this is available for gfxclk/uclk/socclk/vclk/dclk. */ -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) member_type =METRICS_CURR_GFXCLK ;else member_type =METRICS_AVERAGE_GFXCLK ;break ;case PPCLK_UCLK : -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) member_type =METRICS_CURR_UCLK ;else member_type =METRICS_AVERAGE_UCLK ;break ;case PPCLK_SOCCLK : -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) member_type =METRICS_CURR_SOCCLK ;else member_type =METRICS_AVERAGE_SOCCLK ;break ;case PPCLK_VCLK : -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) member_type =METRICS_CURR_VCLK ;else member_type =METRICS_AVERAGE_VCLK ;break ;case PPCLK_DCLK : -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) member_type =METRICS_CURR_DCLK ;else member_type =METRICS_AVERAGE_DCLK ;
@@ -819,7 +819,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu,uint32_t freq;int ret =0 ; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT ) && +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT ) && (feature_mask &FEATURE_DPM_GFXCLK_MASK )) { freq = dpm_context->dpm_tables.gfx_table.dpm_levels[level].value; ret = smu_send_smc_msg_with_param(smu,
@@ -833,7 +833,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu, } } -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT ) && +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT ) && (feature_mask &FEATURE_DPM_UCLK_MASK )) { freq = dpm_context->dpm_tables.uclk_table.dpm_levels[level].value; ret = smu_send_smc_msg_with_param(smu,
@@ -847,7 +847,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu, } } -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT ) && +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT ) && (feature_mask &FEATURE_DPM_SOCCLK_MASK )) { freq = dpm_context->dpm_tables.soc_table.dpm_levels[level].value; ret = smu_send_smc_msg_with_param(smu,
@@ -1836,7 +1836,7 @@ static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable)int ret =0 ;if (enable) { -if (!smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT ,1 );if (ret) {dev_err (smu->adev->dev,"[EnableVCNDPM] failed!\n" );
@@ -1845,7 +1845,7 @@ static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable) } power_gate->vcn_gated = false; }else { -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT ,0 );if (ret) {dev_err (smu->adev->dev,"[DisableVCNDPM] failed!\n" );
@@ -2274,6 +2274,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .init_display_count = NULL, .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_v11_0_get_enabled_mask, + .feature_is_enabled = smu_cmn_feature_is_enabled, .notify_display_change = NULL, .set_power_limit = smu_v11_0_set_power_limit, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -2
@@ -533,6 +533,7 @@ struct pptable_funcs {int (*init_display_count)(struct smu_context *smu,uint32_t count);int (*set_allowed_mask)(struct smu_context *smu);int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num); +int (*feature_is_enabled)(struct smu_context *smu,enum smu_feature_mask mask);int (*notify_display_change)(struct smu_context *smu);int (*set_power_limit)(struct smu_context *smu,uint32_t n);int (*init_max_sustainable_clocks)(struct smu_context *smu);
@@ -723,8 +724,6 @@ extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;extern const struct amdgpu_ip_block_version smu_v12_0_ip_block; -extern int smu_feature_is_enabled (struct smu_context *smu, -enum smu_feature_mask mask);extern int smu_feature_set_enabled (struct smu_context *smu,enum smu_feature_mask mask,bool enable);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +16 -15
@@ -600,7 +600,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* socclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.soc_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_SOCCLK , dpm_table);
@@ -618,7 +618,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* gfxclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.gfx_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_GFXCLK , dpm_table);
@@ -636,7 +636,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* uclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.uclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_UCLK , dpm_table);
@@ -654,7 +654,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* vclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.vclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_VCLK , dpm_table);
@@ -672,7 +672,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* dclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.dclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_DCLK , dpm_table);
@@ -690,7 +690,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* dcefclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.dcef_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_DCEFCLK , dpm_table);
@@ -708,7 +708,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* pixelclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.pixel_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_PIXCLK , dpm_table);
@@ -726,7 +726,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* displayclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.display_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_DISPCLK , dpm_table);
@@ -744,7 +744,7 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)/* phyclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.phy_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_PHYCLK , dpm_table);
@@ -771,14 +771,14 @@ static int navi10_dpm_set_vcn_enable(struct smu_context *smu, bool enable)if (enable) {/* vcn dpm on is a prerequisite for vcn power gate messages */ -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,1 ,NULL );if (ret)return ret; } power_gate->vcn_gated = false; }else { -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn,NULL );if (ret)return ret;
@@ -796,14 +796,14 @@ static int navi10_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)int ret =0 ;if (enable) { -if (smu_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { ret =smu_send_smc_msg (smu, SMU_MSG_PowerUpJpeg,NULL );if (ret)return ret; } power_gate->jpeg_gated = false; }else { -if (smu_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownJpeg,NULL );if (ret)return ret;
@@ -1248,7 +1248,7 @@ static int navi10_pre_display_config_changed(struct smu_context *smu)if (ret)return ret; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_UCLK ,NULL , &max_freq);if (ret)return ret;
@@ -1564,7 +1564,7 @@ static int navi10_notify_smc_display_config(struct smu_context *smu) } } -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , min_clocks.memory_clock/100 ,0 );if (ret) {dev_err (smu->adev->dev,"[%s] Set hard min uclk failed!" , __func__);
@@ -2299,6 +2299,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .init_display_count = smu_v11_0_init_display_count, .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_v11_0_get_enabled_mask, + .feature_is_enabled = smu_cmn_feature_is_enabled, .notify_display_change = smu_v11_0_notify_display_change, .set_power_limit = smu_v11_0_set_power_limit, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +6 -5
@@ -442,14 +442,14 @@ static int renoir_dpm_set_vcn_enable(struct smu_context *smu, bool enable)if (enable) {/* vcn dpm on is a prerequisite for vcn power gate messages */ -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0 ,NULL );if (ret)return ret; } power_gate->vcn_gated = false; }else { -if (smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn,NULL );if (ret)return ret;
@@ -467,14 +467,14 @@ static int renoir_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)int ret =0 ;if (enable) { -if (smu_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpJpeg,0 ,NULL );if (ret)return ret; } power_gate->jpeg_gated = false; }else { -if (smu_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerDownJpeg,0 ,NULL );if (ret)return ret;
@@ -550,7 +550,7 @@ static int renoir_unforce_dpm_levels(struct smu_context *smu) { };for (i =0 ; i <ARRAY_SIZE (clk_feature_map); i++) { -if (!smu_feature_is_enabled (smu, clk_feature_map[i].feature)) +if (!smu_cmn_feature_is_enabled (smu, clk_feature_map[i].feature))continue ; clk_type = clk_feature_map[i].clk_type;
@@ -990,6 +990,7 @@ static const struct pptable_funcs renoir_ppt_funcs = { .fini_smc_tables = smu_v12_0_fini_smc_tables, .set_default_dpm_table = smu_v12_0_set_default_dpm_tables, .get_enabled_mask = smu_v12_0_get_enabled_mask, + .feature_is_enabled = smu_cmn_feature_is_enabled, .get_dpm_ultimate_freq = renoir_get_dpm_ultimate_freq, .mode2_reset = smu_v12_0_mode2_reset, .set_soft_freq_limited_range = smu_v12_0_set_soft_freq_limited_range,
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +19 -18
@@ -512,7 +512,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* socclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.soc_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_SOCCLK , dpm_table);
@@ -530,7 +530,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* gfxclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.gfx_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_GFXCLK , dpm_table);
@@ -548,7 +548,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* uclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.uclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_UCLK , dpm_table);
@@ -566,7 +566,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* fclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.fclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_FCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_FCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_FCLK , dpm_table);
@@ -584,7 +584,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* vclk0 dpm table setup */ dpm_table = &dpm_context->dpm_tables.vclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_VCLK , dpm_table);
@@ -602,7 +602,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* vclk1 dpm table setup */ dpm_table = &dpm_context->dpm_tables.vclk1_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_VCLK1 , dpm_table);
@@ -620,7 +620,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* dclk0 dpm table setup */ dpm_table = &dpm_context->dpm_tables.dclk_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_DCLK , dpm_table);
@@ -638,7 +638,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* dclk1 dpm table setup */ dpm_table = &dpm_context->dpm_tables.dclk1_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_DCLK1 , dpm_table);
@@ -656,7 +656,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* dcefclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.dcef_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_DCEFCLK , dpm_table);
@@ -674,7 +674,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* pixelclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.pixel_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_PIXCLK , dpm_table);
@@ -692,7 +692,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* displayclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.display_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_DISPCLK , dpm_table);
@@ -710,7 +710,7 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)/* phyclk dpm table setup */ dpm_table = &dpm_context->dpm_tables.phy_table; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_set_single_dpm_table (smu,SMU_PHYCLK , dpm_table);
@@ -737,7 +737,7 @@ static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enablif (enable) {/* vcn dpm on is a prerequisite for vcn power gate messages */ -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0 ,NULL );if (ret)return ret;
@@ -747,7 +747,7 @@ static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enabl } power_gate->vcn_gated = false; }else { -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerDownVcn,0 ,NULL );if (ret)return ret;
@@ -768,14 +768,14 @@ static int sienna_cichlid_dpm_set_jpeg_enable(struct smu_context *smu, bool enabint ret =0 ;if (enable) { -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpJpeg,0 ,NULL );if (ret)return ret; } power_gate->jpeg_gated = false; }else { -if (smu_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerDownJpeg,0 ,NULL );if (ret)return ret;
@@ -1039,7 +1039,7 @@ static int sienna_cichlid_pre_display_config_changed(struct smu_context *smu)return ret;#endif -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_UCLK ,NULL , &max_freq);if (ret)return ret;
@@ -1357,7 +1357,7 @@ static int sienna_cichlid_notify_smc_display_config(struct smu_context *smu) } } -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , min_clocks.memory_clock/100 ,0 );if (ret) {dev_err (smu->adev->dev,"[%s] Set hard min uclk failed!" , __func__);
@@ -2418,6 +2418,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .init_display_count = NULL, .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_v11_0_get_enabled_mask, + .feature_is_enabled = smu_cmn_feature_is_enabled, .notify_display_change = NULL, .set_power_limit = smu_v11_0_set_power_limit, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
drivers/gpu/drm/amd/powerplay/smu_cmn.c +24 -0
@@ -138,3 +138,27 @@ int smu_cmn_feature_is_supported(struct smu_context *smu,return ret; } + +int smu_cmn_feature_is_enabled (struct smu_context *smu, +enum smu_feature_mask mask) +{ +struct smu_feature *feature = &smu->smu_feature; +int feature_id; +int ret =0 ; + +if (smu->is_apu) +return 1 ; + feature_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + mask); +if (feature_id <0 ) +return 0 ; + +WARN_ON (feature_id > feature->feature_num); + +mutex_lock (&feature->mutex); + ret =test_bit (feature_id, feature->enabled); +mutex_unlock (&feature->mutex); + +return ret; +}
drivers/gpu/drm/amd/powerplay/smu_cmn.h +3 -0
@@ -32,4 +32,7 @@ int smu_cmn_to_asic_specific_index(struct smu_context *smu,int smu_cmn_feature_is_supported (struct smu_context *smu,enum smu_feature_mask mask); +int smu_cmn_feature_is_enabled (struct smu_context *smu, +enum smu_feature_mask mask); +#endif
drivers/gpu/drm/amd/powerplay/smu_internal.h +1 -0
@@ -54,6 +54,7 @@#define smu_init_display_count (smu, count) smu_ppt_funcs(init_display_count, 0, smu, count)#define smu_feature_set_allowed_mask (smu) smu_ppt_funcs(set_allowed_mask, 0, smu)#define smu_feature_get_enabled_mask (smu, mask, num) smu_ppt_funcs(get_enabled_mask, 0, smu, mask, num) +#define smu_feature_is_enabled (smu, mask) smu_ppt_funcs(feature_is_enabled, 0, smu, mask)#define smu_is_dpm_running (smu) smu_ppt_funcs(is_dpm_running, 0 , smu)#define smu_notify_display_change (smu) smu_ppt_funcs(notify_display_change, 0, smu)#define smu_set_default_dpm_table (smu) smu_ppt_funcs(set_default_dpm_table, 0, smu)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +10 -10
@@ -936,7 +936,7 @@ int smu_v11_0_notify_display_change(struct smu_context *smu)if (!smu->pm_enabled)return ret; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT ) && +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT ) && smu->adev->gmc.vram_type ==AMDGPU_VRAM_TYPE_HBM ) ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetUclkFastSwitch,1 ,NULL );
@@ -994,7 +994,7 @@ int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu) max_sustainable_clocks->phy_clock =0xFFFFFFFF ; max_sustainable_clocks->pixel_clock =0xFFFFFFFF ; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =smu_v11_0_get_max_sustainable_clock (smu, &(max_sustainable_clocks->uclock),SMU_UCLK );
@@ -1005,7 +1005,7 @@ int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu) } } -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { ret =smu_v11_0_get_max_sustainable_clock (smu, &(max_sustainable_clocks->soc_clock),SMU_SOCCLK );
@@ -1016,7 +1016,7 @@ int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu) } } -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { ret =smu_v11_0_get_max_sustainable_clock (smu, &(max_sustainable_clocks->dcef_clock),SMU_DCEFCLK );
@@ -1064,7 +1064,7 @@ int smu_v11_0_get_current_power_limit(struct smu_context *smu,int power_src;int ret =0 ; -if (!smu_feature_is_enabled (smu,SMU_FEATURE_PPT_BIT )) +if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_PPT_BIT ))return -EINVAL ; power_src = smu_cmn_to_asic_specific_index(smu,
@@ -1089,7 +1089,7 @@ int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n) {int ret =0 ; -if (!smu_feature_is_enabled (smu,SMU_FEATURE_PPT_BIT )) { +if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_PPT_BIT )) {dev_err (smu->adev->dev,"Setting new power limit is not supported!\n" );return -EOPNOTSUPP ; }
@@ -1152,8 +1152,8 @@ smu_v11_0_display_clock_voltage_request(struct smu_context *smu,enum smu_clk_type clk_select =0 ;uint32_t clk_freq = clock_req->clock_freq_in_khz /1000 ; -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) || -smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) || +smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) {switch (clk_type) {case amd_pp_dcef_clock: clk_select =SMU_DCEFCLK ;
@@ -1219,7 +1219,7 @@ int smu_v11_0_gfx_off_control(struct smu_context *smu, bool enable)uint32_t smu_v11_0_get_fan_control_mode (struct smu_context *smu) { -if (!smu_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT )) +if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT ))return AMD_FAN_CTRL_MANUAL ;else return AMD_FAN_CTRL_AUTO ;
@@ -1599,7 +1599,7 @@ bool smu_v11_0_baco_is_support(struct smu_context *smu)/* Arcturus does not support this bit mask */ if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_BACO_BIT ) && - !smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT )) + !smu_cmn_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT ))return false;return true;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/17 drm/amd/powerplay: implement smu_cmn_get_enabled_mask() for all ASICs
In reply to Evan QuanInstead of having each for smu v11 and v12.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 4 +-- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 -- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 3 -- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 +-- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 +- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 4 +-- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 30 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 4 +++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 31 +------------------ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 23 -------------- 10 files changed, 42 insertions(+), 66 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2 -2
@@ -1823,7 +1823,7 @@ static bool arcturus_is_dpm_running(struct smu_context *smu)int ret =0 ;uint32_t feature_mask[2 ];unsigned long feature_enabled; - ret =smu_feature_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | ((uint64_t )feature_mask[1 ] <<32 ));return !!(feature_enabled &SMC_DPM_FEATURE );
@@ -2273,7 +2273,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, .init_display_count = NULL, .set_allowed_mask = smu_v11_0_set_allowed_mask, - .get_enabled_mask = smu_v11_0_get_enabled_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, .notify_display_change = NULL, .set_power_limit = smu_v11_0_set_power_limit,
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +0 -3
@@ -180,9 +180,6 @@ int smu_v11_0_init_display_count(struct smu_context *smu, uint32_t count);int smu_v11_0_set_allowed_mask (struct smu_context *smu); -int smu_v11_0_get_enabled_mask (struct smu_context *smu, -uint32_t *feature_mask,uint32_t num); -int smu_v11_0_notify_display_change (struct smu_context *smu); int smu_v11_0_get_current_power_limit(struct smu_context *smu,
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +0 -3
@@ -64,9 +64,6 @@ int smu_v12_0_fini_smc_tables(struct smu_context *smu);int smu_v12_0_set_default_dpm_tables (struct smu_context *smu); -int smu_v12_0_get_enabled_mask (struct smu_context *smu, -uint32_t *feature_mask,uint32_t num); -int smu_v12_0_mode2_reset (struct smu_context *smu); int smu_v12_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_type clk_type,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +2 -2
@@ -1320,7 +1320,7 @@ static bool navi10_is_dpm_running(struct smu_context *smu)int ret =0 ;uint32_t feature_mask[2 ];unsigned long feature_enabled; - ret =smu_feature_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | ((uint64_t )feature_mask[1 ] <<32 ));return !!(feature_enabled &SMC_DPM_FEATURE );
@@ -2298,7 +2298,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, .init_display_count = smu_v11_0_init_display_count, .set_allowed_mask = smu_v11_0_set_allowed_mask, - .get_enabled_mask = smu_v11_0_get_enabled_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, .notify_display_change = smu_v11_0_notify_display_change, .set_power_limit = smu_v11_0_set_power_limit,
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1 -1
@@ -989,7 +989,7 @@ static const struct pptable_funcs renoir_ppt_funcs = { .init_smc_tables = smu_v12_0_init_smc_tables, .fini_smc_tables = smu_v12_0_fini_smc_tables, .set_default_dpm_table = smu_v12_0_set_default_dpm_tables, - .get_enabled_mask = smu_v12_0_get_enabled_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, .get_dpm_ultimate_freq = renoir_get_dpm_ultimate_freq, .mode2_reset = smu_v12_0_mode2_reset,
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +2 -2
@@ -1113,7 +1113,7 @@ static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)int ret =0 ;uint32_t feature_mask[2 ];unsigned long feature_enabled; - ret =smu_feature_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | ((uint64_t )feature_mask[1 ] <<32 ));return !!(feature_enabled &SMC_DPM_FEATURE );
@@ -2417,7 +2417,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, .init_display_count = NULL, .set_allowed_mask = smu_v11_0_set_allowed_mask, - .get_enabled_mask = smu_v11_0_get_enabled_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, .notify_display_change = NULL, .set_power_limit = smu_v11_0_set_power_limit,
drivers/gpu/drm/amd/powerplay/smu_cmn.c +30 -0
@@ -162,3 +162,33 @@ int smu_cmn_feature_is_enabled(struct smu_context *smu,return ret; } + +int smu_cmn_get_enabled_mask (struct smu_context *smu, +uint32_t *feature_mask, +uint32_t num) +{ +uint32_t feature_mask_high =0 , feature_mask_low =0 ; +struct smu_feature *feature = &smu->smu_feature; +int ret =0 ; + +if (!feature_mask || num <2 ) +return -EINVAL ; + +if (bitmap_empty (feature->enabled, feature->feature_num)) { + ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesHigh, &feature_mask_high); +if (ret) +return ret; + + ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesLow, &feature_mask_low); +if (ret) +return ret; + + feature_mask[0 ] = feature_mask_low; + feature_mask[1 ] = feature_mask_high; + }else { +bitmap_copy ((unsigned long *)feature_mask, feature->enabled, + feature->feature_num); + } + +return ret; +}
drivers/gpu/drm/amd/powerplay/smu_cmn.h +4 -0
@@ -35,4 +35,8 @@ int smu_cmn_feature_is_supported(struct smu_context *smu,int smu_cmn_feature_is_enabled (struct smu_context *smu,enum smu_feature_mask mask); +int smu_cmn_get_enabled_mask (struct smu_context *smu, +uint32_t *feature_mask, +uint32_t num); +#endif
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1 -30
@@ -871,35 +871,6 @@ int smu_v11_0_set_allowed_mask(struct smu_context *smu)return ret; } -int smu_v11_0_get_enabled_mask (struct smu_context *smu, -uint32_t *feature_mask,uint32_t num) -{ -uint32_t feature_mask_high =0 , feature_mask_low =0 ; -struct smu_feature *feature = &smu->smu_feature; -int ret =0 ; - -if (!feature_mask || num <2 ) -return -EINVAL ; - -if (bitmap_empty (feature->enabled, feature->feature_num)) { - ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesHigh, &feature_mask_high); -if (ret) -return ret; - - ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesLow, &feature_mask_low); -if (ret) -return ret; - - feature_mask[0 ] = feature_mask_low; - feature_mask[1 ] = feature_mask_high; - }else { -bitmap_copy ((unsigned long *)feature_mask, feature->enabled, - feature->feature_num); - } - -return ret; -} -int smu_v11_0_system_features_control (struct smu_context *smu,bool en) {
@@ -916,7 +887,7 @@ int smu_v11_0_system_features_control(struct smu_context *smu,bitmap_zero (feature->supported, feature->feature_num);if (en) { - ret =smu_feature_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return ret;
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0 -23
@@ -296,29 +296,6 @@ int smu_v12_0_set_default_dpm_tables(struct smu_context *smu)return smu_update_table (smu,SMU_TABLE_DPMCLOCKS ,0 , smu_table->clocks_table, false); } -int smu_v12_0_get_enabled_mask (struct smu_context *smu, -uint32_t *feature_mask,uint32_t num) -{ -uint32_t feature_mask_high =0 , feature_mask_low =0 ; -int ret =0 ; - -if (!feature_mask || num <2 ) -return -EINVAL ; - - ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesHigh, &feature_mask_high); -if (ret) -return ret; - - ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesLow, &feature_mask_low); -if (ret) -return ret; - - feature_mask[0 ] = feature_mask_low; - feature_mask[1 ] = feature_mask_high; - -return ret; -} -int smu_v12_0_mode2_reset (struct smu_context *smu){return smu_v12_0_send_msg_with_param (smu, SMU_MSG_GfxDeviceDriverReset,SMU_RESET_MODE_2 ,NULL ); }
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/17 drm/amd/powerplay: move ppfeature mask setting to smu_cmn.c
In reply to Evan QuanConsidering they are shared by all ASICs. And we are moving to centralize all feature enablement/support checking and setting APIs in smu_cmn.c.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 137 +-------------- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 6 +- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 6 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 + .../drm/amd/powerplay/sienna_cichlid_ppt.c | 2 + drivers/gpu/drm/amd/powerplay/smu_cmn.c | 163 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 10 ++ drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 2 +- 10 files changed, 190 insertions(+), 142 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2 -135
@@ -59,147 +59,33 @@ const char *smu_get_message_name(struct smu_context *smu, enum smu_message_typereturn __smu_message_names[type]; } -#undef __SMU_DUMMY_MAP -#define __SMU_DUMMY_MAP (fea) #fea -static const char * __smu_feature_names[] = { -SMU_FEATURE_MASKS -}; - -const char *smu_get_feature_name (struct smu_context *smu,enum smu_feature_mask feature) -{ -if (feature <0 || feature >=SMU_FEATURE_COUNT ) -return "unknown smu feature" ; -return __smu_feature_names[feature]; -} -size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf) {size_t size =0 ; -int ret =0 , i =0 ; -uint32_t feature_mask[2 ] = {0 }; -int32_t feature_index =0 ; -uint32_t count =0 ; -uint32_t sort_feature[SMU_FEATURE_COUNT ]; -uint64_t hw_feature_count =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ;mutex_lock (&smu->mutex); - ret =smu_feature_get_enabled_mask (smu, feature_mask,2 ); -if (ret) - goto failed; + size =smu_get_pp_feature_mask (smu, buf); - size =sprintf (buf + size,"features high: 0x%08x low: 0x%08x\n" , - feature_mask[1 ], feature_mask[0 ]); - -for (i =0 ; i <SMU_FEATURE_COUNT ; i++) { - feature_index =smu_cmn_to_asic_specific_index (smu, -CMN2ASIC_MAPPING_FEATURE , - i); -if (feature_index <0 ) -continue ; - sort_feature[feature_index] = i; - hw_feature_count++; - } - -for (i =0 ; i < hw_feature_count; i++) { - size +=sprintf (buf + size,"%02d. %-20s (%2d) : %s\n" , - count++, -smu_get_feature_name (smu, sort_feature[i]), - i, - !!smu_feature_is_enabled (smu, sort_feature[i]) ? -"enabled" :"disabled" ); - } - -failed:mutex_unlock (&smu->mutex);return size; } -static int smu_feature_update_enable_state (struct smu_context *smu, -uint64_t feature_mask, -bool enabled) -{ -struct smu_feature *feature = &smu->smu_feature; -int ret =0 ; - -if (enabled) { - ret =smu_send_smc_msg_with_param (smu, - SMU_MSG_EnableSmuFeaturesLow, -lower_32_bits (feature_mask), -NULL ); -if (ret) -return ret; - ret =smu_send_smc_msg_with_param (smu, - SMU_MSG_EnableSmuFeaturesHigh, -upper_32_bits (feature_mask), -NULL ); -if (ret) -return ret; - }else { - ret =smu_send_smc_msg_with_param (smu, - SMU_MSG_DisableSmuFeaturesLow, -lower_32_bits (feature_mask), -NULL ); -if (ret) -return ret; - ret =smu_send_smc_msg_with_param (smu, - SMU_MSG_DisableSmuFeaturesHigh, -upper_32_bits (feature_mask), -NULL ); -if (ret) -return ret; - } - -mutex_lock (&feature->mutex); -if (enabled) -bitmap_or (feature->enabled, feature->enabled, - (unsigned long *)(&feature_mask),SMU_FEATURE_MAX ); -else -bitmap_andnot (feature->enabled, feature->enabled, - (unsigned long *)(&feature_mask),SMU_FEATURE_MAX ); -mutex_unlock (&feature->mutex); - -return ret; -} -int smu_sys_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask) {int ret =0 ; -uint32_t feature_mask[2 ] = {0 }; -uint64_t feature_2_enabled =0 ; -uint64_t feature_2_disabled =0 ; -uint64_t feature_enables =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ;mutex_lock (&smu->mutex); - ret =smu_feature_get_enabled_mask (smu, feature_mask,2 ); -if (ret) - goto out; - - feature_enables = ((uint64_t )feature_mask[1 ] <<32 | (uint64_t )feature_mask[0 ]); - - feature_2_enabled = ~feature_enables & new_mask; - feature_2_disabled = feature_enables & ~new_mask; - -if (feature_2_enabled) { - ret =smu_feature_update_enable_state (smu, feature_2_enabled, true); -if (ret) - goto out; - } -if (feature_2_disabled) { - ret =smu_feature_update_enable_state (smu, feature_2_disabled, false); -if (ret) - goto out; - } + ret =smu_set_pp_feature_mask (smu, new_mask); -out:mutex_unlock (&smu->mutex);return ret;
@@ -527,25 +413,6 @@ static int smu_get_driver_allowed_feature_mask(struct smu_context *smu)return ret; } -int smu_feature_set_enabled (struct smu_context *smu,enum smu_feature_mask mask, -bool enable) -{ -struct smu_feature *feature = &smu->smu_feature; -int feature_id; - - feature_id =smu_cmn_to_asic_specific_index (smu, -CMN2ASIC_MAPPING_FEATURE , - mask); -if (feature_id <0 ) -return -EINVAL ; - -WARN_ON (feature_id > feature->feature_num); - -return smu_feature_update_enable_state (smu, -1ULL << feature_id, - enable); -} -static int smu_set_funcs (struct amdgpu_device *adev) {struct smu_context *smu = &adev->smu;
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +4 -2
@@ -1837,7 +1837,7 @@ static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable)if (enable) {if (!smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { - ret =smu_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT ,1 ); + ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT ,1 );if (ret) {dev_err (smu->adev->dev,"[EnableVCNDPM] failed!\n" );return ret;
@@ -1846,7 +1846,7 @@ static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable) power_gate->vcn_gated = false; }else {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { - ret =smu_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT ,0 ); + ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT ,0 );if (ret) {dev_err (smu->adev->dev,"[DisableVCNDPM] failed!\n" );return ret;
@@ -2301,6 +2301,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .set_df_cstate = arcturus_set_df_cstate, .allow_xgmi_power_down = arcturus_allow_xgmi_power_down, .log_thermal_throttling_event = arcturus_log_thermal_throttling_event, + .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, + .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, };void arcturus_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -4
@@ -581,6 +581,8 @@ struct pptable_funcs {int (*disable_umc_cdr_12gbps_workaround)(struct smu_context *smu);int (*set_power_source)(struct smu_context *smu,enum smu_power_src_type power_src);void (*log_thermal_throttling_event)(struct smu_context *smu); +size_t (*get_pp_feature_mask)(struct smu_context *smu,char *buf); +int (*set_pp_feature_mask)(struct smu_context *smu,uint64_t new_mask); }; typedef enum {
@@ -724,9 +726,6 @@ extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;extern const struct amdgpu_ip_block_version smu_v12_0_ip_block; -extern int smu_feature_set_enabled (struct smu_context *smu, -enum smu_feature_mask mask,bool enable); -int smu_update_table (struct smu_context *smu,enum smu_table_id table_index,int argument,void *table_data,bool drv2smu);
@@ -766,7 +765,6 @@ int smu_set_display_count(struct smu_context *smu, uint32_t count);int smu_set_ac_dc (struct smu_context *smu);bool smu_clk_dpm_is_enabled (struct smu_context *smu,enum smu_clk_type clk_type);const char *smu_get_message_name (struct smu_context *smu,enum smu_message_type type); -const char *smu_get_feature_name (struct smu_context *smu,enum smu_feature_mask feature);size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf);int smu_sys_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask); int smu_force_clk_levels(struct smu_context *smu,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +2 -0
@@ -2328,6 +2328,8 @@ static const struct pptable_funcs navi10_ppt_funcs = { .run_btc = navi10_run_btc, .disable_umc_cdr_12gbps_workaround = navi10_disable_umc_cdr_12gbps_workaround, .set_power_source = smu_v11_0_set_power_source, + .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, + .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, };void navi10_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +2 -0
@@ -996,6 +996,8 @@ static const struct pptable_funcs renoir_ppt_funcs = { .set_soft_freq_limited_range = smu_v12_0_set_soft_freq_limited_range, .set_driver_table_location = smu_v12_0_set_driver_table_location, .is_dpm_running = renoir_is_dpm_running, + .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, + .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, };void renoir_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +2 -0
@@ -2442,6 +2442,8 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .baco_exit = smu_v11_0_baco_exit, .get_dpm_ultimate_freq = sienna_cichlid_get_dpm_ultimate_freq, .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, + .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, + .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, };void sienna_cichlid_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/smu_cmn.c +163 -0
172 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_cmn.h +10 -0
@@ -39,4 +39,14 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,uint32_t *feature_mask, uint32_t num); +int smu_cmn_feature_set_enabled (struct smu_context *smu, +enum smu_feature_mask mask, +bool enable); + +size_t smu_cmn_get_pp_feature_mask (struct smu_context *smu, +char *buf); + +int smu_cmn_set_pp_feature_mask (struct smu_context *smu, +uint64_t new_mask); +#endif
drivers/gpu/drm/amd/powerplay/smu_internal.h +2 -0
@@ -91,5 +91,7 @@#define smu_get_unique_id (smu) smu_ppt_funcs(get_unique_id, 0, smu)#define smu_log_thermal_throttling (smu) smu_ppt_funcs(log_thermal_throttling_event, 0, smu)#define smu_get_asic_power_limits (smu) smu_ppt_funcs(get_power_limit, 0, smu) +#define smu_get_pp_feature_mask (smu, buf) smu_ppt_funcs(get_pp_feature_mask, 0, smu, buf) +#define smu_set_pp_feature_mask (smu, new_mask) smu_ppt_funcs(set_pp_feature_mask, 0, smu, new_mask)#endif
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1 -1
@@ -1204,7 +1204,7 @@ smu_v11_0_auto_fan_control(struct smu_context *smu, bool auto_fan_control)if (!smu_cmn_feature_is_supported (smu,SMU_FEATURE_FAN_CONTROL_BIT ))return 0 ; - ret =smu_feature_set_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT , auto_fan_control); + ret =smu_cmn_feature_set_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT , auto_fan_control);if (ret)dev_err (smu->adev->dev,"[%s]%s smc FAN CONTROL feature failed!" , __func__, (auto_fan_control ?"Start" :"Stop" ));
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/17 drm/amd/powerplay: common API for disabling all features with exception
In reply to Evan QuanWe are moving to centralize all feature enablement/support checking and setting APIs in smu_cmn.c.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 10 ++-------- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 1 + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 1 + .../drm/amd/powerplay/sienna_cichlid_ppt.c | 1 + drivers/gpu/drm/amd/powerplay/smu_cmn.c | 19 +++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 3 +++ drivers/gpu/drm/amd/powerplay/smu_internal.h | 1 + 9 files changed, 30 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2 -8
@@ -1094,7 +1094,6 @@ static int smu_hw_init(void *handle)static int smu_disable_dpms (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev; -uint64_t features_to_disable;int ret =0 ; bool use_baco = !smu->is_apu && ((adev->in_gpu_reset &&
@@ -1130,13 +1129,8 @@ static int smu_disable_dpms(struct smu_context *smu)* BACO feature has to be kept enabled. */ if (use_baco &&smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT )) { - features_to_disable =U64_MAX & - ~(1ULL <<smu_cmn_to_asic_specific_index (smu, -CMN2ASIC_MAPPING_FEATURE , -SMU_FEATURE_BACO_BIT )); - ret =smu_feature_update_enable_state (smu, - features_to_disable, -0 ); + ret =smu_disable_all_features_with_exception (smu, +SMU_FEATURE_BACO_BIT );if (ret)dev_err (adev->dev,"Failed to disable smu features except BACO.\n" ); }else {
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -0
@@ -2275,6 +2275,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, + .disable_all_features_with_exception = smu_cmn_disable_all_features_with_exception, .notify_display_change = NULL, .set_power_limit = smu_v11_0_set_power_limit, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -0
@@ -534,6 +534,7 @@ struct pptable_funcs {int (*set_allowed_mask)(struct smu_context *smu);int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num);int (*feature_is_enabled)(struct smu_context *smu,enum smu_feature_mask mask); +int (*disable_all_features_with_exception)(struct smu_context *smu,enum smu_feature_mask mask);int (*notify_display_change)(struct smu_context *smu);int (*set_power_limit)(struct smu_context *smu,uint32_t n);int (*init_max_sustainable_clocks)(struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1 -0
@@ -2300,6 +2300,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, + .disable_all_features_with_exception = smu_cmn_disable_all_features_with_exception, .notify_display_change = smu_v11_0_notify_display_change, .set_power_limit = smu_v11_0_set_power_limit, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1 -0
@@ -991,6 +991,7 @@ static const struct pptable_funcs renoir_ppt_funcs = { .set_default_dpm_table = smu_v12_0_set_default_dpm_tables, .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, + .disable_all_features_with_exception = smu_cmn_disable_all_features_with_exception, .get_dpm_ultimate_freq = renoir_get_dpm_ultimate_freq, .mode2_reset = smu_v12_0_mode2_reset, .set_soft_freq_limited_range = smu_v12_0_set_soft_freq_limited_range,
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +1 -0
@@ -2419,6 +2419,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_cmn_get_enabled_mask, .feature_is_enabled = smu_cmn_feature_is_enabled, + .disable_all_features_with_exception = smu_cmn_disable_all_features_with_exception, .notify_display_change = NULL, .set_power_limit = smu_v11_0_set_power_limit, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
drivers/gpu/drm/amd/powerplay/smu_cmn.c +19 -0
@@ -355,3 +355,22 @@ int smu_cmn_set_pp_feature_mask(struct smu_context *smu,return ret; } + +int smu_cmn_disable_all_features_with_exception (struct smu_context *smu, +enum smu_feature_mask mask) +{ +uint64_t features_to_disable =U64_MAX ; +int skipped_feature_id; + + skipped_feature_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + mask); +if (skipped_feature_id <0 ) +return -EINVAL ; + + features_to_disable &= ~(1ULL << skipped_feature_id); + +return smu_cmn_feature_update_enable_state (smu, + features_to_disable, +0 ); +}
drivers/gpu/drm/amd/powerplay/smu_cmn.h +3 -0
@@ -49,4 +49,7 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,int smu_cmn_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask); +int smu_cmn_disable_all_features_with_exception (struct smu_context *smu, +enum smu_feature_mask mask); +#endif
drivers/gpu/drm/amd/powerplay/smu_internal.h +1 -0
@@ -55,6 +55,7 @@#define smu_feature_set_allowed_mask (smu) smu_ppt_funcs(set_allowed_mask, 0, smu)#define smu_feature_get_enabled_mask (smu, mask, num) smu_ppt_funcs(get_enabled_mask, 0, smu, mask, num)#define smu_feature_is_enabled (smu, mask) smu_ppt_funcs(feature_is_enabled, 0, smu, mask) +#define smu_disable_all_features_with_exception (smu, mask) smu_ppt_funcs(disable_all_features_with_exception, 0, smu, mask)#define smu_is_dpm_running (smu) smu_ppt_funcs(is_dpm_running, 0 , smu)#define smu_notify_display_change (smu) smu_ppt_funcs(notify_display_change, 0, smu)#define smu_set_default_dpm_table (smu) smu_ppt_funcs(set_default_dpm_table, 0, smu)
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/17 drm/amd/powerplay: move more APIs to smu_cmn.c
In reply to Evan QuanConsidering they are shared by all ASICs.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 64 ------------------ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 14 ++-- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 - drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 +- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 66 +++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 7 ++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 10 +-- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 4 +- 9 files changed, 89 insertions(+), 82 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -64
@@ -91,43 +91,6 @@ int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask)return ret; } -int smu_get_smc_version (struct smu_context *smu,uint32_t *if_version,uint32_t *smu_version) -{ -int ret =0 ; - -if (!if_version && !smu_version) -return -EINVAL ; - -if (smu->smc_fw_if_version && smu->smc_fw_version) - { -if (if_version) - *if_version = smu->smc_fw_if_version; - -if (smu_version) - *smu_version = smu->smc_fw_version; - -return 0 ; - } - -if (if_version) { - ret =smu_send_smc_msg (smu, SMU_MSG_GetDriverIfVersion, if_version); -if (ret) -return ret; - - smu->smc_fw_if_version = *if_version; - } - -if (smu_version) { - ret =smu_send_smc_msg (smu, SMU_MSG_GetSmuVersion, smu_version); -if (ret) -return ret; - - smu->smc_fw_version = *smu_version; - } - -return ret; -} - int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t min,
@@ -171,33 +134,6 @@ int smu_get_dpm_freq_range(struct smu_context *smu,return ret; } -bool smu_clk_dpm_is_enabled (struct smu_context *smu,enum smu_clk_type clk_type) -{ -enum smu_feature_mask feature_id =0 ; - -switch (clk_type) { -case SMU_MCLK : -case SMU_UCLK : - feature_id =SMU_FEATURE_DPM_UCLK_BIT ; -break ; -case SMU_GFXCLK : -case SMU_SCLK : - feature_id =SMU_FEATURE_DPM_GFXCLK_BIT ; -break ; -case SMU_SOCCLK : - feature_id =SMU_FEATURE_DPM_SOCCLK_BIT ; -break ; -default : -return true; - } - -if (!smu_feature_is_enabled (smu, feature_id)) { -return false; - } - -return true; -} -/** * smu_dpm_set_power_gate - power gate/ungate the specific IP block *
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +7 -7
@@ -873,7 +873,7 @@ static int arcturus_force_clk_levels(struct smu_context *smu,uint32_t smu_version;int ret =0 ; - ret =smu_get_smc_version (smu,NULL , &smu_version); + ret =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (ret) {dev_err (smu->adev->dev,"Failed to get smu version!\n" );return ret;
@@ -1190,7 +1190,7 @@ static int arcturus_get_power_profile_mode(struct smu_context *smu,if (!buf)return -EINVAL ; - result =smu_get_smc_version (smu,NULL , &smu_version); + result =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (result)return result;
@@ -1277,7 +1277,7 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu,return -EINVAL ; } - ret =smu_get_smc_version (smu,NULL , &smu_version); + ret =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (ret)return ret;
@@ -1361,7 +1361,7 @@ static int arcturus_set_performance_level(struct smu_context *smu,uint32_t smu_version;int ret; - ret =smu_get_smc_version (smu,NULL , &smu_version); + ret =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (ret) {dev_err (smu->adev->dev,"Failed to get smu version!\n" );return ret;
@@ -2095,7 +2095,7 @@ static void arcturus_get_unique_id(struct smu_context *smu)uint32_t top32 =0 , bottom32 =0 , smu_version;uint64_t id; -if (smu_get_smc_version (smu,NULL , &smu_version)) { +if (smu_cmn_get_smc_version (smu,NULL , &smu_version)) {dev_warn (adev->dev,"Failed to get smu version, cannot get unique_id or serial_number\n" );return ; }
@@ -2136,7 +2136,7 @@ static int arcturus_set_df_cstate(struct smu_context *smu,uint32_t smu_version;int ret; - ret =smu_get_smc_version (smu,NULL , &smu_version); + ret =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (ret) {dev_err (smu->adev->dev,"Failed to get smu version!\n" );return ret;
@@ -2156,7 +2156,7 @@ static int arcturus_allow_xgmi_power_down(struct smu_context *smu, bool en)uint32_t smu_version;int ret; - ret =smu_get_smc_version (smu,NULL , &smu_version); + ret =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (ret) {dev_err (smu->adev->dev,"Failed to get smu version!\n" );return ret;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -2
@@ -755,7 +755,6 @@ extern int smu_handle_task(struct smu_context *smu,int smu_switch_power_profile (struct smu_context *smu,enum PP_SMC_POWER_PROFILE type,bool en); -int smu_get_smc_version (struct smu_context *smu,uint32_t *if_version,uint32_t *smu_version);int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max); int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
@@ -764,7 +763,6 @@ enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);int smu_set_ac_dc (struct smu_context *smu); -bool smu_clk_dpm_is_enabled (struct smu_context *smu,enum smu_clk_type clk_type);const char *smu_get_message_name (struct smu_context *smu,enum smu_message_type type);size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf);int smu_sys_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1 -1
@@ -2215,7 +2215,7 @@ static int navi10_disable_umc_cdr_12gbps_workaround(struct smu_context *smu)if (!navi10_need_umc_cdr_12gbps_workaround (smu->adev))return 0 ; - ret =smu_get_smc_version (smu,NULL , &smu_version); + ret =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1 -1
@@ -232,7 +232,7 @@ static int renoir_get_dpm_ultimate_freq(struct smu_context *smu,uint32_t mclk_mask, soc_mask;uint32_t clock_limit; -if (!smu_clk_dpm_is_enabled (smu, clk_type)) { +if (!smu_cmn_clk_dpm_is_enabled (smu, clk_type)) {switch (clk_type) {case SMU_MCLK :case SMU_UCLK :
drivers/gpu/drm/amd/powerplay/smu_cmn.c +66 -0
75 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_cmn.h +7 -0
@@ -35,6 +35,9 @@ int smu_cmn_feature_is_supported(struct smu_context *smu,int smu_cmn_feature_is_enabled (struct smu_context *smu,enum smu_feature_mask mask); +bool smu_cmn_clk_dpm_is_enabled (struct smu_context *smu, +enum smu_clk_type clk_type); +int smu_cmn_get_enabled_mask (struct smu_context *smu,uint32_t *feature_mask,uint32_t num);
@@ -52,4 +55,8 @@ int smu_cmn_set_pp_feature_mask(struct smu_context *smu,int smu_cmn_disable_all_features_with_exception (struct smu_context *smu,enum smu_feature_mask mask); +int smu_cmn_get_smc_version (struct smu_context *smu, +uint32_t *if_version, +uint32_t *smu_version); +#endif
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +5 -5
@@ -282,7 +282,7 @@ int smu_v11_0_check_fw_version(struct smu_context *smu)uint8_t smu_minor, smu_debug;int ret =0 ; - ret =smu_get_smc_version (smu, &if_version, &smu_version); + ret =smu_cmn_get_smc_version (smu, &if_version, &smu_version);if (ret)return ret;
@@ -1668,7 +1668,7 @@ int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type cuint32_t param =0 ;uint32_t clock_limit; -if (!smu_clk_dpm_is_enabled (smu, clk_type)) { +if (!smu_cmn_clk_dpm_is_enabled (smu, clk_type)) {switch (clk_type) {case SMU_MCLK :case SMU_UCLK :
@@ -1729,7 +1729,7 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu,int ret =0 , clk_id =0 ;uint32_t param; -if (!smu_clk_dpm_is_enabled (smu, clk_type)) +if (!smu_cmn_clk_dpm_is_enabled (smu, clk_type))return 0 ; clk_id = smu_cmn_to_asic_specific_index(smu,
@@ -1775,7 +1775,7 @@ int smu_v11_0_set_hard_freq_limited_range(struct smu_context *smu,if (min <=0 && max <=0 )return -EINVAL ; -if (!smu_clk_dpm_is_enabled (smu, clk_type)) +if (!smu_cmn_clk_dpm_is_enabled (smu, clk_type))return 0 ; clk_id = smu_cmn_to_asic_specific_index(smu,
@@ -1932,7 +1932,7 @@ int smu_v11_0_get_dpm_freq_by_index(struct smu_context *smu,if (!value)return -EINVAL ; -if (!smu_clk_dpm_is_enabled (smu, clk_type)) +if (!smu_cmn_clk_dpm_is_enabled (smu, clk_type))return 0 ; clk_id = smu_cmn_to_asic_specific_index(smu,
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +2 -2
@@ -157,7 +157,7 @@ int smu_v12_0_check_fw_version(struct smu_context *smu)uint8_t smu_minor, smu_debug;int ret =0 ; - ret =smu_get_smc_version (smu, &if_version, &smu_version); + ret =smu_cmn_get_smc_version (smu, &if_version, &smu_version);if (ret)return ret;
@@ -305,7 +305,7 @@ int smu_v12_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_ {int ret =0 ; -if (!smu_clk_dpm_is_enabled (smu, clk_type)) +if (!smu_cmn_clk_dpm_is_enabled (smu, clk_type))return 0 ;switch (clk_type) {
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/17 drm/amd/powerplay: maximum code sharing around watermarks setting
In reply to Evan QuanMaximum code sharing.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 +-- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 27 ++--- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 102 ++++++++-------- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 85 +++++++------- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 111 +++++++++--------- drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 +- 7 files changed, 166 insertions(+), 182 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +4 -15
@@ -1484,23 +1484,12 @@ static int amdgpu_dm_smu_write_watermarks_table(struct amdgpu_device *adev)return 0 ; } -mutex_lock (&smu->mutex); - -/* pass data to smu controller */ -if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && - !(smu->watermarks_bitmap &WATERMARKS_LOADED )) { - ret =smu_write_watermarks_table (smu); - -if (ret) { -mutex_unlock (&smu->mutex); -DRM_ERROR ("Failed to update WMTABLE!\n" ); -return ret; - } - smu->watermarks_bitmap |=WATERMARKS_LOADED ; + ret =smu_write_watermarks_table (smu); +if (ret) { +DRM_ERROR ("Failed to update WMTABLE!\n" ); +return ret; } -mutex_unlock (&smu->mutex); -return 0 ; }
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +13 -14
@@ -1692,35 +1692,34 @@ int smu_allow_xgmi_power_down(struct smu_context *smu, bool en)int smu_write_watermarks_table (struct smu_context *smu) { -void *watermarks_table = smu->smu_table.watermarks_table; +int ret =0 ; -if (!watermarks_table) -return -EINVAL ; +if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled) +return -EOPNOTSUPP ; -return smu_update_table (smu, -SMU_TABLE_WATERMARKS , -0 , - watermarks_table, - true); +mutex_lock (&smu->mutex); + + ret =smu_set_watermarks_table (smu,NULL ); + +mutex_unlock (&smu->mutex); + +return ret; }int smu_set_watermarks_for_clock_ranges (struct smu_context *smu,struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges) { -void *table = smu->smu_table.watermarks_table; +int ret =0 ;if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)return -EOPNOTSUPP ; -if (!table) -return -EINVAL ; -mutex_lock (&smu->mutex);if (!smu->disable_watermark &&smu_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) &&smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { -smu_set_watermarks_table (smu, table, clock_ranges); + ret =smu_set_watermarks_table (smu, clock_ranges);if (!(smu->watermarks_bitmap &WATERMARKS_EXIST )) { smu->watermarks_bitmap |=WATERMARKS_EXIST ;
@@ -1730,7 +1729,7 @@ int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,mutex_unlock (&smu->mutex); -return 0 ; +return ret; }int smu_set_ac_dc (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -1
@@ -493,7 +493,7 @@ struct pptable_funcs {int (*tables_init)(struct smu_context *smu,struct smu_table *tables);int (*get_fan_speed_percent)(struct smu_context *smu,uint32_t *speed);int (*get_fan_speed_rpm)(struct smu_context *smu,uint32_t *speed); -int (*set_watermarks_table)(struct smu_context *smu,void *watermarks, +int (*set_watermarks_table)(struct smu_context *smu,struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges);int (*get_thermal_temperature_range)(struct smu_context *smu,struct smu_temperature_range *range);int (*get_uclk_dpm_states)(struct smu_context *smu,uint32_t *clocks_in_khz,uint32_t *num_states);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +50 -52
117 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +42 -43
101 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +55 -56
121 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_internal.h +1 -1
@@ -78,7 +78,7 @@#define smu_get_current_shallow_sleep_clocks (smu, clocks) smu_ppt_funcs(get_current_shallow_sleep_clocks, 0, smu, clocks)#define smu_dpm_set_vcn_enable (smu, enable) smu_ppt_funcs(dpm_set_vcn_enable, 0, smu, enable)#define smu_dpm_set_jpeg_enable (smu, enable) smu_ppt_funcs(dpm_set_jpeg_enable, 0, smu, enable) -#define smu_set_watermarks_table (smu, tab, clock_ranges) smu_ppt_funcs(set_watermarks_table, 0, smu, tab, clock_ranges) +#define smu_set_watermarks_table (smu, clock_ranges) smu_ppt_funcs(set_watermarks_table, 0, smu, clock_ranges)#define smu_thermal_temperature_range_update (smu, range, rw) smu_ppt_funcs(thermal_temperature_range_update, 0, smu, range, rw)#define smu_register_irq_handler (smu) smu_ppt_funcs(register_irq_handler, 0, smu)#define smu_get_dpm_ultimate_freq (smu, param, min, max) smu_ppt_funcs(get_dpm_ultimate_freq, 0, smu, param, min, max)
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/17 drm/amd/powerplay: move table setting common code to smu_cmn.c
In reply to Evan QuanAs they are shared by all ASICs.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 41 ----------- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 14 ++-- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 3 - drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 - drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 16 ++--- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 4 +- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 12 ++-- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 69 +++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_cmn.h | 10 +++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 11 --- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 2 +- 11 files changed, 103 insertions(+), 81 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -41
@@ -208,47 +208,6 @@ int smu_get_power_num_states(struct smu_context *smu,return 0 ; } -int smu_update_table (struct smu_context *smu,enum smu_table_id table_index,int argument, -void *table_data,bool drv2smu) -{ -struct smu_table_context *smu_table = &smu->smu_table; -struct amdgpu_device *adev = smu->adev; -struct smu_table *table = &smu_table->driver_table; -int table_id =smu_cmn_to_asic_specific_index (smu, -CMN2ASIC_MAPPING_TABLE , - table_index); -uint32_t table_size; -int ret =0 ; -if (!table_data || table_id >=SMU_TABLE_COUNT || table_id <0 ) -return -EINVAL ; - - table_size = smu_table->tables[table_index].size; - -if (drv2smu) { -memcpy (table->cpu_addr, table_data, table_size); -/* -* Flush hdp cache: to guard the content seen by -* GPU is consitent with CPU. -*/ -amdgpu_asic_flush_hdp (adev,NULL ); - } - - ret =smu_send_smc_msg_with_param (smu, drv2smu ? - SMU_MSG_TransferTableDram2Smu : - SMU_MSG_TransferTableSmu2Dram, - table_id | ((argument &0xFFFF ) <<16 ), -NULL ); -if (ret) -return ret; - -if (!drv2smu) { -amdgpu_asic_flush_hdp (adev,NULL ); -memcpy (table_data, table->cpu_addr, table_size); - } - -return ret; -} -bool is_support_sw_smu (struct amdgpu_device *adev) {if (adev->asic_type >=CHIP_ARCTURUS )
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +7 -7
@@ -526,7 +526,7 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,if (!smu_table->metrics_time ||time_after (jiffies, smu_table->metrics_time +msecs_to_jiffies (1 ))) { - ret = smu_update_table(smu, + ret = smu_cmn_update_table(smu, SMU_TABLE_SMU_METRICS, 0, smu_table->metrics_table,
@@ -1214,7 +1214,7 @@ static int arcturus_get_power_profile_mode(struct smu_context *smu,continue ;if (smu_version >=0x360d00 ) { - result = smu_update_table(smu, + result = smu_cmn_update_table(smu, SMU_TABLE_ACTIVITY_MONITOR_COEFF, workload_type, (void *)(&activity_monitor),
@@ -1283,7 +1283,7 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu,if ((profile_mode ==PP_SMC_POWER_PROFILE_CUSTOM ) && (smu_version >=0x360d00 )) { - ret = smu_update_table(smu, + ret = smu_cmn_update_table(smu, SMU_TABLE_ACTIVITY_MONITOR_COEFF, WORKLOAD_PPLIB_CUSTOM_BIT, (void *)(&activity_monitor),
@@ -1318,7 +1318,7 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu,break ; } - ret = smu_update_table(smu, + ret = smu_cmn_update_table(smu, SMU_TABLE_ACTIVITY_MONITOR_COEFF, WORKLOAD_PPLIB_CUSTOM_BIT, (void *)(&activity_monitor),
@@ -1908,7 +1908,7 @@ static int arcturus_i2c_eeprom_read_data(struct i2c_adapter *control,mutex_lock (&adev->smu.mutex);/* Now read data starting with that address */ - ret =smu_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , &req, + ret =smu_cmn_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , &req, true);mutex_unlock (&adev->smu.mutex);
@@ -1943,7 +1943,7 @@ static int arcturus_i2c_eeprom_write_data(struct i2c_adapter *control,arcturus_fill_eeprom_i2c_req (&req, true, address, numbytes, data);mutex_lock (&adev->smu.mutex); - ret =smu_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , &req, true); + ret =smu_cmn_update_table (&adev->smu,SMU_TABLE_I2C_COMMANDS ,0 , &req, true);mutex_unlock (&adev->smu.mutex);if (!ret) {
@@ -2265,7 +2265,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .setup_pptable = arcturus_setup_pptable, .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, .check_fw_version = smu_v11_0_check_fw_version, - .write_pptable = smu_v11_0_write_pptable, + .write_pptable = smu_cmn_write_pptable, .set_driver_table_location = smu_v11_0_set_driver_table_location, .set_tool_table_location = smu_v11_0_set_tool_table_location, .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -3
@@ -727,9 +727,6 @@ extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;extern const struct amdgpu_ip_block_version smu_v12_0_ip_block; -int smu_update_table (struct smu_context *smu,enum smu_table_id table_index,int argument, -void *table_data,bool drv2smu); -bool is_support_sw_smu (struct amdgpu_device *adev);int smu_reset (struct smu_context *smu);int smu_sys_get_pp_table (struct smu_context *smu,void **table);
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +0 -2
@@ -159,8 +159,6 @@ int smu_v11_0_get_vbios_bootup_values(struct smu_context *smu);int smu_v11_0_check_fw_version (struct smu_context *smu); -int smu_v11_0_write_pptable (struct smu_context *smu); -int smu_v11_0_set_driver_table_location (struct smu_context *smu);int smu_v11_0_set_tool_table_location (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +8 -8
@@ -488,7 +488,7 @@ static int navi10_get_smu_metrics_data(struct smu_context *smu,mutex_lock (&smu->metrics_lock);if (!smu_table->metrics_time ||time_after (jiffies, smu_table->metrics_time +msecs_to_jiffies (1 ))) { - ret = smu_update_table(smu, + ret = smu_cmn_update_table(smu, SMU_TABLE_SMU_METRICS, 0, smu_table->metrics_table,
@@ -1397,7 +1397,7 @@ static int navi10_get_power_profile_mode(struct smu_context *smu, char *buf)if (workload_type <0 )return -EINVAL ; - result =smu_update_table (smu, + result =smu_cmn_update_table (smu,SMU_TABLE_ACTIVITY_MONITOR_COEFF , workload_type, (void *)(&activity_monitor), false);if (result) {
@@ -1468,7 +1468,7 @@ static int navi10_set_power_profile_mode(struct smu_context *smu, long *input, uif (smu->power_profile_mode ==PP_SMC_POWER_PROFILE_CUSTOM ) { - ret =smu_update_table (smu, + ret =smu_cmn_update_table (smu,SMU_TABLE_ACTIVITY_MONITOR_COEFF ,WORKLOAD_PPLIB_CUSTOM_BIT , (void *)(&activity_monitor), false);if (ret) {
@@ -1512,7 +1512,7 @@ static int navi10_set_power_profile_mode(struct smu_context *smu, long *input, ubreak ; } - ret =smu_update_table (smu, + ret =smu_cmn_update_table (smu,SMU_TABLE_ACTIVITY_MONITOR_COEFF ,WORKLOAD_PPLIB_CUSTOM_BIT , (void *)(&activity_monitor), true);if (ret) {
@@ -1635,7 +1635,7 @@ static int navi10_set_watermarks_table(struct smu_context *smu,/* pass data to smu controller */ if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && !(smu->watermarks_bitmap &WATERMARKS_LOADED )) { - ret =smu_write_watermarks_table (smu); + ret =smu_cmn_write_watermarks_table (smu);if (ret) {dev_err (smu->adev->dev,"Failed to update WMTABLE!" );return ret;
@@ -1956,7 +1956,7 @@ static int navi10_set_default_od_settings(struct smu_context *smu) (OverDriveTable_t *)smu->smu_table.boot_overdrive_table;int ret =0 ; - ret =smu_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, false); + ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, false);if (ret) {dev_err (smu->adev->dev,"Failed to get overdrive table!\n" );return ret;
@@ -2090,7 +2090,7 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLbreak ;case PP_OD_COMMIT_DPM_TABLE :navi10_dump_od_table (smu, od_table); - ret =smu_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, true); + ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , (void *)od_table, true);if (ret) {dev_err (smu->adev->dev,"Failed to import overdrive table!\n" );return ret;
@@ -2288,7 +2288,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .setup_pptable = navi10_setup_pptable, .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, .check_fw_version = smu_v11_0_check_fw_version, - .write_pptable = smu_v11_0_write_pptable, + .write_pptable = smu_cmn_write_pptable, .set_driver_table_location = smu_v11_0_set_driver_table_location, .set_tool_table_location = smu_v11_0_set_tool_table_location, .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location,
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +2 -2
@@ -135,7 +135,7 @@ static int renoir_get_metrics_table(struct smu_context *smu,mutex_lock (&smu->metrics_lock);if (!smu_table->metrics_time ||time_after (jiffies, smu_table->metrics_time +msecs_to_jiffies (100 ))) { - ret =smu_update_table (smu,SMU_TABLE_SMU_METRICS ,0 , + ret =smu_cmn_update_table (smu,SMU_TABLE_SMU_METRICS ,0 , (void *)smu_table->metrics_table, false);if (ret) {dev_info (smu->adev->dev,"Failed to export SMU metrics table!\n" );
@@ -865,7 +865,7 @@ static int renoir_set_watermarks_table(/* pass data to smu controller */ if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && !(smu->watermarks_bitmap &WATERMARKS_LOADED )) { - ret =smu_write_watermarks_table (smu); + ret =smu_cmn_write_watermarks_table (smu);if (ret) {dev_err (smu->adev->dev,"Failed to update WMTABLE!" );return ret;
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +6 -6
@@ -393,7 +393,7 @@ static int sienna_cichlid_get_smu_metrics_data(struct smu_context *smu,mutex_lock (&smu->metrics_lock);if (!smu_table->metrics_time ||time_after (jiffies, smu_table->metrics_time +msecs_to_jiffies (1 ))) { - ret = smu_update_table(smu, + ret = smu_cmn_update_table(smu, SMU_TABLE_SMU_METRICS, 0, smu_table->metrics_table,
@@ -1190,7 +1190,7 @@ static int sienna_cichlid_get_power_profile_mode(struct smu_context *smu, char *if (workload_type <0 )return -EINVAL ; - result =smu_update_table (smu, + result =smu_cmn_update_table (smu,SMU_TABLE_ACTIVITY_MONITOR_COEFF , workload_type, (void *)(&activity_monitor), false);if (result) {
@@ -1261,7 +1261,7 @@ static int sienna_cichlid_set_power_profile_mode(struct smu_context *smu, long *if (smu->power_profile_mode ==PP_SMC_POWER_PROFILE_CUSTOM ) { - ret =smu_update_table (smu, + ret =smu_cmn_update_table (smu,SMU_TABLE_ACTIVITY_MONITOR_COEFF ,WORKLOAD_PPLIB_CUSTOM_BIT , (void *)(&activity_monitor), false);if (ret) {
@@ -1305,7 +1305,7 @@ static int sienna_cichlid_set_power_profile_mode(struct smu_context *smu, long *break ; } - ret =smu_update_table (smu, + ret =smu_cmn_update_table (smu,SMU_TABLE_ACTIVITY_MONITOR_COEFF ,WORKLOAD_PPLIB_CUSTOM_BIT , (void *)(&activity_monitor), true);if (ret) {
@@ -1428,7 +1428,7 @@ static int sienna_cichlid_set_watermarks_table(struct smu_context *smu,if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) && !(smu->watermarks_bitmap &WATERMARKS_LOADED )) { - ret =smu_write_watermarks_table (smu); + ret =smu_cmn_write_watermarks_table (smu);if (ret) {dev_err (smu->adev->dev,"Failed to update WMTABLE!" );return ret;
@@ -2408,7 +2408,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .setup_pptable = sienna_cichlid_setup_pptable, .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, .check_fw_version = smu_v11_0_check_fw_version, - .write_pptable = smu_v11_0_write_pptable, + .write_pptable = smu_cmn_write_pptable, .set_driver_table_location = smu_v11_0_set_driver_table_location, .set_tool_table_location = smu_v11_0_set_tool_table_location, .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location,
drivers/gpu/drm/amd/powerplay/smu_cmn.c +69 -0
72 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_cmn.h +10 -0
@@ -59,4 +59,14 @@ int smu_cmn_get_smc_version(struct smu_context *smu,uint32_t *if_version, uint32_t *smu_version); +int smu_cmn_update_table (struct smu_context *smu, +enum smu_table_id table_index, +int argument, +void *table_data, +bool drv2smu); + +int smu_cmn_write_watermarks_table (struct smu_context *smu); + +int smu_cmn_write_pptable (struct smu_context *smu); +#endif
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0 -11
@@ -769,17 +769,6 @@ int smu_v11_0_notify_memory_pool_location(struct smu_context *smu)return ret; } -int smu_v11_0_write_pptable (struct smu_context *smu) -{ -struct smu_table_context *table_context = &smu->smu_table; -int ret =0 ; - - ret =smu_update_table (smu,SMU_TABLE_PPTABLE ,0 , - table_context->driver_pptable, true); - -return ret; -} -int smu_v11_0_set_min_deep_sleep_dcefclk (struct smu_context *smu,uint32_t clk) {int ret;
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +1 -1
@@ -293,7 +293,7 @@ int smu_v12_0_set_default_dpm_tables(struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table; -return smu_update_table (smu,SMU_TABLE_DPMCLOCKS ,0 , smu_table->clocks_table, false); +return smu_cmn_update_table (smu,SMU_TABLE_DPMCLOCKS ,0 , smu_table->clocks_table, false); }int smu_v12_0_mode2_reset (struct smu_context *smu){
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/17 drm/amd/powerplay: update the tables init related
In reply to Evan QuanTo avoid cross calling and maintain clear code layer.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 23 +++-- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 +- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 2 - drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 25 ++++-- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 6 +- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 25 ++++-- drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 - drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 86 ++++--------------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 30 ++----- 9 files changed, 83 insertions(+), 120 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +18 -5
@@ -206,9 +206,10 @@ static const struct cmn2asic_mapping arcturus_workload_map[PP_SMC_POWER_PROFILE_ WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM, WORKLOAD_PPLIB_CUSTOM_BIT), }; -static int arcturus_tables_init (struct smu_context *smu,struct smu_table *tables) +static int arcturus_tables_init (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table; +struct smu_table *tables = smu_table->tables;SMU_TABLE_INIT (tables,SMU_TABLE_PPTABLE ,sizeof (PPTable_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );
@@ -257,6 +258,21 @@ static int arcturus_allocate_dpm_context(struct smu_context *smu)return 0 ; } +static int arcturus_init_smc_tables (struct smu_context *smu) +{ +int ret =0 ; + + ret =arcturus_tables_init (smu); +if (ret) +return ret; + + ret =arcturus_allocate_dpm_context (smu); +if (ret) +return ret; + +return smu_v11_0_init_smc_tables (smu); +} +static int arcturus_get_allowed_feature_mask (struct smu_context *smu,uint32_t *feature_mask,uint32_t num)
@@ -2226,9 +2242,6 @@ static void arcturus_log_thermal_throttling_event(struct smu_context *smu) }static const struct pptable_funcs arcturus_ppt_funcs = { -/* internal structurs allocations */ - .tables_init = arcturus_tables_init, - .alloc_dpm_context = arcturus_allocate_dpm_context,/* init dpm */ .get_allowed_feature_mask = arcturus_get_allowed_feature_mask,/* btc */
@@ -2256,7 +2269,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, .fini_microcode = smu_v11_0_fini_microcode, - .init_smc_tables = smu_v11_0_init_smc_tables, + .init_smc_tables = arcturus_init_smc_tables, .fini_smc_tables = smu_v11_0_fini_smc_tables, .init_power = smu_v11_0_init_power, .fini_power = smu_v11_0_fini_power,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -3
@@ -259,7 +259,7 @@ struct smu_table_contextvoid *max_sustainable_clocks;struct smu_bios_boot_up_values boot_values;void *driver_pptable; -struct smu_table *tables; +struct smu_table tables[SMU_TABLE_COUNT ];/* * The driver table is just a staging buffer for * uploading/downloading content from the SMU.
@@ -451,7 +451,6 @@ struct smu_contextstruct i2c_adapter ;struct pptable_funcs { -int (*alloc_dpm_context)(struct smu_context *smu);int (*run_btc)(struct smu_context *smu);int (*get_allowed_feature_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num);enum amd_pm_state_type (*get_current_power_state)(struct smu_context *smu);
@@ -490,7 +489,6 @@ struct pptable_funcs {int (*notify_smc_display_config)(struct smu_context *smu);int (*set_cpu_power_state)(struct smu_context *smu);bool (*is_dpm_running)(struct smu_context *smu); -int (*tables_init)(struct smu_context *smu,struct smu_table *tables);int (*get_fan_speed_percent)(struct smu_context *smu,uint32_t *speed);int (*get_fan_speed_rpm)(struct smu_context *smu,uint32_t *speed); int (*set_watermarks_table)(struct smu_context *smu,
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +0 -2
@@ -58,8 +58,6 @@ uint32_t smu_v12_0_get_gfxoff_status(struct smu_context *smu);int smu_v12_0_gfx_off_control (struct smu_context *smu,bool enable); -int smu_v12_0_init_smc_tables (struct smu_context *smu); -int smu_v12_0_fini_smc_tables (struct smu_context *smu);int smu_v12_0_set_default_dpm_tables (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +18 -7
@@ -447,9 +447,10 @@ static int navi10_setup_pptable(struct smu_context *smu)return ret; } -static int navi10_tables_init (struct smu_context *smu,struct smu_table *tables) +static int navi10_tables_init (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table; +struct smu_table *tables = smu_table->tables;SMU_TABLE_INIT (tables,SMU_TABLE_PPTABLE ,sizeof (PPTable_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );
@@ -578,9 +579,6 @@ static int navi10_allocate_dpm_context(struct smu_context *smu) {struct smu_dpm_context *smu_dpm = &smu->smu_dpm; -if (smu_dpm->dpm_context) -return -EINVAL ; - smu_dpm->dpm_context =kzalloc (sizeof (struct smu_11_0_dpm_context ),GFP_KERNEL );if (!smu_dpm->dpm_context)
@@ -591,6 +589,21 @@ static int navi10_allocate_dpm_context(struct smu_context *smu)return 0 ; } +static int navi10_init_smc_tables (struct smu_context *smu) +{ +int ret =0 ; + + ret =navi10_tables_init (smu); +if (ret) +return ret; + + ret =navi10_allocate_dpm_context (smu); +if (ret) +return ret; + +return smu_v11_0_init_smc_tables (smu); +} +static int navi10_set_default_dpm_table (struct smu_context *smu) {struct smu_11_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
@@ -2251,8 +2264,6 @@ static int navi10_disable_umc_cdr_12gbps_workaround(struct smu_context *smu) }static const struct pptable_funcs navi10_ppt_funcs = { - .tables_init = navi10_tables_init, - .alloc_dpm_context = navi10_allocate_dpm_context, .get_allowed_feature_mask = navi10_get_allowed_feature_mask, .set_default_dpm_table = navi10_set_default_dpm_table, .dpm_set_vcn_enable = navi10_dpm_set_vcn_enable,
@@ -2280,7 +2291,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, .fini_microcode = smu_v11_0_fini_microcode, - .init_smc_tables = smu_v11_0_init_smc_tables, + .init_smc_tables = navi10_init_smc_tables, .fini_smc_tables = smu_v11_0_fini_smc_tables, .init_power = smu_v11_0_init_power, .fini_power = smu_v11_0_fini_power,
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +3 -3
@@ -151,9 +151,10 @@ static int renoir_get_metrics_table(struct smu_context *smu,return ret; } -static int renoir_tables_init (struct smu_context *smu,struct smu_table *tables) +static int renoir_init_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table; +struct smu_table *tables = smu_table->tables;SMU_TABLE_INIT (tables,SMU_TABLE_WATERMARKS ,sizeof (Watermarks_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );
@@ -966,7 +967,6 @@ static bool renoir_is_dpm_running(struct smu_context *smu) }static const struct pptable_funcs renoir_ppt_funcs = { - .tables_init = renoir_tables_init, .set_power_state =NULL , .print_clk_levels = renoir_print_clk_levels, .get_current_power_state = renoir_get_current_power_state,
@@ -985,7 +985,7 @@ static const struct pptable_funcs renoir_ppt_funcs = { .send_smc_msg_with_param = smu_v12_0_send_msg_with_param, .set_gfx_cgpg = smu_v12_0_set_gfx_cgpg, .gfx_off_control = smu_v12_0_gfx_off_control, - .init_smc_tables = smu_v12_0_init_smc_tables, + .init_smc_tables = renoir_init_smc_tables, .fini_smc_tables = smu_v12_0_fini_smc_tables, .set_default_dpm_table = smu_v12_0_set_default_dpm_tables, .get_enabled_mask = smu_cmn_get_enabled_mask,
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +18 -7
@@ -352,9 +352,10 @@ static int sienna_cichlid_setup_pptable(struct smu_context *smu)return ret; } -static int sienna_cichlid_tables_init (struct smu_context *smu,struct smu_table *tables) +static int sienna_cichlid_tables_init (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table; +struct smu_table *tables = smu_table->tables;SMU_TABLE_INIT (tables,SMU_TABLE_PPTABLE ,sizeof (PPTable_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );
@@ -490,9 +491,6 @@ static int sienna_cichlid_allocate_dpm_context(struct smu_context *smu) {struct smu_dpm_context *smu_dpm = &smu->smu_dpm; -if (smu_dpm->dpm_context) -return -EINVAL ; - smu_dpm->dpm_context =kzalloc (sizeof (struct smu_11_0_dpm_context ),GFP_KERNEL );if (!smu_dpm->dpm_context)
@@ -503,6 +501,21 @@ static int sienna_cichlid_allocate_dpm_context(struct smu_context *smu)return 0 ; } +static int sienna_cichlid_init_smc_tables (struct smu_context *smu) +{ +int ret =0 ; + + ret =sienna_cichlid_tables_init (smu); +if (ret) +return ret; + + ret =sienna_cichlid_allocate_dpm_context (smu); +if (ret) +return ret; + +return smu_v11_0_init_smc_tables (smu); +} +static int sienna_cichlid_set_default_dpm_table (struct smu_context *smu) {struct smu_11_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
@@ -2372,8 +2385,6 @@ static void sienna_cichlid_dump_pptable(struct smu_context *smu) }static const struct pptable_funcs sienna_cichlid_ppt_funcs = { - .tables_init = sienna_cichlid_tables_init, - .alloc_dpm_context = sienna_cichlid_allocate_dpm_context, .get_allowed_feature_mask = sienna_cichlid_get_allowed_feature_mask, .set_default_dpm_table = sienna_cichlid_set_default_dpm_table, .dpm_set_vcn_enable = sienna_cichlid_dpm_set_vcn_enable,
@@ -2400,7 +2411,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .dump_pptable = sienna_cichlid_dump_pptable, .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, - .init_smc_tables = smu_v11_0_init_smc_tables, + .init_smc_tables = sienna_cichlid_init_smc_tables, .fini_smc_tables = smu_v11_0_fini_smc_tables, .init_power = smu_v11_0_init_power, .fini_power = smu_v11_0_fini_power,
drivers/gpu/drm/amd/powerplay/smu_internal.h +0 -2
@@ -50,7 +50,6 @@#define smu_set_default_od_settings (smu) smu_ppt_funcs(set_default_od_settings, 0, smu)#define smu_send_smc_msg_with_param (smu, msg, param, read_arg) smu_ppt_funcs(send_smc_msg_with_param, 0, smu, msg, param, read_arg)#define smu_send_smc_msg (smu, msg, read_arg) smu_ppt_funcs(send_smc_msg_with_param, 0, smu, msg, 0, read_arg) -#define smu_alloc_dpm_context (smu) smu_ppt_funcs(alloc_dpm_context, 0, smu)#define smu_init_display_count (smu, count) smu_ppt_funcs(init_display_count, 0, smu, count)#define smu_feature_set_allowed_mask (smu) smu_ppt_funcs(set_allowed_mask, 0, smu)#define smu_feature_get_enabled_mask (smu, mask, num) smu_ppt_funcs(get_enabled_mask, 0, smu, mask, num)
@@ -61,7 +60,6 @@#define smu_set_default_dpm_table (smu) smu_ppt_funcs(set_default_dpm_table, 0, smu)#define smu_populate_umd_state_clk (smu) smu_ppt_funcs(populate_umd_state_clk, 0, smu)#define smu_set_default_od8_settings (smu) smu_ppt_funcs(set_default_od8_settings, 0, smu) -#define smu_tables_init (smu, tab) smu_ppt_funcs(tables_init, 0, smu, tab)#define smu_enable_thermal_alert (smu) smu_ppt_funcs(enable_thermal_alert, 0, smu)#define smu_disable_thermal_alert (smu) smu_ppt_funcs(disable_thermal_alert, 0, smu)#define smu_smc_read_sensor (smu, sensor, data, size) smu_ppt_funcs(read_sensor, -EINVAL, smu, sensor, data, size)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +19 -67
145 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +6 -24
@@ -255,36 +255,18 @@ int smu_v12_0_gfx_off_control(struct smu_context *smu, bool enable)return ret; } -int smu_v12_0_init_smc_tables (struct smu_context *smu) -{ -struct smu_table_context *smu_table = &smu->smu_table; -struct smu_table *tables =NULL ; - -if (smu_table->tables) -return -EINVAL ; - - tables =kcalloc (SMU_TABLE_COUNT ,sizeof (struct smu_table ), -GFP_KERNEL ); -if (!tables) -return -ENOMEM ; - - smu_table->tables = tables; - -return smu_tables_init (smu, tables); -} -int smu_v12_0_fini_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table; -if (!smu_table->tables) -return -EINVAL ; -kfree (smu_table->clocks_table); -kfree (smu_table->tables); - smu_table->clocks_table =NULL ; - smu_table->tables =NULL ; + +kfree (smu_table->metrics_table); + smu_table->metrics_table =NULL ; + +kfree (smu_table->watermarks_table); + smu_table->watermarks_table =NULL ;return 0 ; }
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/17 drm/amd/powerplay: move SMC message issuing APIs to smu_cmn.c
In reply to Evan QuanConsidering they can be shared by all ASICs.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 13 -- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 25 +-- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 6 - drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 11 -- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 29 ++-- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 29 ++-- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 25 +-- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 139 +++++++++++++++- drivers/gpu/drm/amd/powerplay/smu_cmn.h | 9 + drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 157 ++++-------------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 114 ++----------- 13 files changed, 251 insertions(+), 312 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -13
@@ -46,19 +46,6 @@#undef pr_info#undef pr_debug -#undef __SMU_DUMMY_MAP -#define __SMU_DUMMY_MAP (type) #type -static const char * __smu_message_names[] = { -SMU_MESSAGE_TYPES -}; - -const char *smu_get_message_name (struct smu_context *smu,enum smu_message_type type) -{ -if (type <0 || type >=SMU_MSG_MAX_COUNT ) -return "unknown smu message" ; -return __smu_message_names[type]; -} -size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf) {size_t size =0 ;
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +13 -12
@@ -454,13 +454,13 @@ static int arcturus_run_btc(struct smu_context *smu) {int ret =0 ; - ret =smu_send_smc_msg (smu, SMU_MSG_RunAfllBtc,NULL ); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_RunAfllBtc,NULL );if (ret) {dev_err (smu->adev->dev,"RunAfllBtc failed!\n" );return ret; } -return smu_send_smc_msg (smu, SMU_MSG_RunDcBtc,NULL ); +return smu_cmn_send_smc_msg (smu, SMU_MSG_RunDcBtc,NULL ); }static int arcturus_populate_umd_state_clk (struct smu_context *smu)
@@ -838,7 +838,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu,if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT ) && (feature_mask &FEATURE_DPM_GFXCLK_MASK )) { freq = dpm_context->dpm_tables.gfx_table.dpm_levels[level].value; - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, (max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq), (PPCLK_GFXCLK <<16 ) | (freq &0xffff ),NULL );
@@ -852,7 +852,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu,if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT ) && (feature_mask &FEATURE_DPM_UCLK_MASK )) { freq = dpm_context->dpm_tables.uclk_table.dpm_levels[level].value; - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, (max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq), (PPCLK_UCLK <<16 ) | (freq &0xffff ),NULL );
@@ -866,7 +866,7 @@ static int arcturus_upload_dpm_level(struct smu_context *smu,if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT ) && (feature_mask &FEATURE_DPM_SOCCLK_MASK )) { freq = dpm_context->dpm_tables.soc_table.dpm_levels[level].value; - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, (max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq), (PPCLK_SOCCLK <<16 ) | (freq &0xffff ),NULL );
@@ -1357,7 +1357,7 @@ static int arcturus_set_power_profile_mode(struct smu_context *smu,return -EINVAL ; } - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetWorkloadMask,1 << workload_type,NULL );
@@ -2123,8 +2123,8 @@ static void arcturus_get_unique_id(struct smu_context *smu) }/* Get the SN to turn into a Unique ID */ -smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumTop32, &top32); -smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumBottom32, &bottom32); +smu_cmn_send_smc_msg (smu, SMU_MSG_ReadSerialNumTop32, &top32); +smu_cmn_send_smc_msg (smu, SMU_MSG_ReadSerialNumBottom32, &bottom32); id = ((uint64_t )bottom32 <<32 ) | top32; adev->unique_id = id;
@@ -2164,7 +2164,7 @@ static int arcturus_set_df_cstate(struct smu_context *smu,return -EINVAL ; } -return smu_send_smc_msg_with_param (smu, SMU_MSG_DFCstateControl, state,NULL ); +return smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_DFCstateControl, state,NULL ); }static int arcturus_allow_xgmi_power_down (struct smu_context *smu,bool en)
@@ -2185,12 +2185,12 @@ static int arcturus_allow_xgmi_power_down(struct smu_context *smu, bool en) }if (en) -return smu_send_smc_msg_with_param (smu, +return smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GmiPwrDnControl,1 ,NULL ); -return smu_send_smc_msg_with_param (smu, +return smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GmiPwrDnControl,0 ,NULL );
@@ -2283,7 +2283,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .set_tool_table_location = smu_v11_0_set_tool_table_location, .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, .system_features_control = smu_v11_0_system_features_control, - .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, + .send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param, + .send_smc_msg = smu_cmn_send_smc_msg, .init_display_count = NULL, .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_cmn_get_enabled_mask,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +3 -1
@@ -528,6 +528,9 @@ struct pptable_funcs {int (*system_features_control)(struct smu_context *smu,bool en);int (*send_smc_msg_with_param)(struct smu_context *smu,enum smu_message_type msg,uint32_t param,uint32_t *read_arg); +int (*send_smc_msg)(struct smu_context *smu, +enum smu_message_type msg, +uint32_t *read_arg);int (*init_display_count)(struct smu_context *smu,uint32_t count);int (*set_allowed_mask)(struct smu_context *smu);int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num);
@@ -758,7 +761,6 @@ enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);int smu_set_ac_dc (struct smu_context *smu); -const char *smu_get_message_name (struct smu_context *smu,enum smu_message_type type);size_t smu_sys_get_pp_feature_mask (struct smu_context *smu,char *buf);int smu_sys_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask); int smu_force_clk_levels(struct smu_context *smu,
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +0 -6
@@ -168,12 +168,6 @@ int smu_v11_0_notify_memory_pool_location(struct smu_context *smu);int smu_v11_0_system_features_control (struct smu_context *smu,bool en); -int -smu_v11_0_send_msg_with_param (struct smu_context *smu, -enum smu_message_type msg, -uint32_t param, -uint32_t *read_arg); -int smu_v11_0_init_display_count (struct smu_context *smu,uint32_t count);int smu_v11_0_set_allowed_mask (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +0 -11
@@ -31,17 +31,6 @@#define MP1_Public 0x03b00000#define MP1_SRAM 0x03c00004 -int smu_v12_0_send_msg_without_waiting (struct smu_context *smu, -uint16_t msg); - -int smu_v12_0_wait_for_response (struct smu_context *smu); - -int -smu_v12_0_send_msg_with_param (struct smu_context *smu, -enum smu_message_type msg, -uint32_t param, -uint32_t *read_arg); -int smu_v12_0_check_fw_status (struct smu_context *smu);int smu_v12_0_check_fw_version (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +15 -14
@@ -785,14 +785,14 @@ static int navi10_dpm_set_vcn_enable(struct smu_context *smu, bool enable)if (enable) {/* vcn dpm on is a prerequisite for vcn power gate messages */ if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,1 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,1 ,NULL );if (ret)return ret; } power_gate->vcn_gated = false; }else {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { - ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn,NULL ); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PowerDownVcn,NULL );if (ret)return ret; }
@@ -810,14 +810,14 @@ static int navi10_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)if (enable) {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { - ret =smu_send_smc_msg (smu, SMU_MSG_PowerUpJpeg,NULL ); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PowerUpJpeg,NULL );if (ret)return ret; } power_gate->jpeg_gated = false; }else {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { - ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownJpeg,NULL ); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PowerDownJpeg,NULL );if (ret)return ret; }
@@ -1257,7 +1257,7 @@ static int navi10_pre_display_config_changed(struct smu_context *smu)int ret =0 ;uint32_t max_freq =0 ; - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays,0 ,NULL );if (ret)return ret;
@@ -1280,7 +1280,7 @@ static int navi10_display_config_changed(struct smu_context *smu)if ((smu->watermarks_bitmap &WATERMARKS_EXIST ) &&smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) &&smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays, smu->display_config->num_display,NULL );if (ret)
@@ -1540,7 +1540,7 @@ static int navi10_set_power_profile_mode(struct smu_context *smu, long *input, u smu->power_profile_mode);if (workload_type <0 )return -EINVAL ; -smu_send_smc_msg_with_param (smu, SMU_MSG_SetWorkloadMask, +smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetWorkloadMask,1 << workload_type,NULL );return ret;
@@ -1563,7 +1563,7 @@ static int navi10_notify_smc_display_config(struct smu_context *smu) ret =smu_v11_0_display_clock_voltage_request (smu, &clock_req);if (!ret) {if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetMinDeepSleepDcefclk, min_clocks.dcef_clock_in_sr/100 ,NULL );
@@ -1883,7 +1883,7 @@ static int navi10_update_pcie_parameters(struct smu_context *smu, ((pptable->PcieGenSpeed[i] <= pcie_gen_cap) ? (pptable->PcieGenSpeed[i] <<8 ) : (pcie_gen_cap <<8 )) | ((pptable->PcieLaneCount[i] <= pcie_width_cap) ? pptable->PcieLaneCount[i] : pcie_width_cap); - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_OverridePcieParameters, smu_pcie_arg,NULL );
@@ -1935,7 +1935,7 @@ static int navi10_overdrive_get_gfx_clk_base_voltage(struct smu_context *smu,uint32_t value =0 ;int ret; - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GetVoltageByDpm, param, &value);
@@ -2183,7 +2183,7 @@ static int navi10_run_btc(struct smu_context *smu) {int ret =0 ; - ret =smu_send_smc_msg (smu, SMU_MSG_RunBtc,NULL ); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_RunBtc,NULL );if (ret)dev_err (smu->adev->dev,"RunBtc failed!\n" );
@@ -2195,9 +2195,9 @@ static int navi10_dummy_pstate_control(struct smu_context *smu, bool enable)int result =0 ;if (!enable) - result =smu_send_smc_msg (smu,SMU_MSG_DAL_DISABLE_DUMMY_PSTATE_CHANGE ,NULL ); + result =smu_cmn_send_smc_msg (smu,SMU_MSG_DAL_DISABLE_DUMMY_PSTATE_CHANGE ,NULL );else - result =smu_send_smc_msg (smu,SMU_MSG_DAL_ENABLE_DUMMY_PSTATE_CHANGE ,NULL ); + result =smu_cmn_send_smc_msg (smu,SMU_MSG_DAL_ENABLE_DUMMY_PSTATE_CHANGE ,NULL );return result; }
@@ -2304,7 +2304,8 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_tool_table_location = smu_v11_0_set_tool_table_location, .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, .system_features_control = smu_v11_0_system_features_control, - .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, + .send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param, + .send_smc_msg = smu_cmn_send_smc_msg, .init_display_count = smu_v11_0_init_display_count, .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_cmn_get_enabled_mask,
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +15 -14
@@ -272,7 +272,7 @@ static int renoir_get_dpm_ultimate_freq(struct smu_context *smu,switch (clk_type) {case SMU_GFXCLK :case SMU_SCLK : - ret =smu_send_smc_msg (smu, SMU_MSG_GetMaxGfxclkFrequency, max); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_GetMaxGfxclkFrequency, max);if (ret) {dev_err (smu->adev->dev,"Attempt to get max GX frequency from SMC Failed !\n" ); goto failed;
@@ -300,7 +300,7 @@ static int renoir_get_dpm_ultimate_freq(struct smu_context *smu,switch (clk_type) {case SMU_GFXCLK :case SMU_SCLK : - ret =smu_send_smc_msg (smu, SMU_MSG_GetMinGfxclkFrequency, min); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_GetMinGfxclkFrequency, min);if (ret) {dev_err (smu->adev->dev,"Attempt to get min GX frequency from SMC Failed !\n" ); goto failed;
@@ -444,14 +444,14 @@ static int renoir_dpm_set_vcn_enable(struct smu_context *smu, bool enable)if (enable) {/* vcn dpm on is a prerequisite for vcn power gate messages */ if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0 ,NULL );if (ret)return ret; } power_gate->vcn_gated = false; }else {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT )) { - ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn,NULL ); + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PowerDownVcn,NULL );if (ret)return ret; }
@@ -469,14 +469,14 @@ static int renoir_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)if (enable) {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpJpeg,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpJpeg,0 ,NULL );if (ret)return ret; } power_gate->jpeg_gated = false; }else {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_JPEG_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerDownJpeg,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerDownJpeg,0 ,NULL );if (ret)return ret; }
@@ -668,13 +668,13 @@ static int renoir_force_clk_levels(struct smu_context *smu, ret =renoir_get_dpm_ultimate_freq (smu,SMU_GFXCLK , &min_freq, &max_freq);if (ret)return ret; - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetSoftMaxGfxClk, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetSoftMaxGfxClk, soft_max_level ==0 ? min_freq : soft_max_level ==1 ?RENOIR_UMD_PSTATE_GFXCLK : max_freq,NULL );if (ret)return ret; - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinGfxClk, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinGfxClk, soft_min_level ==2 ? max_freq : soft_min_level ==1 ?RENOIR_UMD_PSTATE_GFXCLK : min_freq,NULL );
@@ -684,10 +684,10 @@ static int renoir_force_clk_levels(struct smu_context *smu,case SMU_SOCCLK :GET_DPM_CUR_FREQ (clk_table, clk_type, soft_min_level, min_freq);GET_DPM_CUR_FREQ (clk_table, clk_type, soft_max_level, max_freq); - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetSoftMaxSocclkByFreq, max_freq,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetSoftMaxSocclkByFreq, max_freq,NULL );if (ret)return ret; - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinSocclkByFreq, min_freq,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinSocclkByFreq, min_freq,NULL );if (ret)return ret;break ;
@@ -695,10 +695,10 @@ static int renoir_force_clk_levels(struct smu_context *smu,case SMU_FCLK :GET_DPM_CUR_FREQ (clk_table, clk_type, soft_min_level, min_freq);GET_DPM_CUR_FREQ (clk_table, clk_type, soft_max_level, max_freq); - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetSoftMaxFclkByFreq, max_freq,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetSoftMaxFclkByFreq, max_freq,NULL );if (ret)return ret; - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinFclkByFreq, min_freq,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinFclkByFreq, min_freq,NULL );if (ret)return ret;break ;
@@ -732,7 +732,7 @@ static int renoir_set_power_profile_mode(struct smu_context *smu, long *input, ureturn -EINVAL ; } - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetWorkloadMask, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetWorkloadMask,1 << workload_type,NULL );if (ret) {
@@ -982,7 +982,8 @@ static const struct pptable_funcs renoir_ppt_funcs = { .check_fw_status = smu_v12_0_check_fw_status, .check_fw_version = smu_v12_0_check_fw_version, .powergate_sdma = smu_v12_0_powergate_sdma, - .send_smc_msg_with_param = smu_v12_0_send_msg_with_param, + .send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param, + .send_smc_msg = smu_cmn_send_smc_msg, .set_gfx_cgpg = smu_v12_0_set_gfx_cgpg, .gfx_off_control = smu_v12_0_gfx_off_control, .init_smc_tables = renoir_init_smc_tables,
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +13 -12
@@ -751,20 +751,20 @@ static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enablif (enable) {/* vcn dpm on is a prerequisite for vcn power gate messages */ if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0 ,NULL );if (ret)return ret; - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0x10000 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,0x10000 ,NULL );if (ret)return ret; } power_gate->vcn_gated = false; }else {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerDownVcn,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerDownVcn,0 ,NULL );if (ret)return ret; - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerDownVcn,0x10000 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerDownVcn,0x10000 ,NULL );if (ret)return ret; }
@@ -782,14 +782,14 @@ static int sienna_cichlid_dpm_set_jpeg_enable(struct smu_context *smu, bool enabif (enable) {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpJpeg,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerUpJpeg,0 ,NULL );if (ret)return ret; } power_gate->jpeg_gated = false; }else {if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_MM_DPM_PG_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerDownJpeg,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_PowerDownJpeg,0 ,NULL );if (ret)return ret; }
@@ -1047,7 +1047,7 @@ static int sienna_cichlid_pre_display_config_changed(struct smu_context *smu)/* Sienna_Cichlid do not support to change display num currently */ return 0 ;#if 0 - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays,0 ,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays,0 ,NULL );if (ret)return ret;#endif
@@ -1072,7 +1072,7 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu) smu_cmn_feature_is_supported(smu, SMU_FEATURE_DPM_DCEFCLK_BIT) && smu_cmn_feature_is_supported(smu, SMU_FEATURE_DPM_SOCCLK_BIT)) {#if 0 - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays, smu->display_config->num_display,NULL );#endif
@@ -1333,7 +1333,7 @@ static int sienna_cichlid_set_power_profile_mode(struct smu_context *smu, long * smu->power_profile_mode);if (workload_type <0 )return -EINVAL ; -smu_send_smc_msg_with_param (smu, SMU_MSG_SetWorkloadMask, +smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetWorkloadMask,1 << workload_type,NULL );return ret;
@@ -1356,7 +1356,7 @@ static int sienna_cichlid_notify_smc_display_config(struct smu_context *smu) ret =smu_v11_0_display_clock_voltage_request (smu, &clock_req);if (!ret) {if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_SetMinDeepSleepDcefclk, min_clocks.dcef_clock_in_sr/100 ,NULL );
@@ -1678,7 +1678,7 @@ static int sienna_cichlid_update_pcie_parameters(struct smu_context *smu, pptable->PcieLaneCount[i] : pcie_width_cap); - ret =smu_send_smc_msg_with_param (smu, + ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_OverridePcieParameters, smu_pcie_arg,NULL );
@@ -2424,7 +2424,8 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .set_tool_table_location = smu_v11_0_set_tool_table_location, .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, .system_features_control = smu_v11_0_system_features_control, - .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, + .send_smc_msg_with_param = smu_cmn_send_smc_msg_with_param, + .send_smc_msg = smu_cmn_send_smc_msg, .init_display_count = NULL, .set_allowed_mask = smu_v11_0_set_allowed_mask, .get_enabled_mask = smu_cmn_get_enabled_mask,
drivers/gpu/drm/amd/powerplay/smu_cmn.c +130 -9
200 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_cmn.h +9 -0
@@ -25,6 +25,15 @@#include "amdgpu_smu.h" +int smu_cmn_send_smc_msg_with_param (struct smu_context *smu, +enum smu_message_type msg, +uint32_t param, +uint32_t *read_arg); + +int smu_cmn_send_smc_msg (struct smu_context *smu, +enum smu_message_type msg, +uint32_t *read_arg); +int smu_cmn_to_asic_specific_index (struct smu_context *smu,enum smu_cmn2asic_mapping_type type,uint32_t index);
drivers/gpu/drm/amd/powerplay/smu_internal.h +1 -1
@@ -49,7 +49,7 @@#define smu_init_max_sustainable_clocks (smu) smu_ppt_funcs(init_max_sustainable_clocks, 0, smu)#define smu_set_default_od_settings (smu) smu_ppt_funcs(set_default_od_settings, 0, smu)#define smu_send_smc_msg_with_param (smu, msg, param, read_arg) smu_ppt_funcs(send_smc_msg_with_param, 0, smu, msg, param, read_arg) -#define smu_send_smc_msg (smu, msg, read_arg) smu_ppt_funcs(send_smc_msg_with_param, 0, smu, msg, 0, read_arg) +#define smu_send_smc_msg (smu, msg, read_arg) smu_ppt_funcs(send_smc_msg, 0, smu, msg, read_arg)#define smu_init_display_count (smu, count) smu_ppt_funcs(init_display_count, 0, smu, count)#define smu_feature_set_allowed_mask (smu) smu_ppt_funcs(set_allowed_mask, 0, smu)#define smu_feature_get_enabled_mask (smu, mask, num) smu_ppt_funcs(get_enabled_mask, 0, smu, mask, num)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +36 -121
351 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +16 -98
188 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/17 drm/amd/powerplay: drop unnecessary message support check
In reply to Evan QuanThese messages are known to be supported by all ASICs.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -9
@@ -34,7 +34,6 @@#include "sienna_cichlid_ppt.h" #include "renoir_ppt.h" #include "amd_pcie.h" -#include "smu_cmn.h" /* * DO NOT use these for err/warn/info/debug messages.
@@ -1576,14 +1575,6 @@ int smu_set_mp1_state(struct smu_context *smu,return 0 ; } -/* some asics may not support those messages */ -if (smu_cmn_to_asic_specific_index (smu, -CMN2ASIC_MAPPING_MSG , - msg) <0 ) { -mutex_unlock (&smu->mutex); -return 0 ; - } - ret =smu_send_smc_msg (smu, msg,NULL );if (ret)dev_err (smu->adev->dev,"[PrepareMp1] Failed!\n" );
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/17 drm/amd/powerplay: revise the calling flow on OD table update
In reply to Evan QuanThis can eliminate the cross callings and maintain clear code layer.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 +++++++- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 7 ------- 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7 -1
@@ -1900,8 +1900,14 @@ int smu_od_edit_dpm_table(struct smu_context *smu,mutex_lock (&smu->mutex); -if (smu->ppt_funcs->od_edit_dpm_table) +if (smu->ppt_funcs->od_edit_dpm_table) { ret = smu->ppt_funcs->od_edit_dpm_table (smu, type, input, size); +if (!ret && (type ==PP_OD_COMMIT_DPM_TABLE )) + ret =smu_handle_task (smu, + smu->smu_dpm.dpm_level, +AMD_PP_TASK_READJUST_POWER_STATE , + false); + }mutex_unlock (&smu->mutex);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0 -7
@@ -2108,13 +2108,6 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLdev_err (smu->adev->dev,"Failed to import overdrive table!\n" );return ret; } -// no lock needed because smu_od_edit_dpm_table has it - ret =smu_handle_task (smu, smu->smu_dpm.dpm_level, -AMD_PP_TASK_READJUST_POWER_STATE , - false); -if (ret) { -return ret; - }break ;case PP_OD_EDIT_VDDC_CURVE :if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODCAP_GFXCLK_CURVE )) {
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/17 drm/amd/powerplay: tag swSMU code layers
In reply to Evan QuanPer designs, the swSMU code is separated into four layers. And the typical calling flow should be like: amdgpu_smu.c -> ${asic}_ppt.c -> smu_v11/12_0.c -> smu_cmn.c. Compile errors will come out for any violations. This can help to prevent cross callings(e.g. amdgpu_smu.c -> ${asic}_ppt.c -> amdgpu_smu.c -> ${asic}_ppt.c) which were common in our code.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++-- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 3 ++- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 ++ drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 3 +++ drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 3 +++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 3 ++- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 3 ++- drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 3 ++- drivers/gpu/drm/amd/powerplay/smu_cmn.c | 3 ++- drivers/gpu/drm/amd/powerplay/smu_cmn.h | 2 ++ drivers/gpu/drm/amd/powerplay/smu_internal.h | 3 +++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 3 ++- 13 files changed, 28 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2 -2
@@ -20,14 +20,14 @@* OTHER DEALINGS IN THE SOFTWARE. */ +#define SWSMU_CODE_LAYER_L1 +#include <linux/firmware.h> #include <linux/pci.h> #include "amdgpu.h" #include "amdgpu_smu.h" #include "smu_internal.h" -#include "smu_v11_0.h" -#include "smu_v12_0.h" #include "atom.h" #include "arcturus_ppt.h" #include "navi10_ppt.h"
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2 -1
@@ -21,10 +21,11 @@* */ +#define SWSMU_CODE_LAYER_L2 +#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" -#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h"
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -0
@@ -650,6 +650,7 @@ enum smu_cmn2asic_mapping_type {#define WORKLOAD_MAP (profile, workload) \ [profile] = {1, (workload)} +#if !defined(SWSMU_CODE_LAYER_L2 ) && !defined(SWSMU_CODE_LAYER_L3 ) && !defined(SWSMU_CODE_LAYER_L4 )int smu_load_microcode (struct smu_context *smu);int smu_check_fw_status (struct smu_context *smu);
@@ -783,3 +784,4 @@ int smu_get_dpm_clock_table(struct smu_context *smu, struct dpm_clocks *clock_table);#endif +#endif
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +3 -0
@@ -133,6 +133,8 @@ enum smu_v11_0_baco_seq { BACO_SEQ_COUNT, }; +#if defined(SWSMU_CODE_LAYER_L2 ) || defined(SWSMU_CODE_LAYER_L3 ) +int smu_v11_0_init_microcode (struct smu_context *smu);void smu_v11_0_fini_microcode (struct smu_context *smu);
@@ -264,3 +266,4 @@ int smu_v11_0_get_dpm_level_range(struct smu_context *smu, uint32_t *max_value);#endif +#endif
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +3 -0
@@ -31,6 +31,8 @@#define MP1_Public 0x03b00000#define MP1_SRAM 0x03c00004 +#if defined(SWSMU_CODE_LAYER_L2 ) || defined(SWSMU_CODE_LAYER_L3 ) +int smu_v12_0_check_fw_status (struct smu_context *smu);int smu_v12_0_check_fw_version (struct smu_context *smu);
@@ -59,3 +61,4 @@ int smu_v12_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_int smu_v12_0_set_driver_table_location (struct smu_context *smu);#endif +#endif
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +2 -1
@@ -21,11 +21,12 @@* */ +#define SWSMU_CODE_LAYER_L2 +#include <linux/firmware.h> #include <linux/pci.h> #include "amdgpu.h" #include "amdgpu_smu.h" -#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "soc15_common.h"
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +2 -1
@@ -21,9 +21,10 @@* */ +#define SWSMU_CODE_LAYER_L2 +#include "amdgpu.h" #include "amdgpu_smu.h" -#include "smu_internal.h" #include "smu_v12_0_ppsmc.h" #include "smu12_driver_if.h" #include "smu_v12_0.h"
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +2 -1
@@ -21,11 +21,12 @@* */ +#define SWSMU_CODE_LAYER_L2 +#include <linux/firmware.h> #include <linux/pci.h> #include "amdgpu.h" #include "amdgpu_smu.h" -#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h"
drivers/gpu/drm/amd/powerplay/smu_cmn.c +2 -1
@@ -20,10 +20,11 @@* OTHER DEALINGS IN THE SOFTWARE. */ +#define SWSMU_CODE_LAYER_L4 +#include "amdgpu.h" #include "amdgpu_smu.h" #include "smu_cmn.h" -#include "smu_internal.h" #include "soc15_common.h" /*
drivers/gpu/drm/amd/powerplay/smu_cmn.h +2 -0
@@ -25,6 +25,7 @@#include "amdgpu_smu.h" +#if defined(SWSMU_CODE_LAYER_L2 ) || defined(SWSMU_CODE_LAYER_L3 ) || defined(SWSMU_CODE_LAYER_L4 ) int smu_cmn_send_smc_msg_with_param(struct smu_context *smu, enum smu_message_type msg, uint32_t param,
@@ -79,3 +80,4 @@ int smu_cmn_write_watermarks_table(struct smu_context *smu);int smu_cmn_write_pptable (struct smu_context *smu);#endif +#endif
drivers/gpu/drm/amd/powerplay/smu_internal.h +3 -0
@@ -25,6 +25,8 @@#include "amdgpu_smu.h" +#if defined(SWSMU_CODE_LAYER_L1 ) + #define smu_ppt_funcs(intf, ret, smu, args...) \ ((smu)->ppt_funcs ? ((smu)->ppt_funcs->intf ? (smu)->ppt_funcs->intf(smu, ##args) : ret) : -EINVAL)
@@ -94,3 +96,4 @@#define smu_set_pp_feature_mask (smu, new_mask) smu_ppt_funcs(set_pp_feature_mask, 0, smu, new_mask)#endif +#endif
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1 -1
@@ -26,10 +26,10 @@#include <linux/reboot.h> #define SMU_11_0_PARTIAL_PPTABLE +#define SWSMU_CODE_LAYER_L3 #include "amdgpu.h" #include "amdgpu_smu.h" -#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h"
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +2 -1
@@ -20,10 +20,11 @@* OTHER DEALINGS IN THE SOFTWARE. */ +#define SWSMU_CODE_LAYER_L3 +#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" -#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v12_0.h"
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 134 lines · Evan Quan
To fit our original desgin and this can help to maintain clear code layer.
Change-Id Id89476c14709b5676bbf043371a27f27b94a58edSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 16 --------------- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 +- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ---- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 ++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++-- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 20 +++++++++++++++++-- 7 files changed, 26 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-16@@ -675,22 +675,6 @@ static int smu_late_init(void *handle)return 0 ; } -int smu_get_atom_data_table (struct smu_context *smu,uint32_t table, -uint16_t *size,uint8_t *frev,uint8_t *crev, -uint8_t **addr) -{ -struct amdgpu_device *adev = smu->adev; -uint16_t data_start; - -if (!amdgpu_atom_parse_data_header (adev->mode_info.atom_context, table, - size, frev, crev, &data_start)) -return -EINVAL ; - - *addr = (uint8_t *)adev->mode_info.atom_context->bios + data_start; - -return 0 ; -} -static int smu_init_fb_allocations (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1
-1@@ -488,7 +488,7 @@ static int arcturus_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-4@@ -674,10 +674,6 @@ int smu_baco_exit(struct smu_context *smu);int smu_mode2_reset (struct smu_context *smu); -extern int smu_get_atom_data_table (struct smu_context *smu,uint32_t table, -uint16_t *size,uint8_t *frev,uint8_t *crev, -uint8_t **addr); -extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +4
-0@@ -175,6 +175,10 @@ int smu_v11_0_fini_power(struct smu_context *smu);int smu_v11_0_check_fw_status (struct smu_context *smu); +int smu_v11_0_get_atom_data_table (struct smu_context *smu,uint32_t table, +uint16_t *size,uint8_t *frev,uint8_t *crev, +uint8_t **addr); +int smu_v11_0_setup_pptable (struct smu_context *smu);int smu_v11_0_get_vbios_bootup_values (struct smu_context *smu);drivers/gpu/drm/amd/powerplay/navi10_ppt.c +2
-2@@ -467,7 +467,7 @@ static int navi10_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;@@ -487,7 +487,7 @@ static int navi10_append_powerplay_table(struct smu_context *smu) sizeof(*smc_dpm_table) - sizeof(smc_dpm_table->table_header));break ;case 7 :/* nv12 */ - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table_v4_7);if (ret)return ret;drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +1
-1@@ -398,7 +398,7 @@ static int sienna_cichlid_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL ,NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;drivers/gpu/drm/amd/powerplay/smu_v11_0.c +5
-0@@ -370,6 +370,22 @@ static int smu_v11_0_set_pptable_v2_1(struct smu_context *smu, void **table,return 0 ; } +int smu_v11_0_get_atom_data_table (struct smu_context *smu,uint32_t table, +uint16_t *size,uint8_t *frev,uint8_t *crev, +uint8_t **addr) +{ +struct amdgpu_device *adev = smu->adev;
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_set_pptable_v2_1(struct smu_context *smu, void **table, · line 387
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +10
-0+uint16_t data_start; + +if (!amdgpu_atom_parse_data_header (adev->mode_info.atom_context, table, + size, frev, crev, &data_start)) +return -EINVAL ; + + *addr = (uint8_t *)adev->mode_info.atom_context->bios + data_start; + +return 0 ; +}
This is not really smu11 specific. I think it would be better in the smu_cmn file or even amdgpu_atombios.c.
Patches 2-17:
Quoted 25 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-3+int smu_v11_0_setup_pptable (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;@@ -406,7 +422,7 @@ int smu_v11_0_setup_pptable(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, powerplayinfo); - ret =smu_get_atom_data_table (smu, index, &atom_table_size, &frev, &crev, + ret =smu_v11_0_get_atom_data_table (smu, index, &atom_table_size, &frev, &crev, (uint8_t **)&table);if (ret)return ret;@@ -621,7 +637,7 @@ int smu_v11_0_get_vbios_bootup_values(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, firmwareinfo); - ret =smu_get_atom_data_table (smu, index, &size, &frev, &crev, + ret =smu_v11_0_get_atom_data_table (smu, index, &size, &frev, &crev, (uint8_t **)&header);if (ret)return ret; --2.27.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quan, Evan
Reviewed-by Alex Deucher[AMD Official Use Only - Internal Distribution Only]
Updated in the new patch.
BR,
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Thursday, July 16, 2020 1:58 AM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 01/17] drm/amd/powerplay: move the API shared by SMU v11 to smu_v11_0.c
Quoted 145 lines · Evan Quan
To fit our original desgin and this can help to maintain clear code layer.
Change-Id Id89476c14709b5676bbf043371a27f27b94a58edSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 16 --------------- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 +- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ---- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 ++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++-- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 2 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 20 +++++++++++++++++-- 7 files changed, 26 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-16@@ -675,22 +675,6 @@ static int smu_late_init(void *handle)return 0 ; } -int smu_get_atom_data_table (struct smu_context *smu,uint32_t table, -uint16_t *size,uint8_t *frev,uint8_t *crev, -uint8_t **addr) -{ -struct amdgpu_device *adev = smu->adev; -uint16_t data_start; - -if (!amdgpu_atom_parse_data_header (adev->mode_info.atom_context, table, - size, frev, crev, &data_start)) -return -EINVAL ; - - *addr = (uint8_t *)adev->mode_info.atom_context->bios + data_start; - -return 0 ; -} -static int smu_init_fb_allocations (struct smu_context *smu) { struct amdgpu_device *adev = smu->adev; diff --git
a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.cb/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
index56dc20a617fd..03361d0194fe100644drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2
-1@@ -488,7 +488,7 @@ static int arcturus_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL , +NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-5@@ -674,10 +674,6 @@ int smu_baco_exit(struct smu_context *smu);int smu_mode2_reset (struct smu_context *smu); -extern int smu_get_atom_data_table (struct smu_context *smu,uint32_t table, -uint16_t *size,uint8_t *frev,uint8_t *crev, -uint8_t **addr); -extern const struct amd_ip_funcs smu_ip_funcs;extern const struct amdgpu_ip_block_version smu_v11_0_ip_block; diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
index9b724e4aceaa..8a4053d8eb8c100644drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +4
-0@@ -175,6 +175,10 @@ int smu_v11_0_fini_power(struct smu_context *smu);int smu_v11_0_check_fw_status (struct smu_context *smu); +int smu_v11_0_get_atom_data_table (struct smu_context *smu,uint32_t table, +uint16_t *size,uint8_t *frev,uint8_t *crev, +uint8_t **addr); +int smu_v11_0_setup_pptable (struct smu_context *smu);int
smu_v11_0_get_vbios_bootup_values(struct smu_context *smu); diff
--gita/drivers/gpu/drm/amd/powerplay/navi10_ppt.cb/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index41bd6d157271..ff717b800086100644drivers/gpu/drm/amd/powerplay/navi10_ppt.c +4
-2@@ -467,7 +467,7 @@ static int navi10_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL , +NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;@@ -487,7 +487,7 @@ static int navi10_append_powerplay_table(struct smu_context *smu) sizeof(*smc_dpm_table) - sizeof(smc_dpm_table->table_header));break ;case 7 :/* nv12 */ - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL , +NULL ,NULL , (uint8_t **)&smc_dpm_table_v4_7);if (ret)return ret;drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +2
-1@@ -398,7 +398,7 @@ static int sienna_cichlid_append_powerplay_table(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, smc_dpm_info); - ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + ret =smu_v11_0_get_atom_data_table (smu, index,NULL ,NULL , +NULL , (uint8_t **)&smc_dpm_table);if (ret)return ret;drivers/gpu/drm/amd/powerplay/smu_v11_0.c +5
-0@@ -370,6 +370,22 @@ static int smu_v11_0_set_pptable_v2_1(struct smu_context *smu, void **table,return 0 ; } +int smu_v11_0_get_atom_data_table (struct smu_context *smu,uint32_t table, +uint16_t *size,uint8_t *frev,uint8_t *crev, +uint8_t **addr) { +struct amdgpu_device *adev = smu->adev; +uint16_t data_start;
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_set_pptable_v2_1(struct smu_context *smu, void **table, · line 387
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +10
-0+ +if (!amdgpu_atom_parse_data_header (adev->mode_info.atom_context, table, + size, frev, crev, &data_start)) +return -EINVAL ; + + *addr = (uint8_t *)adev->mode_info.atom_context->bios + + data_start; + +return 0 ; +}
This is not really smu11 specific. I think it would be better in the smu_cmn file or even amdgpu_atombios.c.
Patches 2-17:
Quoted 26 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-0+int smu_v11_0_setup_pptable (struct smu_context *smu) { struct amdgpu_device *adev = smu->adev; @@ -406,7 +422,7 @@int smu_v11_0_setup_pptable (struct smu_context *smu)index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
powerplayinfo);drivers/gpu/drm/amd/powerplay/smu_v11_0.c +4
-3- ret =smu_get_atom_data_table (smu, index, &atom_table_size, &frev, &crev, + ret =smu_v11_0_get_atom_data_table (smu, index, + &atom_table_size, &frev, &crev, (uint8_t **)&table);if (ret)return ret;@@ -621,7 +637,7 @@ int smu_v11_0_get_vbios_bootup_values(struct smu_context *smu) index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, firmwareinfo); - ret =smu_get_atom_data_table (smu, index, &size, &frev, &crev, + ret =smu_v11_0_get_atom_data_table (smu, index, &size, &frev, + &crev, (uint8_t **)&header);if (ret)return ret; --2.27.0
Quoted 8 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cev an.quan%40amd.com%7Cc33d26750f124a1ccbd608d828e8b36f%7C3dd8961fe4884e6 08e11a82d994e183d%7C0%7C0%7C637304327224279817&sdata=dc%2BP6PvWBvR K%2BJuGkMTBYfCqZOYWdZD0FUPs4TH3F1g%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx