Skip to contentSkip to conversation

drm/amd/powerplay: correct Vega20 dpm level related settings

PATCH In review Evan Quan 3 participants 6 messages Aug 21, 2019 – Aug 22, 2019 4 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/2 drm/amd/powerplay: correct Vega20 dpm level related settings

Correct the settings for auto mode and skip the unnecessary settings for dcefclk and fclk.

Change-Id I7e6ca75ce86b4d5cd44920a9fbc71b6f36ea3c49
---
 .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c    | 60 +++++++++++++++++--
 1 file changed, 54 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +54 -6
index 0516c294b377..cc52d5c8ccf9 100644
@@ -2349,12 +2349,16 @@ static int vega20_force_dpm_highest(struct pp_hwmgr *hwmgr)
 		data->dpm_table.soc_table.dpm_state.soft_max_level =
 		data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+						 FEATURE_DPM_UCLK_MASK |
+						 FEATURE_DPM_SOCCLK_MASK);
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload boot level to highest!",
 			return ret);
 
-	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+						 FEATURE_DPM_UCLK_MASK |
+						 FEATURE_DPM_SOCCLK_MASK);
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload dpm max level to highest!",
 			return ret);
@@ -2387,12 +2391,16 @@ static int vega20_force_dpm_lowest(struct pp_hwmgr *hwmgr)
 		data->dpm_table.soc_table.dpm_state.soft_max_level =
 		data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+						 FEATURE_DPM_UCLK_MASK |
+						 FEATURE_DPM_SOCCLK_MASK);
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload boot level to highest!",
 			return ret);
 
-	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+						 FEATURE_DPM_UCLK_MASK |
+						 FEATURE_DPM_SOCCLK_MASK);
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload dpm max level to highest!",
 			return ret);
@@ -2403,14 +2411,54 @@ static int vega20_force_dpm_lowest(struct pp_hwmgr *hwmgr)
 
 static int vega20_unforce_dpm_levels(struct pp_hwmgr *hwmgr)
 {
+	struct vega20_hwmgr *data =
+			(struct vega20_hwmgr *)(hwmgr->backend);
+	uint32_t soft_min_level, soft_max_level;
 	int ret = 0;
 
-	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+	/* gfxclk soft min/max settings */
+	soft_min_level =
+		vega20_find_lowest_dpm_level(&(data->dpm_table.gfx_table));
+	soft_max_level =
+		vega20_find_highest_dpm_level(&(data->dpm_table.gfx_table));
+
+	data->dpm_table.gfx_table.dpm_state.soft_min_level =
+		data->dpm_table.gfx_table.dpm_levels[soft_min_level].value;
+	data->dpm_table.gfx_table.dpm_state.soft_max_level =
+		data->dpm_table.gfx_table.dpm_levels[soft_max_level].value;
+
+	/* uclk soft min/max settings */
+	soft_min_level =
+		vega20_find_lowest_dpm_level(&(data->dpm_table.mem_table));
+	soft_max_level =
+		vega20_find_highest_dpm_level(&(data->dpm_table.mem_table));
+
+	data->dpm_table.mem_table.dpm_state.soft_min_level =
+		data->dpm_table.mem_table.dpm_levels[soft_min_level].value;
+	data->dpm_table.mem_table.dpm_state.soft_max_level =
+		data->dpm_table.mem_table.dpm_levels[soft_max_level].value;
+
+	/* socclk soft min/max settings */
+	soft_min_level =
+		vega20_find_lowest_dpm_level(&(data->dpm_table.soc_table));
+	soft_max_level =
+		vega20_find_highest_dpm_level(&(data->dpm_table.soc_table));
+
+	data->dpm_table.soc_table.dpm_state.soft_min_level =
+		data->dpm_table.soc_table.dpm_levels[soft_min_level].value;
+	data->dpm_table.soc_table.dpm_state.soft_max_level =
+		data->dpm_table.soc_table.dpm_levels[soft_max_level].value;
+
+	ret = vega20_upload_dpm_min_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+						 FEATURE_DPM_UCLK_MASK |
+						 FEATURE_DPM_SOCCLK_MASK);
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload DPM Bootup Levels!",
 			return ret);
 
-	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_max_level(hwmgr, FEATURE_DPM_GFXCLK_MASK |
+						 FEATURE_DPM_UCLK_MASK |
+						 FEATURE_DPM_SOCCLK_MASK);
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload DPM Max Levels!",
 			return ret);
Signature · 6 lines
2.23.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#2 lore raw

PATCH 2/2 drm/amd/powerplay: correct the pp_feature output on Arcturus

Fix for the commit below:
drm/amd/powerplay: implment sysfs feature status function in smu

Change-Id Id9a373f8d8866b97450be0aef0ba19d0835d40d8
---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c  | 2 ++
 drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 +
 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2 -0
index dd6563358e8e..f1f072012fac 100644
@@ -141,6 +141,7 @@ static struct smu_11_0_cmn2aisc_mapping arcturus_feature_mask_map[SMU_FEATURE_CO
 	FEA_MAP(DPM_SOCCLK),
 	FEA_MAP(DPM_FCLK),
 	FEA_MAP(DPM_MP0CLK),
+	ARCTURUS_FEA_MAP(SMU_FEATURE_XGMI_BIT, FEATURE_DPM_XGMI_BIT),
 	FEA_MAP(DS_GFXCLK),
 	FEA_MAP(DS_SOCCLK),
 	FEA_MAP(DS_LCLK),
@@ -149,6 +150,7 @@ static struct smu_11_0_cmn2aisc_mapping arcturus_feature_mask_map[SMU_FEATURE_CO
 	FEA_MAP(GFX_ULV),
 	ARCTURUS_FEA_MAP(SMU_FEATURE_VCN_PG_BIT, FEATURE_DPM_VCN_BIT),
 	FEA_MAP(RSMU_SMN_CG),
+	FEA_MAP(WAFL_CG),
 	FEA_MAP(PPT),
 	FEA_MAP(TDC),
 	FEA_MAP(APCC_PLUS),
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
index 72962e842d69..c3c74098f614 100644
@@ -207,6 +207,7 @@ enum smu_clk_type {
        __SMU_DUMMY_MAP(TEMP_DEPENDENT_VMIN),           	\
        __SMU_DUMMY_MAP(MMHUB_PG),                      	\
        __SMU_DUMMY_MAP(ATHUB_PG),                      	\
+       __SMU_DUMMY_MAP(WAFL_CG),
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(feature)	SMU_FEATURE_##feature##_BIT
Signature · 6 lines
2.23.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#4 lore raw

RE: [PATCH 2/2] drm/amd/powerplay: correct the pp_feature output on Arcturus

Ping..

Quoted 57 lines

-----Original Message-----
From: Evan Quan <[email protected]>
Sent: Wednesday, August 21, 2019 4:42 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 2/2] drm/amd/powerplay: correct the pp_feature output on Arcturus

Fix for the commit below:
drm/amd/powerplay: implment sysfs feature status function in smu

Change-Id Id9a373f8d8866b97450be0aef0ba19d0835d40d8
---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c  | 2 ++
drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 +
 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -0
index dd6563358e8e..f1f072012fac 100644
@@ -141,6 +141,7 @@ static struct smu_11_0_cmn2aisc_mapping

arcturus_feature_mask_map[SMU_FEATURE_CO

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -0
 	FEA_MAP(DPM_SOCCLK),
 	FEA_MAP(DPM_FCLK),
 	FEA_MAP(DPM_MP0CLK),
+	ARCTURUS_FEA_MAP(SMU_FEATURE_XGMI_BIT,

FEATURE_DPM_XGMI_BIT),

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -0
 	FEA_MAP(DS_GFXCLK),
 	FEA_MAP(DS_SOCCLK),
 	FEA_MAP(DS_LCLK),
@@ -149,6 +150,7 @@ static struct smu_11_0_cmn2aisc_mapping

arcturus_feature_mask_map[SMU_FEATURE_CO

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -0
 	FEA_MAP(GFX_ULV),
 	ARCTURUS_FEA_MAP(SMU_FEATURE_VCN_PG_BIT,

FEATURE_DPM_VCN_BIT),

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -0
 	FEA_MAP(RSMU_SMN_CG),
+	FEA_MAP(WAFL_CG),
 	FEA_MAP(PPT),
 	FEA_MAP(TDC),
 	FEA_MAP(APCC_PLUS),
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
index 72962e842d69..c3c74098f614 100644
@@ -207,6 +207,7 @@ enum smu_clk_type {
        __SMU_DUMMY_MAP(TEMP_DEPENDENT_VMIN),           	\
        __SMU_DUMMY_MAP(MMHUB_PG),                      	\
        __SMU_DUMMY_MAP(ATHUB_PG),                      	\
+       __SMU_DUMMY_MAP(WAFL_CG),
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(feature)
	SMU_FEATURE_##feature##_BIT
Quoted 2 lines

--
2.23.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MN2PR12MB3344D88565FD9A38CF442F7EE4A50-rweVpJHSKToDMgCC8P//[email protected]

Reviewed-by
#6 lore raw

Re: [PATCH 2/2] drm/amd/powerplay: correct the pp_feature output on Arcturus

Best Regards,
Kevin
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Quan, Evan <[email protected]>
Sent: Thursday, August 22, 2019 6:20 PM
To: Quan, Evan <[email protected]>; [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 2/2] drm/amd/powerplay: correct the pp_feature output on Arcturus

Ping..

Quoted 57 lines

-----Original Message-----
From: Evan Quan <[email protected]>
Sent: Wednesday, August 21, 2019 4:42 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 2/2] drm/amd/powerplay: correct the pp_feature output on Arcturus

Fix for the commit below:
drm/amd/powerplay: implment sysfs feature status function in smu

Change-Id Id9a373f8d8866b97450be0aef0ba19d0835d40d8
---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c  | 2 ++
drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 +
 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -0
index dd6563358e8e..f1f072012fac 100644
@@ -141,6 +141,7 @@ static struct smu_11_0_cmn2aisc_mapping

arcturus_feature_mask_map[SMU_FEATURE_CO

       FEA_MAP(DPM_SOCCLK),
       FEA_MAP(DPM_FCLK),
       FEA_MAP(DPM_MP0CLK),
+     ARCTURUS_FEA_MAP(SMU_FEATURE_XGMI_BIT,
FEATURE_DPM_XGMI_BIT),
       FEA_MAP(DS_GFXCLK),
       FEA_MAP(DS_SOCCLK),
       FEA_MAP(DS_LCLK),
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -0
@@ -149,6 +150,7 @@ static struct smu_11_0_cmn2aisc_mapping

arcturus_feature_mask_map[SMU_FEATURE_CO

       FEA_MAP(GFX_ULV),
       ARCTURUS_FEA_MAP(SMU_FEATURE_VCN_PG_BIT,
FEATURE_DPM_VCN_BIT),
       FEA_MAP(RSMU_SMN_CG),
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -0
+     FEA_MAP(WAFL_CG),
       FEA_MAP(PPT),
       FEA_MAP(TDC),
       FEA_MAP(APCC_PLUS),
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
index 72962e842d69..c3c74098f614 100644
@@ -207,6 +207,7 @@ enum smu_clk_type {
        __SMU_DUMMY_MAP(TEMP_DEPENDENT_VMIN),                  \
        __SMU_DUMMY_MAP(MMHUB_PG),                             \
        __SMU_DUMMY_MAP(ATHUB_PG),                             \
+       __SMU_DUMMY_MAP(WAFL_CG),
 
 #undef __SMU_DUMMY_MAP
 #define __SMU_DUMMY_MAP(feature)
       SMU_FEATURE_##feature##_BIT
Quoted 2 lines

--
2.23.0

_______________________________________________
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

author
#7 lore raw
In reply to a message not in the archive

Ping..

Quoted 151 lines

-----Original Message-----
From: Evan Quan <[email protected]>
Sent: Wednesday, August 21, 2019 4:42 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 1/2] drm/amd/powerplay: correct Vega20 dpm level related settings

Correct the settings for auto mode and skip the unnecessary settings for dcefclk and fclk.

Change-Id I7e6ca75ce86b4d5cd44920a9fbc71b6f36ea3c49
---
 .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c    | 60
+++++++++++++++++--
 1 file changed, 54 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
index 0516c294b377..cc52d5c8ccf9 100644
@@ -2349,12 +2349,16 @@ static int vega20_force_dpm_highest(struct
 pp_hwmgr *hwmgr)
 		data->dpm_table.soc_table.dpm_state.soft_max_level =
 		data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_min_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -0
+						 FEATURE_DPM_UCLK_MASK

|
+
FEATURE_DPM_SOCCLK_MASK);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload boot level to highest!",
 			return ret);
 
-	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_max_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -0
+						 FEATURE_DPM_UCLK_MASK

|
+
FEATURE_DPM_SOCCLK_MASK);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload dpm max level to highest!",
 			return ret);
@@ -2387,12 +2391,16 @@ static int vega20_force_dpm_lowest(struct
 pp_hwmgr *hwmgr)
 		data->dpm_table.soc_table.dpm_state.soft_max_level =
 		data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_min_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -0
+						 FEATURE_DPM_UCLK_MASK

|
+
FEATURE_DPM_SOCCLK_MASK);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload boot level to highest!",
 			return ret);
 
-	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_max_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -0
+						 FEATURE_DPM_UCLK_MASK

|
+
FEATURE_DPM_SOCCLK_MASK);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +28 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload dpm max level to highest!",
 			return ret);
@@ -2403,14 +2411,54 @@ static int vega20_force_dpm_lowest(struct
 pp_hwmgr *hwmgr)
 
 static int vega20_unforce_dpm_levels(struct pp_hwmgr *hwmgr)  {
+	struct vega20_hwmgr *data =
+			(struct vega20_hwmgr *)(hwmgr->backend);
+	uint32_t soft_min_level, soft_max_level;
 	int ret = 0;
 
-	ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+	/* gfxclk soft min/max settings */
+	soft_min_level =
+		vega20_find_lowest_dpm_level(&(data-
 >dpm_table.gfx_table));
+	soft_max_level =
+		vega20_find_highest_dpm_level(&(data-
 >dpm_table.gfx_table));
+
+	data->dpm_table.gfx_table.dpm_state.soft_min_level =
+		data-
 >dpm_table.gfx_table.dpm_levels[soft_min_level].value;
+	data->dpm_table.gfx_table.dpm_state.soft_max_level =
+		data-
 >dpm_table.gfx_table.dpm_levels[soft_max_level].value;
+
+	/* uclk soft min/max settings */
+	soft_min_level =
+		vega20_find_lowest_dpm_level(&(data-
 >dpm_table.mem_table));
+	soft_max_level =
+		vega20_find_highest_dpm_level(&(data-
 >dpm_table.mem_table));
+
+	data->dpm_table.mem_table.dpm_state.soft_min_level =
+		data-
 >dpm_table.mem_table.dpm_levels[soft_min_level].value;
+	data->dpm_table.mem_table.dpm_state.soft_max_level =
+		data-
 >dpm_table.mem_table.dpm_levels[soft_max_level].value;
+
+	/* socclk soft min/max settings */
+	soft_min_level =
+		vega20_find_lowest_dpm_level(&(data-
Quoted 1 line

dpm_table.soc_table));

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -0
+	soft_max_level =
+		vega20_find_highest_dpm_level(&(data-
Quoted 1 line

dpm_table.soc_table));

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +3 -0
+
+	data->dpm_table.soc_table.dpm_state.soft_min_level =
+		data-
Quoted 1 line

dpm_table.soc_table.dpm_levels[soft_min_level].value;

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -0
+	data->dpm_table.soc_table.dpm_state.soft_max_level =
+		data-
Quoted 1 line

dpm_table.soc_table.dpm_levels[soft_max_level].value;

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -0
+
+	ret = vega20_upload_dpm_min_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -0
+						 FEATURE_DPM_UCLK_MASK

|
+
FEATURE_DPM_SOCCLK_MASK);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload DPM Bootup Levels!",
 			return ret);
 
-	ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+	ret = vega20_upload_dpm_max_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -0
+						 FEATURE_DPM_UCLK_MASK

|
+
FEATURE_DPM_SOCCLK_MASK);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0 -1
 	PP_ASSERT_WITH_CODE(!ret,
 			"Failed to upload DPM Max Levels!",
 			return ret);
--
Quoted 1 line

2.23.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): MN2PR12MB3344CC59152485D92985287BE4A50-rweVpJHSKToDMgCC8P//[email protected]

#9 lore raw

________________________________
From: Quan, Evan <[email protected]>
Sent: Thursday, August 22, 2019 6:21 AM
To: Quan, Evan <[email protected]>; [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/powerplay: correct Vega20 dpm level related settings

Ping..

Quoted 144 lines

-----Original Message-----
From: Evan Quan <[email protected]>
Sent: Wednesday, August 21, 2019 4:42 PM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 1/2] drm/amd/powerplay: correct Vega20 dpm level related settings

Correct the settings for auto mode and skip the unnecessary settings for dcefclk and fclk.

Change-Id I7e6ca75ce86b4d5cd44920a9fbc71b6f36ea3c49
---
 .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c    | 60
+++++++++++++++++--
 1 file changed, 54 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
index 0516c294b377..cc52d5c8ccf9 100644
@@ -2349,12 +2349,16 @@ static int vega20_force_dpm_highest(struct
 pp_hwmgr *hwmgr)
               data->dpm_table.soc_table.dpm_state.soft_max_level =
               data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-     ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+     ret = vega20_upload_dpm_min_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |
+ FEATURE_DPM_UCLK_MASK
|
+
FEATURE_DPM_SOCCLK_MASK);
PP_ASSERT_WITH_CODE(!ret,
"Failed to upload boot level to highest!", return ret);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
-     ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+     ret = vega20_upload_dpm_max_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |
+ FEATURE_DPM_UCLK_MASK
|
+
FEATURE_DPM_SOCCLK_MASK);
PP_ASSERT_WITH_CODE(!ret,
"Failed to upload dpm max level to highest!", return ret);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
@@ -2387,12 +2391,16 @@ static int vega20_force_dpm_lowest(struct
 pp_hwmgr *hwmgr)
               data->dpm_table.soc_table.dpm_state.soft_max_level =
               data->dpm_table.soc_table.dpm_levels[soft_level].value;
 
-     ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+     ret = vega20_upload_dpm_min_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |
+ FEATURE_DPM_UCLK_MASK
|
+
FEATURE_DPM_SOCCLK_MASK);
PP_ASSERT_WITH_CODE(!ret,
"Failed to upload boot level to highest!", return ret);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
-     ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+     ret = vega20_upload_dpm_max_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |
+ FEATURE_DPM_UCLK_MASK
|
+
FEATURE_DPM_SOCCLK_MASK);
PP_ASSERT_WITH_CODE(!ret,
"Failed to upload dpm max level to highest!", return ret);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +28 -1
@@ -2403,14 +2411,54 @@ static int vega20_force_dpm_lowest(struct
 pp_hwmgr *hwmgr)
 
 static int vega20_unforce_dpm_levels(struct pp_hwmgr *hwmgr)  {
+     struct vega20_hwmgr *data =
+                     (struct vega20_hwmgr *)(hwmgr->backend);
+     uint32_t soft_min_level, soft_max_level;
       int ret = 0;
 
-     ret = vega20_upload_dpm_min_level(hwmgr, 0xFFFFFFFF);
+     /* gfxclk soft min/max settings */
+     soft_min_level =
+             vega20_find_lowest_dpm_level(&(data-
 >dpm_table.gfx_table));
+     soft_max_level =
+             vega20_find_highest_dpm_level(&(data-
 >dpm_table.gfx_table));
+
+     data->dpm_table.gfx_table.dpm_state.soft_min_level =
+             data-
 >dpm_table.gfx_table.dpm_levels[soft_min_level].value;
+     data->dpm_table.gfx_table.dpm_state.soft_max_level =
+             data-
 >dpm_table.gfx_table.dpm_levels[soft_max_level].value;
+
+     /* uclk soft min/max settings */
+     soft_min_level =
+             vega20_find_lowest_dpm_level(&(data-
 >dpm_table.mem_table));
+     soft_max_level =
+             vega20_find_highest_dpm_level(&(data-
 >dpm_table.mem_table));
+
+     data->dpm_table.mem_table.dpm_state.soft_min_level =
+             data-
 >dpm_table.mem_table.dpm_levels[soft_min_level].value;
+     data->dpm_table.mem_table.dpm_state.soft_max_level =
+             data-
 >dpm_table.mem_table.dpm_levels[soft_max_level].value;
+
+     /* socclk soft min/max settings */
+     soft_min_level =
+             vega20_find_lowest_dpm_level(&(data-
Quoted 1 line

dpm_table.soc_table));

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -0
+     soft_max_level =
+             vega20_find_highest_dpm_level(&(data-
Quoted 1 line

dpm_table.soc_table));

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +3 -0
+
+     data->dpm_table.soc_table.dpm_state.soft_min_level =
+             data-
Quoted 1 line

dpm_table.soc_table.dpm_levels[soft_min_level].value;

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -0
+     data->dpm_table.soc_table.dpm_state.soft_max_level =
+             data-
Quoted 1 line

dpm_table.soc_table.dpm_levels[soft_max_level].value;

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2 -0
+
+     ret = vega20_upload_dpm_min_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |
+ FEATURE_DPM_UCLK_MASK
|
+
FEATURE_DPM_SOCCLK_MASK);
PP_ASSERT_WITH_CODE(!ret,
"Failed to upload DPM Bootup Levels!", return ret);

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1 -1
-     ret = vega20_upload_dpm_max_level(hwmgr, 0xFFFFFFFF);
+     ret = vega20_upload_dpm_max_level(hwmgr,

FEATURE_DPM_GFXCLK_MASK |
+ FEATURE_DPM_UCLK_MASK

Quoted 8 lines

|
+
FEATURE_DPM_SOCCLK_MASK);
PP_ASSERT_WITH_CODE(!ret,
"Failed to upload DPM Max Levels!", return ret);
--
2.23.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx