Re: [PATCH] drm/amd/pm: correct aldebaran smu feature mapping FEATURE_DATA_CALCULATIONS

[Lazar, Lijo]

On 8/2/2021 8:23 AM, Kevin Wang wrote:
correct smu feature mapping: FEATURE_DATA_CALCULATIONS

Signed-off-by: Kevin Wang <kevin1.w...@amd.com>
---
  drivers/gpu/drm/amd/pm/inc/smu_types.h             | 1 +
  drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 3 +--
  2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/inc/smu_types.h 
b/drivers/gpu/drm/amd/pm/inc/smu_types.h
index 1d3765b873df..6239c30fcd5f 100644
--- a/drivers/gpu/drm/amd/pm/inc/smu_types.h
+++ b/drivers/gpu/drm/amd/pm/inc/smu_types.h
@@ -282,6 +282,7 @@ enum smu_clk_type {
         __SMU_DUMMY_MAP(TDC),                                  \
         __SMU_DUMMY_MAP(THERMAL),                              \
         __SMU_DUMMY_MAP(GFX_PER_CU_CG),                        \
+       __SMU_DUMMY_MAP(DATA_CALCULATIONS),                     \
         __SMU_DUMMY_MAP(RM),                                   \
         __SMU_DUMMY_MAP(DS_DCEFCLK),                           \
         __SMU_DUMMY_MAP(ACDC),                                 \
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
index 856eeaf293b8..4af602d6ee02 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -64,7 +64,6 @@
  
  #define FEATURE_MASK(feature) (1ULL << feature)
  #define SMC_DPM_FEATURE ( \
-                         FEATURE_MASK(FEATURE_DATA_CALCULATIONS) | \

Data calculations should be enabled for DPM. Undo this change before 
submitting.

Reviewed-by: Lijo Lazar <lijo.la...@amd.com>


                          FEATURE_MASK(FEATURE_DPM_GFXCLK_BIT)  | \
                          FEATURE_MASK(FEATURE_DPM_UCLK_BIT)    | \
                          FEATURE_MASK(FEATURE_DPM_SOCCLK_BIT)  | \
@@ -150,7 +149,7 @@ static const struct cmn2asic_mapping 
aldebaran_clk_map[SMU_CLK_COUNT] = {
  };
  
  static const struct cmn2asic_mapping aldebaran_feature_mask_map[SMU_FEATURE_COUNT] = {
-       ALDEBARAN_FEA_MAP(SMU_FEATURE_DPM_PREFETCHER_BIT,               
FEATURE_DATA_CALCULATIONS),
+       ALDEBARAN_FEA_MAP(SMU_FEATURE_DATA_CALCULATIONS_BIT,            
FEATURE_DATA_CALCULATIONS),
        ALDEBARAN_FEA_MAP(SMU_FEATURE_DPM_GFXCLK_BIT,                   
FEATURE_DPM_GFXCLK_BIT),
        ALDEBARAN_FEA_MAP(SMU_FEATURE_DPM_UCLK_BIT,                     
FEATURE_DPM_UCLK_BIT),
        ALDEBARAN_FEA_MAP(SMU_FEATURE_DPM_SOCCLK_BIT,                   
FEATURE_DPM_SOCCLK_BIT),