drm/amd/pm: correct the way for retrieving enabled ppfeatures on Renoir
Subsystems (3)
PATCH v2 1/7 drm/amd/pm: correct the way for retrieving enabled ppfeatures on Renoir
As other dGPU asics, Renoir should use smu_cmn_get_enabled_mask() for that job.
--- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +2 -1
@@ -710,7 +710,8 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,size_t size =0 ;int ret =0 , i; -if (!smu->is_apu) { +if (!smu->is_apu || + (smu->adev->asic_type ==CHIP_RENOIR )) { ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );
Signature · 1 line
2.29.0
PATCH v2 2/7 drm/amd/pm: unify the interface for retrieving enabled ppfeatures
Instead of having two which do the same thing.
--- .../amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 2 +- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 6 +- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 6 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 93 ++++++++----------- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 - 5 files changed, 44 insertions(+), 67 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c +1 -1
@@ -357,7 +357,7 @@ static bool cyan_skillfish_is_dpm_running(struct smu_context *smu)if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3 -3
@@ -507,7 +507,7 @@ static bool vangogh_is_dpm_running(struct smu_context *smu)if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;
@@ -1965,7 +1965,7 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return ret;
@@ -2182,7 +2182,7 @@ static const struct pptable_funcs vangogh_ppt_funcs = { .dpm_set_jpeg_enable = vangogh_dpm_set_jpeg_enable, .is_dpm_running = vangogh_is_dpm_running, .read_sensor = vangogh_read_sensor, - .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_watermarks_table = vangogh_set_watermarks_table, .set_driver_table_location = smu_v11_0_set_driver_table_location,
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +3 -3
@@ -209,7 +209,7 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return ret;
@@ -258,7 +258,7 @@ static bool yellow_carp_is_dpm_running(struct smu_context *smu)uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;
@@ -1174,7 +1174,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .is_dpm_running = yellow_carp_is_dpm_running, .set_watermarks_table = yellow_carp_set_watermarks_table, .get_gpu_metrics = yellow_carp_get_gpu_metrics, - .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_set_driver_table_location, .gfx_off_control = smu_v13_0_gfx_off_control,
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +37 -56
124 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +0 -4
@@ -61,10 +61,6 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,uint32_t *feature_mask, uint32_t num); -int smu_cmn_get_enabled_32_bits_mask (struct smu_context *smu, -uint32_t *feature_mask, -uint32_t num); -uint64_t smu_cmn_get_indep_throttler_status (const unsigned long dep_status,const uint8_t *throttler_map);
Signature · 1 line
2.29.0
Re: [PATCH V2 2/7] drm/amd/pm: unify the interface for retrieving enabled ppfeatures
Quoted 141 lines · Evan Quan
Instead of having two which do the same thing.
Signed-off-by Evan Quan <[email protected]>Change-Id I6302c9b5abdb999c4b7c83a0d1852181208b1c1f--- .../amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 2 +- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 6 +- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 6 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 93 ++++++++----------- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 - 5 files changed, 44 insertions(+), 67 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c +1
-1@@ -357,7 +357,7 @@ static bool cyan_skillfish_is_dpm_running(struct smu_context *smu)if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-3@@ -507,7 +507,7 @@ static bool vangogh_is_dpm_running(struct smu_context *smu)if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;@@ -1965,7 +1965,7 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return ret;@@ -2182,7 +2182,7 @@ static const struct pptable_funcs vangogh_ppt_funcs = { .dpm_set_jpeg_enable = vangogh_dpm_set_jpeg_enable, .is_dpm_running = vangogh_is_dpm_running, .read_sensor = vangogh_read_sensor, - .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_watermarks_table = vangogh_set_watermarks_table, .set_driver_table_location = smu_v11_0_set_driver_table_location,drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +3
-3@@ -209,7 +209,7 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return ret;@@ -258,7 +258,7 @@ static bool yellow_carp_is_dpm_running(struct smu_context *smu)uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;@@ -1174,7 +1174,7 @@ static const struct pptable_funcs yellow_carp_ppt_funcs = { .is_dpm_running = yellow_carp_is_dpm_running, .set_watermarks_table = yellow_carp_set_watermarks_table, .get_gpu_metrics = yellow_carp_get_gpu_metrics, - .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_set_driver_table_location, .gfx_off_control = smu_v13_0_gfx_off_control,drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +7
-29@@ -545,67 +545,57 @@ 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; +struct amdgpu_device *adev = smu->adev; +uint32_t *feature_mask_high; +uint32_t *feature_mask_low;int ret =0 ;if (!feature_mask || num <2 )return -EINVAL ; -if (bitmap_empty (feature->enabled, feature->feature_num)) { - ret =smu_cmn_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesHigh, &feature_mask_high); -if (ret) -return ret; - - ret =smu_cmn_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, +if (!bitmap_empty (feature->enabled, feature->feature_num)) { +bitmap_copy ((unsigned long *)feature_mask, + feature->enabled, feature->feature_num); +return 0 ; } -return ret; -} - -int smu_cmn_get_enabled_32_bits_mask (struct smu_context *smu, -uint32_t *feature_mask, -uint32_t num) -{ -uint32_t feature_mask_en_low =0 ; -uint32_t feature_mask_en_high =0 ; -struct smu_feature *feature = &smu->smu_feature; -int ret =0 ; - -if (!feature_mask || num <2 ) -return -EINVAL ; -
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_get_enabled_mask(struct smu_context *smu, · line 570
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +6
-3-if (bitmap_empty (feature->enabled, feature->feature_num)) { - ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GetEnabledSmuFeatures,0 , - &feature_mask_en_low); + feature_mask_low = &feature_mask[0 ]; + feature_mask_high = &feature_mask[1 ]; +switch (adev->asic_type) { +case CHIP_CYAN_SKILLFISH : +case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :
Can you convert this to an SMU IP version check rather than an asic type check?
Quoted 85 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +24
-24+ ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_GetEnabledSmuFeatures, +0 , + feature_mask_low);if (ret)return ret; - ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_GetEnabledSmuFeatures,1 , - &feature_mask_en_high); - + ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_GetEnabledSmuFeatures, +1 , + feature_mask_high); +break ; +case CHIP_RENOIR : +/* other dGPU ASICs */ +default : + ret =smu_cmn_send_smc_msg (smu, + SMU_MSG_GetEnabledSmuFeaturesHigh, + feature_mask_high);if (ret)return ret; - feature_mask[0 ] = feature_mask_en_low; - feature_mask[1 ] = feature_mask_en_high; - - }else { -bitmap_copy ((unsigned long *)feature_mask, feature->enabled, - feature->feature_num); + ret =smu_cmn_send_smc_msg (smu, + SMU_MSG_GetEnabledSmuFeaturesLow, + feature_mask_low); +break ; }return ret; - } uint64_t smu_cmn_get_indep_throttler_status(@@ -710,20 +700,11 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,size_t size =0 ;int ret =0 , i; -if (!smu->is_apu || - (smu->adev->asic_type ==CHIP_RENOIR )) { - ret =smu_cmn_get_enabled_mask (smu, - feature_mask, -2 ); -if (ret) -return 0 ; - }else { - ret =smu_cmn_get_enabled_32_bits_mask (smu, - feature_mask, -2 ); -if (ret) -return 0 ; - } + ret =smu_cmn_get_enabled_mask (smu, + feature_mask, +2 ); +if (ret) +return 0 ; size =sysfs_emit_at (buf, size,"features high: 0x%08x low: 0x%08x\n" , feature_mask[1 ], feature_mask[0 ]);drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +0
-5@@ -61,10 +61,6 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,uint32_t *feature_mask, uint32_t num); -int smu_cmn_get_enabled_32_bits_mask (struct smu_context *smu, -uint32_t *feature_mask, -uint32_t num); -uint64_t smu_cmn_get_indep_throttler_status (const unsigned long dep_status,const uint8_t *throttler_map); --2.29.0
RE: [PATCH V2 2/7] drm/amd/pm: unify the interface for retrieving enabled ppfeatures
[AMD Official Use Only]
Quoted 172 lines
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Tuesday, January 25, 2022 11:58 PM
To: Quan, Evan <[email protected]>
Cc: amd-gfx list <[email protected]>; Deucher, Alexander <[email protected]>; Lazar, Lijo <[email protected]>
Subject: Re: [PATCH V2 2/7] drm/amd/pm: unify the interface for retrieving enabled ppfeaturesdrivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c static bool cyan_skillfish_is_dpm_running(struct
Quoted 19 lines · Evan Quan
Instead of having two which do the same thing.
Signed-off-by Evan Quan <[email protected]>Change-Id I6302c9b5abdb999c4b7c83a0d1852181208b1c1f--- .../amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 2 +- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 6 +- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 6 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 93 ++++++++----------- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 4 - 5 files changed, 44 insertions(+), 67 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c +0
-0@@ -357,7 +357,7 @@ static bool cyan_skillfish_is_dpm_running(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c static bool vangogh_is_dpm_running(struct
Quoted 14 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c +1
-1if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +0
-0@@ -507,7 +507,7 @@ static bool vangogh_is_dpm_running(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c static int
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +1
-1if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;@@ -1965,7 +1965,7 @@ static int
vangogh_system_features_control(struct smu_context *smu, bool en)drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c static const struct pptable_funcs
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +1
-1if (!en)return ret; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return ret;@@ -2182,7 +2182,7 @@ static const struct pptable_funcs
vangogh_ppt_funcs= {drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c static int
Quoted 15 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +1
-1.dpm_set_jpeg_enable = vangogh_dpm_set_jpeg_enable, .is_dpm_running = vangogh_is_dpm_running, .read_sensor = vangogh_read_sensor, - .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_watermarks_table = vangogh_set_watermarks_table, .set_driver_table_location =
smu_v11_0_set_driver_table_location,drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +0
-0@@ -209,7 +209,7 @@ static int
yellow_carp_system_features_control(struct smu_context *smu, bool en)drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c static bool yellow_carp_is_dpm_running(struct
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1
-1if (!en)return ret; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return ret;@@ -258,7 +258,7 @@ static bool yellow_carp_is_dpm_running(struct
smu_context*smu)drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c static const struct pptable_funcs
Quoted 9 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1
-1uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_32_bits_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 );if (ret)return false;@@ -1174,7 +1174,7 @@ static const struct pptable_funcs
yellow_carp_ppt_funcs= {drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_get_enabled_mask(struct
Quoted 14 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1
-1.is_dpm_running = yellow_carp_is_dpm_running, .set_watermarks_table = yellow_carp_set_watermarks_table, .get_gpu_metrics = yellow_carp_get_gpu_metrics, - .get_enabled_mask = smu_cmn_get_enabled_32_bits_mask, + .get_enabled_mask = smu_cmn_get_enabled_mask, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask, .set_driver_table_location = smu_v13_0_set_driver_table_location, .gfx_off_control = smu_v13_0_gfx_off_control, diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.cb/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
indexc3c679bf9d9f..50164ebed1cd100644drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +0
-0@@ -545,67 +545,57 @@ int smu_cmn_get_enabled_mask(struct
smu_context*smu,Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +0
-1uint32_t *feature_mask, uint32_t num) { - uint32_t feature_mask_high = 0, feature_mask_low = 0;struct smu_feature *feature = &smu->smu_feature;drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_get_enabled_mask(struct smu_context *smu,
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3
-2+struct amdgpu_device *adev = smu->adev; +uint32_t *feature_mask_high; +uint32_t *feature_mask_low;int ret =0 ;if (!feature_mask || num <2 )return -EINVAL ; -if (bitmap_empty (feature->enabled, feature->feature_num)) { - ret = smu_cmn_send_smc_msg(smu,
SMU_MSG_GetEnabledSmuFeaturesHigh,&feature_mask_high);drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_get_enabled_mask(struct smu_context *smu,
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +0
-4-if (ret) -return ret; - - ret = smu_cmn_send_smc_msg(smu,
SMU_MSG_GetEnabledSmuFeaturesLow,&feature_mask_low);Quoted 21 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +4
-14-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, +if (!bitmap_empty (feature->enabled, feature->feature_num)) { +bitmap_copy ((unsigned long *)feature_mask, + feature->enabled, feature->feature_num); +return 0 ; } -return ret; -} - -int smu_cmn_get_enabled_32_bits_mask (struct smu_context *smu, -uint32_t *feature_mask, -uint32_t num) -{drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_get_enabled_mask(struct smu_context *smu,
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +0
-10-uint32_t feature_mask_en_low =0 ; -uint32_t feature_mask_en_high =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_cmn_send_smc_msg_with_param(smu,
SMU_MSG_GetEnabledSmuFeatures, 0,Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +2
-1- &feature_mask_en_low); + feature_mask_low = &feature_mask[0 ]; + feature_mask_high = &feature_mask[1 ];
Quoted 7 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_get_enabled_mask(struct smu_context *smu, · line 570
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +4
-0+switch (adev->asic_type) { +case CHIP_CYAN_SKILLFISH : +case CHIP_VANGOGH : +case CHIP_YELLOW_CARP :Can you convert this to an SMU IP version check rather than an asic type check?
[Quan, Evan] Sure, will update these.
BR
Evan
Quoted 91 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c int smu_cmn_get_enabled_mask(struct smu_context *smu,
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +5
-1+ ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_GetEnabledSmuFeatures, +0 , + + feature_mask_low);if (ret)return ret; - ret = smu_cmn_send_smc_msg_with_param(smu,
SMU_MSG_GetEnabledSmuFeatures, 1,drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c size_t smu_cmn_get_pp_feature_mask(struct
Quoted 34 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +15
-9- &feature_mask_en_high); - + ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_GetEnabledSmuFeatures, +1 , + feature_mask_high); +break ; +case CHIP_RENOIR : +/* other dGPU ASICs */ +default : + ret =smu_cmn_send_smc_msg (smu, + SMU_MSG_GetEnabledSmuFeaturesHigh, + feature_mask_high);if (ret)return ret; - feature_mask[0 ] = feature_mask_en_low; - feature_mask[1 ] = feature_mask_en_high; - - }else { -bitmap_copy ((unsigned long *)feature_mask, feature->enabled, - feature->feature_num); + ret =smu_cmn_send_smc_msg (smu, + SMU_MSG_GetEnabledSmuFeaturesLow, + feature_mask_low); +break ; }return ret; - } uint64_t smu_cmn_get_indep_throttler_status(@@ -710,20 +700,11 @@ size_t smu_cmn_get_pp_feature_mask(struct
smu_context*smu,drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h int smu_cmn_get_enabled_mask(struct
Quoted 31 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +5
-14size_t size =0 ;int ret =0 , i; -if (!smu->is_apu || - (smu->adev->asic_type ==CHIP_RENOIR )) { - ret =smu_cmn_get_enabled_mask (smu, - feature_mask, -2 ); -if (ret) -return 0 ; - }else { - ret =smu_cmn_get_enabled_32_bits_mask (smu, - feature_mask, -2 ); -if (ret) -return 0 ; - } + ret =smu_cmn_get_enabled_mask (smu, + feature_mask, +2 ); +if (ret) +return 0 ; size =sysfs_emit_at (buf, size,"features high: 0x%08x low: 0x%08x\n" , feature_mask[1], feature_mask[0]); diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.hb/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h
indexf0b4fb2a0960..4e34c18c6063100644drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +0
-0@@ -61,10 +61,6 @@ int smu_cmn_get_enabled_mask(struct
smu_context*smu,Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +0
-5uint32_t *feature_mask, uint32_t num); -int smu_cmn_get_enabled_32_bits_mask (struct smu_context *smu, -uint32_t *feature_mask, -uint32_t num); -uint64_t smu_cmn_get_indep_throttler_status (const unsigned long dep_status,const uint8_t *throttler_map); --2.29.0
PATCH v2 3/7 drm/amd/pm: update the data type for retrieving enabled ppfeatures
In reply to Evan QuanUse uint64_t instead of an array of uint32_t. This can avoid some non-necessary intermediate uint32_t -> uint64_t conversions.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 5 ++-- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 5 +--- .../amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 6 +--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 5 +--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 5 +--- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 +-- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 10 ++----- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 7 ++--- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 +-- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 9 ++---- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 29 +++++++------------ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 2 +- 14 files changed, 32 insertions(+), 64 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1 -1
@@ -2310,7 +2310,7 @@ static int smu_read_sensor(void *handle, *size =4 ;break ;case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK : - ret =smu_feature_get_enabled_mask (smu, (uint32_t *)data,2 ); + ret =smu_feature_get_enabled_mask (smu, (uint64_t *)data); *size =8 ;break ;case AMDGPU_PP_SENSOR_UVD_POWER :
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +2 -3
@@ -975,10 +975,9 @@ struct pptable_funcs {/** * @get_enabled_mask: Get a mask of features that are currently enabled * on the SMU. -* &feature_mask: Array representing enabled feature mask. -* &num: Elements in &feature_mask. +* &feature_mask: Enabled feature mask. */ -int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num); +int (*get_enabled_mask)(struct smu_context *smu,uint64_t *feature_mask);/** * @feature_is_enabled: Test if a feature is enabled.
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1 -4
@@ -2022,15 +2022,12 @@ static void arcturus_dump_pptable(struct smu_context *smu)static bool arcturus_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }
drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c +1 -5
@@ -350,20 +350,16 @@ static bool cyan_skillfish_is_dpm_running(struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled;/* we need to re-init after suspend so return false */ if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[0 ] | - ((uint64_t )feature_mask[1 ] <<32 ); -/* * cyan_skillfish specific, query default sclk inseted of hard code. */
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -4
@@ -1640,15 +1640,12 @@ static int navi10_display_config_changed(struct smu_context *smu)static bool navi10_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1 -4
@@ -1298,15 +1298,12 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu)static bool sienna_cichlid_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2 -2
@@ -799,7 +799,7 @@ int smu_v11_0_system_features_control(struct smu_context *smu, bool en) {struct smu_feature *feature = &smu->smu_feature; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ; ret = smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :
@@ -811,7 +811,7 @@ int smu_v11_0_system_features_control(struct smu_context *smu,bitmap_zero (feature->supported, feature->feature_num);if (en) { - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3 -7
@@ -500,21 +500,17 @@ static bool vangogh_is_dpm_running(struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled;/* we need to re-init after suspend so return false */ if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | - ((uint64_t )feature_mask[1 ] <<32 )); -return !!(feature_enabled &SMC_DPM_FEATURE ); }
@@ -1952,7 +1948,7 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en) {struct amdgpu_device *adev = smu->adev;struct smu_feature *feature = &smu->smu_feature; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ;if (adev->pm.fw_version >=0x43f1700 && !en)
@@ -1965,7 +1961,7 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +2 -5
@@ -1451,14 +1451,11 @@ static int aldebaran_usr_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_static bool aldebaran_is_dpm_running (struct smu_context *smu) {int ret; -uint32_t feature_mask[2 ]; -unsigned long feature_enabled; +uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | - ((uint64_t )feature_mask[1 ] <<32 ));return !!(feature_enabled &SMC_DPM_FEATURE ); }
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -2
@@ -765,7 +765,7 @@ int smu_v13_0_system_features_control(struct smu_context *smu, bool en) {struct smu_feature *feature = &smu->smu_feature; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ; ret = smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :
@@ -777,7 +777,7 @@ int smu_v13_0_system_features_control(struct smu_context *smu,bitmap_zero (feature->supported, feature->feature_num);if (en) { - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +3 -6
@@ -197,7 +197,7 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en) {struct smu_feature *feature = &smu->smu_feature;struct amdgpu_device *adev = smu->adev; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ;if (!en && !adev->in_s0ix)
@@ -209,7 +209,7 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;
@@ -255,16 +255,13 @@ static int yellow_carp_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)static bool yellow_carp_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +11 -18
@@ -542,8 +542,7 @@ bool smu_cmn_clk_dpm_is_enabled(struct smu_context *smu, }int smu_cmn_get_enabled_mask (struct smu_context *smu, -uint32_t *feature_mask, -uint32_t num) +uint64_t *feature_mask) {struct smu_feature *feature = &smu->smu_feature;struct amdgpu_device *adev = smu->adev;
@@ -551,7 +550,7 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,uint32_t *feature_mask_low;int ret =0 ; -if (!feature_mask || num <2 ) +if (!feature_mask)return -EINVAL ;if (!bitmap_empty (feature->enabled, feature->feature_num)) {
@@ -561,8 +560,8 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,return 0 ; } - feature_mask_low = &feature_mask[0 ]; - feature_mask_high = &feature_mask[1 ]; + feature_mask_low = &((uint32_t *)feature_mask)[0 ]; + feature_mask_high = &((uint32_t *)feature_mask)[1 ];switch (adev->asic_type) {case CHIP_CYAN_SKILLFISH :
@@ -693,7 +692,7 @@ static const char *smu_get_feature_name(struct smu_context *smu,size_t smu_cmn_get_pp_feature_mask (struct smu_context *smu,char *buf) { -uint32_t feature_mask[2 ] = {0 }; +uint64_t feature_mask;int feature_index =0 ;uint32_t count =0 ;int8_t sort_feature[SMU_FEATURE_COUNT ];
@@ -701,13 +700,12 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,int ret =0 , i; ret =smu_cmn_get_enabled_mask (smu, - feature_mask, -2 ); + &feature_mask);if (ret)return 0 ; size =sysfs_emit_at (buf, size,"features high: 0x%08x low: 0x%08x\n" , - feature_mask[1 ], feature_mask[0 ]); +upper_32_bits (feature_mask),lower_32_bits (feature_mask));memset (sort_feature,-1 ,sizeof (sort_feature));
@@ -743,22 +741,17 @@ int smu_cmn_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask) {int ret =0 ; -uint32_t feature_mask[2 ] = {0 }; +uint64_t feature_mask;uint64_t feature_2_enabled =0 ;uint64_t feature_2_disabled =0 ; -uint64_t feature_enables =0 ; ret =smu_cmn_get_enabled_mask (smu, - feature_mask, -2 ); + &feature_mask);if (ret)return ret; - 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; + feature_2_enabled = ~feature_mask & new_mask; + feature_2_disabled = feature_mask & ~new_mask;if (feature_2_enabled) { ret = smu_cmn_feature_update_enable_state(smu,
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +1 -2
@@ -58,8 +58,7 @@ 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); +uint64_t *feature_mask); uint64_t smu_cmn_get_indep_throttler_status( const unsigned long dep_status,
drivers/gpu/drm/amd/pm/swsmu/smu_internal.h +1 -1
@@ -55,7 +55,7 @@#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) +#define smu_feature_get_enabled_mask (smu, mask) smu_ppt_funcs(get_enabled_mask, 0, smu, mask)#define smu_feature_is_enabled (smu, mask) smu_ppt_funcs(feature_is_enabled, 0, smu, mask)#define smu_disable_all_features_with_exception (smu, no_hw_disablement, mask) smu_ppt_funcs(disable_all_features_with_exception, 0, smu, no_hw_disablement, mask)#define smu_is_dpm_running (smu) smu_ppt_funcs(is_dpm_running, 0 , smu)
Signature · 1 line
2.29.0
Re: [PATCH V2 3/7] drm/amd/pm: update the data type for retrieving enabled ppfeatures
Quoted 408 lines · Evan Quan
Use
uint64_tinstead of an array ofuint32_t. This can avoid some non-necessary intermediateuint32_t->uint64_tconversions.Signed-off-by Evan Quan <[email protected]>Change-Id I4e217357203a23440f058d7e25f55eaebd15c5ef--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 5 ++-- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 5 +--- .../amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 6 +--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 5 +--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 5 +--- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 +-- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 10 ++----- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 7 ++--- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 +-- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 9 ++---- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 29 +++++++------------ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 +- drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 2 +- 14 files changed, 32 insertions(+), 64 deletions(-)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +1
-1@@ -2310,7 +2310,7 @@ static int smu_read_sensor(void *handle, *size =4 ;break ;case AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK : - ret =smu_feature_get_enabled_mask (smu, (uint32_t *)data,2 ); + ret =smu_feature_get_enabled_mask (smu, (uint64_t *)data); *size =8 ;break ;case AMDGPU_PP_SENSOR_UVD_POWER :drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +2
-3@@ -975,10 +975,9 @@ struct pptable_funcs {/** * @get_enabled_mask: Get a mask of features that are currently enabled * on the SMU. -* &feature_mask: Array representing enabled feature mask. -* &num: Elements in &feature_mask. +* &feature_mask: Enabled feature mask. */ -int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num); +int (*get_enabled_mask)(struct smu_context *smu,uint64_t *feature_mask);/** * @feature_is_enabled: Test if a feature is enabled. drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +1
-4@@ -2022,15 +2022,12 @@ static void arcturus_dump_pptable(struct smu_context *smu)static bool arcturus_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }drivers/gpu/drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c +1
-5@@ -350,20 +350,16 @@ static bool cyan_skillfish_is_dpm_running(struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled;/* we need to re-init after suspend so return false */ if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[0 ] | - ((uint64_t )feature_mask[1 ] <<32 ); -/* * cyan_skillfish specific, query default sclk inseted of hard code. */ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-4@@ -1640,15 +1640,12 @@ static int navi10_display_config_changed(struct smu_context *smu)static bool navi10_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +1
-4@@ -1298,15 +1298,12 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu)static bool sienna_cichlid_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2
-2@@ -799,7 +799,7 @@ int smu_v11_0_system_features_control(struct smu_context *smu, bool en) {struct smu_feature *feature = &smu->smu_feature; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ; ret = smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :@@ -811,7 +811,7 @@ int smu_v11_0_system_features_control(struct smu_context *smu,bitmap_zero (feature->supported, feature->feature_num);if (en) { - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +3
-7@@ -500,21 +500,17 @@ static bool vangogh_is_dpm_running(struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled;/* we need to re-init after suspend so return false */ if (adev->in_suspend)return false; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | - ((uint64_t )feature_mask[1 ] <<32 )); -return !!(feature_enabled &SMC_DPM_FEATURE ); }@@ -1952,7 +1948,7 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en) {struct amdgpu_device *adev = smu->adev;struct smu_feature *feature = &smu->smu_feature; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ;if (adev->pm.fw_version >=0x43f1700 && !en)@@ -1965,7 +1961,7 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +2
-5@@ -1451,14 +1451,11 @@ static int aldebaran_usr_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_static bool aldebaran_is_dpm_running (struct smu_context *smu) {int ret; -uint32_t feature_mask[2 ]; -unsigned long feature_enabled; +uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (unsigned long )((uint64_t )feature_mask[0 ] | - ((uint64_t )feature_mask[1 ] <<32 ));return !!(feature_enabled &SMC_DPM_FEATURE ); }drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2
-2@@ -765,7 +765,7 @@ int smu_v13_0_system_features_control(struct smu_context *smu, bool en) {struct smu_feature *feature = &smu->smu_feature; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ; ret = smu_cmn_send_smc_msg(smu, (en ? SMU_MSG_EnableAllSmuFeatures :@@ -777,7 +777,7 @@ int smu_v13_0_system_features_control(struct smu_context *smu,bitmap_zero (feature->supported, feature->feature_num);if (en) { - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +3
-6@@ -197,7 +197,7 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en) {struct smu_feature *feature = &smu->smu_feature;struct amdgpu_device *adev = smu->adev; -uint32_t feature_mask[2 ]; +uint64_t feature_mask;int ret =0 ;if (!en && !adev->in_s0ix)@@ -209,7 +209,7 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)if (!en)return ret; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_mask);if (ret)return ret;@@ -255,16 +255,13 @@ static int yellow_carp_dpm_set_jpeg_enable(struct smu_context *smu, bool enable)static bool yellow_carp_is_dpm_running (struct smu_context *smu) {int ret =0 ; -uint32_t feature_mask[2 ];uint64_t feature_enabled; - ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); + ret =smu_cmn_get_enabled_mask (smu, &feature_enabled);if (ret)return false; - feature_enabled = (uint64_t )feature_mask[1 ] <<32 | feature_mask[0 ]; -return !!(feature_enabled &SMC_DPM_FEATURE ); }drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +11
-18@@ -542,8 +542,7 @@ bool smu_cmn_clk_dpm_is_enabled(struct smu_context *smu, }int smu_cmn_get_enabled_mask (struct smu_context *smu, -uint32_t *feature_mask, -uint32_t num) +uint64_t *feature_mask) {struct smu_feature *feature = &smu->smu_feature;struct amdgpu_device *adev = smu->adev;@@ -551,7 +550,7 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,uint32_t *feature_mask_low;int ret =0 ; -if (!feature_mask || num <2 ) +if (!feature_mask)return -EINVAL ;if (!bitmap_empty (feature->enabled, feature->feature_num)) {@@ -561,8 +560,8 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,return 0 ; } - feature_mask_low = &feature_mask[0 ]; - feature_mask_high = &feature_mask[1 ]; + feature_mask_low = &((uint32_t *)feature_mask)[0 ]; + feature_mask_high = &((uint32_t *)feature_mask)[1 ];switch (adev->asic_type) {case CHIP_CYAN_SKILLFISH :@@ -693,7 +692,7 @@ static const char *smu_get_feature_name(struct smu_context *smu,size_t smu_cmn_get_pp_feature_mask (struct smu_context *smu,char *buf) { -uint32_t feature_mask[2 ] = {0 }; +uint64_t feature_mask;int feature_index =0 ;uint32_t count =0 ;int8_t sort_feature[SMU_FEATURE_COUNT ];@@ -701,13 +700,12 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,int ret =0 , i; ret =smu_cmn_get_enabled_mask (smu, - feature_mask, -2 ); + &feature_mask);if (ret)return 0 ; size =sysfs_emit_at (buf, size,"features high: 0x%08x low: 0x%08x\n" , - feature_mask[1 ], feature_mask[0 ]); +upper_32_bits (feature_mask),lower_32_bits (feature_mask));memset (sort_feature,-1 ,sizeof (sort_feature));@@ -743,22 +741,17 @@ int smu_cmn_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask) {int ret =0 ; -uint32_t feature_mask[2 ] = {0 }; +uint64_t feature_mask;uint64_t feature_2_enabled =0 ;uint64_t feature_2_disabled =0 ; -uint64_t feature_enables =0 ; ret =smu_cmn_get_enabled_mask (smu, - feature_mask, -2 ); + &feature_mask);if (ret)return ret; - 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; + feature_2_enabled = ~feature_mask & new_mask; + feature_2_disabled = feature_mask & ~new_mask;if (feature_2_enabled) { ret = smu_cmn_feature_update_enable_state(smu,drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +1
-2@@ -58,8 +58,7 @@ 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); +uint64_t *feature_mask); uint64_t smu_cmn_get_indep_throttler_status( const unsigned long dep_status,drivers/gpu/drm/amd/pm/swsmu/smu_internal.h +1
-2@@ -55,7 +55,7 @@#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) +#define smu_feature_get_enabled_mask (smu, mask) smu_ppt_funcs(get_enabled_mask, 0, smu, mask)#define smu_feature_is_enabled (smu, mask) smu_ppt_funcs(feature_is_enabled, 0, smu, mask)#define smu_disable_all_features_with_exception (smu, no_hw_disablement, mask) smu_ppt_funcs(disable_all_features_with_exception, 0, smu, no_hw_disablement, mask)#define smu_is_dpm_running (smu) smu_ppt_funcs(is_dpm_running, 0 , smu) --2.29.0
PATCH v2 4/7 drm/amd/pm: correct the usage for 'supported' member of smu_feature structure
In reply to Evan QuanThe supported features should be retrieved just after EnableAllDpmFeatures message complete. And the check(whether some dpm feature is supported) is only needed when we decide to enable or disable it.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 +++++++++++ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 8 ++++---- .../gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 10 +++++----- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 3 --- drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 5 +---- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 3 --- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 --- 7 files changed, 21 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +11 -0
@@ -1057,8 +1057,10 @@ static int smu_get_thermal_temperature_range(struct smu_context *smu)static int smu_smc_hw_setup (struct smu_context *smu) { +struct smu_feature *feature = &smu->smu_feature;struct amdgpu_device *adev = smu->adev;uint32_t pcie_gen =0 , pcie_width =0 ; +uint64_t features_supported;int ret =0 ;if (adev->in_suspend &&smu_is_dpm_running (smu)) {
@@ -1138,6 +1140,15 @@ static int smu_smc_hw_setup(struct smu_context *smu)return ret; } + ret =smu_feature_get_enabled_mask (smu, &features_supported); +if (ret) { +dev_err (adev->dev,"Failed to retrieve supported dpm features!\n" ); +return ret; + } +bitmap_copy (feature->supported, + (unsigned long *)&features_supported, + feature->feature_num); +if (!smu_is_dpm_running (smu))dev_info (adev->dev,"dpm has been disabled\n" );
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +4 -4
@@ -1625,8 +1625,8 @@ static int navi10_display_config_changed(struct smu_context *smu)int ret =0 ;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 )) { +smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) && +smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_NumOfDisplays, smu->display_config->num_display,NULL );
@@ -1861,13 +1861,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_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (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_cmn_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetMinDeepSleepDcefclk, min_clocks.dcef_clock_in_sr/100,
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +5 -5
@@ -1281,8 +1281,8 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu)int ret =0 ;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 )) { +smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_DCEFCLK_BIT ) && +smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) {#if 0 ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_NumOfDisplays, smu->display_config->num_display,
@@ -1518,13 +1518,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_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (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_cmn_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { ret = smu_cmn_send_smc_msg_with_param(smu, SMU_MSG_SetMinDeepSleepDcefclk, min_clocks.dcef_clock_in_sr/100,
@@ -3749,7 +3749,7 @@ static int sienna_cichlid_gpo_control(struct smu_context *smu,int ret =0 ; -if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_GFX_GPO_BIT )) { +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFX_GPO_BIT )) { ret =smu_cmn_get_smc_version (smu,NULL , &smu_version);if (ret)return ret;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0 -3
@@ -808,7 +808,6 @@ int smu_v11_0_system_features_control(struct smu_context *smu,return ret;bitmap_zero (feature->enabled, feature->feature_num); -bitmap_zero (feature->supported, feature->feature_num);if (en) { ret =smu_cmn_get_enabled_mask (smu, &feature_mask);
@@ -817,8 +816,6 @@ int smu_v11_0_system_features_control(struct smu_context *smu,bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, feature->feature_num); -bitmap_copy (feature->supported, (unsigned long *)&feature_mask, - feature->feature_num); }return ret;
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +1 -4
@@ -1956,7 +1956,6 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en) RLC_STATUS_OFF, NULL);bitmap_zero (feature->enabled, feature->feature_num); -bitmap_zero (feature->supported, feature->feature_num);if (!en)return ret;
@@ -1967,8 +1966,6 @@ static int vangogh_system_features_control(struct smu_context *smu, bool en)bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, feature->feature_num); -bitmap_copy (feature->supported, (unsigned long *)&feature_mask, - feature->feature_num);return 0 ; }
@@ -1985,7 +1982,7 @@ static int vangogh_post_smu_init(struct smu_context *smu) adev->gfx.config.max_sh_per_se * adev->gfx.config.max_shader_engines;/* allow message will be sent after enable message on Vangogh*/ -if (smu_cmn_feature_is_supported (smu,SMU_FEATURE_DPM_GFXCLK_BIT ) && +if (smu_cmn_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT ) && (adev->pg_flags &AMD_PG_SUPPORT_GFX_PG )) { ret =smu_cmn_send_smc_msg (smu, SMU_MSG_EnableGfxOff,NULL );if (ret) {
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +0 -3
@@ -774,7 +774,6 @@ int smu_v13_0_system_features_control(struct smu_context *smu,return ret;bitmap_zero (feature->enabled, feature->feature_num); -bitmap_zero (feature->supported, feature->feature_num);if (en) { ret =smu_cmn_get_enabled_mask (smu, &feature_mask);
@@ -783,8 +782,6 @@ int smu_v13_0_system_features_control(struct smu_context *smu,bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, feature->feature_num); -bitmap_copy (feature->supported, (unsigned long *)&feature_mask, - feature->feature_num); }return ret;
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +0 -3
@@ -204,7 +204,6 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en) ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PrepareMp1ForUnload,NULL );bitmap_zero (feature->enabled, feature->feature_num); -bitmap_zero (feature->supported, feature->feature_num);if (!en)return ret;
@@ -215,8 +214,6 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, feature->feature_num); -bitmap_copy (feature->supported, (unsigned long *)&feature_mask, - feature->feature_num);return 0 ; }
Signature · 1 line
2.29.0
PATCH v2 5/7 drm/amd/pm: drop the cache for enabled ppfeatures
In reply to Evan QuanThe following scenarios make the driver cache for enabled ppfeatures outdated and invalid:
- Other tools interact with PMFW to change the enabled ppfeatures.
- PMFW may enable/disable some features behind driver's back. E.g. for sienna_cichild, on gfxoff entering, PMFW will disable gfx related DPM features. All those are performed without driver's notice.
Also considering driver does not actually interact with PMFW such frequently, the benefit brought by such cache is very limited.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 1 - drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 23 +--------- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 16 +------ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 23 +--------- .../drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 16 +------ drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 46 +++++-------------- 7 files changed, 17 insertions(+), 109 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +0 -1
@@ -950,7 +950,6 @@ static int smu_sw_init(void *handle) smu->pool_size = adev->pm.smu_prv_buffer_size; smu->smu_feature.feature_num =SMU_FEATURE_MAX ;bitmap_zero (smu->smu_feature.supported,SMU_FEATURE_MAX ); -bitmap_zero (smu->smu_feature.enabled,SMU_FEATURE_MAX );bitmap_zero (smu->smu_feature.allowed,SMU_FEATURE_MAX );mutex_init (&smu->message_lock);
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +0 -1
@@ -390,7 +390,6 @@ struct smu_featureuint32_t feature_num;DECLARE_BITMAP (supported,SMU_FEATURE_MAX );DECLARE_BITMAP (allowed,SMU_FEATURE_MAX ); -DECLARE_BITMAP (enabled,SMU_FEATURE_MAX ); };struct smu_clocks {
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +2 -21
@@ -798,27 +798,8 @@ int smu_v11_0_set_allowed_mask(struct smu_context *smu)int smu_v11_0_system_features_control (struct smu_context *smu,bool en) { -struct smu_feature *feature = &smu->smu_feature; -uint64_t feature_mask; -int ret =0 ; - - ret =smu_cmn_send_smc_msg (smu, (en ? SMU_MSG_EnableAllSmuFeatures : - SMU_MSG_DisableAllSmuFeatures),NULL ); -if (ret) -return ret; - -bitmap_zero (feature->enabled, feature->feature_num); - -if (en) { - ret =smu_cmn_get_enabled_mask (smu, &feature_mask); -if (ret) -return ret; - -bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, - feature->feature_num); - } - -return ret; +return smu_cmn_send_smc_msg (smu, (en ? SMU_MSG_EnableAllSmuFeatures : + SMU_MSG_DisableAllSmuFeatures),NULL ); }int smu_v11_0_notify_display_change (struct smu_context *smu)
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +1 -15
@@ -1947,27 +1947,13 @@ static int vangogh_get_dpm_clock_table(struct smu_context *smu, struct dpm_clockstatic int vangogh_system_features_control (struct smu_context *smu,bool en) {struct amdgpu_device *adev = smu->adev; -struct smu_feature *feature = &smu->smu_feature; -uint64_t feature_mask;int ret =0 ;if (adev->pm.fw_version >=0x43f1700 && !en) ret =smu_cmn_send_smc_msg_with_param (smu, SMU_MSG_RlcPowerNotify,RLC_STATUS_OFF ,NULL ); -bitmap_zero (feature->enabled, feature->feature_num); - -if (!en) -return ret; - - ret =smu_cmn_get_enabled_mask (smu, &feature_mask); -if (ret) -return ret; - -bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, - feature->feature_num); - -return 0 ; +return ret; }static int vangogh_post_smu_init (struct smu_context *smu)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +2 -21
@@ -764,27 +764,8 @@ int smu_v13_0_gfx_off_control(struct smu_context *smu, bool enable)int smu_v13_0_system_features_control (struct smu_context *smu,bool en) { -struct smu_feature *feature = &smu->smu_feature; -uint64_t feature_mask; -int ret =0 ; - - ret =smu_cmn_send_smc_msg (smu, (en ? SMU_MSG_EnableAllSmuFeatures : - SMU_MSG_DisableAllSmuFeatures),NULL ); -if (ret) -return ret; - -bitmap_zero (feature->enabled, feature->feature_num); - -if (en) { - ret =smu_cmn_get_enabled_mask (smu, &feature_mask); -if (ret) -return ret; - -bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, - feature->feature_num); - } - -return ret; +return smu_cmn_send_smc_msg (smu, (en ? SMU_MSG_EnableAllSmuFeatures : + SMU_MSG_DisableAllSmuFeatures),NULL ); }int smu_v13_0_notify_display_change (struct smu_context *smu)
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +1 -15
@@ -195,27 +195,13 @@ static int yellow_carp_fini_smc_tables(struct smu_context *smu)static int yellow_carp_system_features_control (struct smu_context *smu,bool en) { -struct smu_feature *feature = &smu->smu_feature;struct amdgpu_device *adev = smu->adev; -uint64_t feature_mask;int ret =0 ;if (!en && !adev->in_s0ix) ret =smu_cmn_send_smc_msg (smu, SMU_MSG_PrepareMp1ForUnload,NULL ); -bitmap_zero (feature->enabled, feature->feature_num); - -if (!en) -return ret; - - ret =smu_cmn_get_enabled_mask (smu, &feature_mask); -if (ret) -return ret; - -bitmap_copy (feature->enabled, (unsigned long *)&feature_mask, - feature->feature_num); - -return 0 ; +return ret; }static int yellow_carp_dpm_set_vcn_enable (struct smu_context *smu,bool enable)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +11 -35
117 lines not on this page · raw message
Signature · 1 line
2.29.0
PATCH v2 6/7 drm/amd/pm: avoid consecutive retrieving for enabled ppfeatures
In reply to Evan QuanAs the enabled ppfeatures are just retrieved ahead. We can use that directly instead of retrieving again and again.
--- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +9 -1
@@ -678,6 +678,7 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,int8_t sort_feature[SMU_FEATURE_COUNT ];size_t size =0 ;int ret =0 , i; +int feature_id; ret =smu_cmn_get_enabled_mask (smu, &feature_mask);
@@ -706,11 +707,18 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,if (sort_feature[i] <0 )continue ; +/* convert to asic spcific feature ID */ + feature_id =smu_cmn_to_asic_specific_index (smu, +CMN2ASIC_MAPPING_FEATURE , + sort_feature[i]); +if (feature_id <0 ) +continue ; + size +=sysfs_emit_at (buf, size,"%02d. %-20s (%2d) : %s\n" , count++,smu_get_feature_name (smu, sort_feature[i]), i, - !!smu_cmn_feature_is_enabled (smu, sort_feature[i]) ? + !!test_bit (feature_id, (unsigned long *)&feature_mask) ?"enabled" :"disabled" ); }
Signature · 1 line
2.29.0
PATCH v2 7/7 drm/amd/pm: revise the implementation of smu_cmn_disable_all_features_with_exception
In reply to Evan QuanAs there is no internal cache for enabled ppfeatures now. Thus the 2nd parameter will be not needed any more.
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 9 ++------- drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 - drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 7 ------- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 1 - drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 2 +- 5 files changed, 3 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -7
@@ -1360,9 +1360,7 @@ static int smu_disable_dpms(struct smu_context *smu)case IP_VERSION (11 ,5 ,0 ):case IP_VERSION (11 ,0 ,12 ):case IP_VERSION (11 ,0 ,13 ): -return smu_disable_all_features_with_exception (smu, - true, -SMU_FEATURE_COUNT ); +return 0 ;default :break ; }
@@ -1378,9 +1376,7 @@ static int smu_disable_dpms(struct smu_context *smu)case IP_VERSION (11 ,0 ,0 ):case IP_VERSION (11 ,0 ,5 ):case IP_VERSION (11 ,0 ,9 ): -return smu_disable_all_features_with_exception (smu, - true, -SMU_FEATURE_BACO_BIT ); +return 0 ;default :break ; }
@@ -1392,7 +1388,6 @@ static int smu_disable_dpms(struct smu_context *smu)*/ if (use_baco &&smu_feature_is_enabled (smu,SMU_FEATURE_BACO_BIT )) { ret =smu_disable_all_features_with_exception (smu, - false,SMU_FEATURE_BACO_BIT );if (ret)dev_err (adev->dev,"Failed to disable smu features except BACO.\n" );
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +0 -1
@@ -990,7 +990,6 @@ struct pptable_funcs {* exception to those in &mask. */ int (*disable_all_features_with_exception)(struct smu_context *smu, -bool no_hw_disablement,enum smu_feature_mask mask);/**
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +0 -7
@@ -765,9 +765,6 @@ int smu_cmn_set_pp_feature_mask(struct smu_context *smu,* @mask * * @smu: smu_context pointer -* @no_hw_disablement: whether real dpm disablement should be performed -* true: update the cache(about dpm enablement state) only -* false: real dpm disablement plus cache update * @mask: the dpm feature which should not be disabled * SMU_FEATURE_COUNT: no exception, all dpm features * to disable
@@ -776,7 +773,6 @@ int smu_cmn_set_pp_feature_mask(struct smu_context *smu,* 0 on success or a negative error code on failure. */ int smu_cmn_disable_all_features_with_exception (struct smu_context *smu, -bool no_hw_disablement,enum smu_feature_mask mask) {uint64_t features_to_disable =U64_MAX ;
@@ -792,9 +788,6 @@ int smu_cmn_disable_all_features_with_exception(struct smu_context *smu, features_to_disable &= ~(1ULL << skipped_feature_id); } -if (no_hw_disablement) -return 0 ; -return smu_cmn_feature_update_enable_state (smu, features_to_disable,0 );
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h +0 -1
@@ -79,7 +79,6 @@ 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, -bool no_hw_disablement,enum smu_feature_mask mask); int smu_cmn_get_smc_version(struct smu_context *smu,
drivers/gpu/drm/amd/pm/swsmu/smu_internal.h +1 -1
@@ -57,7 +57,7 @@#define smu_feature_set_allowed_mask (smu) smu_ppt_funcs(set_allowed_mask, 0, smu)#define smu_feature_get_enabled_mask (smu, mask) smu_ppt_funcs(get_enabled_mask, 0, smu, mask)#define smu_feature_is_enabled (smu, mask) smu_ppt_funcs(feature_is_enabled, 0, smu, mask) -#define smu_disable_all_features_with_exception (smu, no_hw_disablement, mask) smu_ppt_funcs(disable_all_features_with_exception, 0, smu, no_hw_disablement, 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_populate_umd_state_clk (smu) smu_ppt_funcs(populate_umd_state_clk, 0, smu)
Signature · 1 line
2.29.0
Quoted 27 lines · Evan Quan
As other dGPU asics, Renoir should use
smu_cmn_get_enabled_mask()for that job.Signed-off-by Evan Quan <[email protected]>Change-Id I9e845ba84dd45d0826506de44ef4760fa851a516--- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +2
-2@@ -710,7 +710,8 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,size_t size =0 ;int ret =0 , i; -if (!smu->is_apu) { +if (!smu->is_apu || + (smu->adev->asic_type ==CHIP_RENOIR )) { ret =smu_cmn_get_enabled_mask (smu, feature_mask,2 ); --2.29.0