drm/amd/pm: correct aldebaran smu feature mapping FEATURE_DATA_CALCULATIONS
Subsystems (3)
PATCH 1/1 drm/amd/pm: correct aldebaran smu feature mapping FEATURE_DATA_CALCULATIONS
correct smu feature mapping: FEATURE_DATA_CALCULATIONS
--- 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(-)
drivers/gpu/drm/amd/pm/inc/smu_types.h +1 -0
@@ -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), \
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1 -2
@@ -64,7 +64,6 @@#define FEATURE_MASK (feature) (1ULL << feature)#define SMC_DPM_FEATURE ( \ - FEATURE_MASK(FEATURE_DATA_CALCULATIONS) | \ 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 ),
Signature · 1 line
2.25.1
Quoted 25 lines · Kevin Wang
correct smu feature mapping:
FEATURE_DATA_CALCULATIONSSigned-off-by Kevin Wang <[email protected]>--- 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(-)drivers/gpu/drm/amd/pm/inc/smu_types.h +1
-0@@ -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), \drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-0
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c line 67
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-1@@ -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.
Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-1FEATURE_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 ),
Wang, Kevin(Yang)
Reviewed-by Lijo Lazar[AMD Official Use Only]
________________________________
From: Lazar, Lijo <[email protected]>
Sent: Monday, August 2, 2021 3:41 PM
To: Wang, Kevin(Yang) <[email protected]>; [email protected] <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: correct aldebaran smu feature mapping FEATURE_DATA_CALCULATIONS
Quoted 25 lines · Kevin Wang
correct smu feature mapping:
FEATURE_DATA_CALCULATIONSSigned-off-by Kevin Wang <[email protected]>--- 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(-)drivers/gpu/drm/amd/pm/inc/smu_types.h +1
-0@@ -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), \drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-0
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c line 67
Quoted 4 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +0
-1@@ -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.
[kevin]:
thanks, lijo. I agree with you, and I will correct it before submit.
Best Regards,
Kevin
Quoted 13 lines
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +1
-1FEATURE_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 ),