Skip to contentSkip to conversation

drm/amd/powerplay: add UMD P-state in powerplay.

PATCH In review Rex Zhu 2 participants 4 messages Aug 29, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/2 drm/amd/powerplay: add UMD P-state in powerplay.

This feature is for UMD to run benchmark in a power state that is as steady as possible. kmd need to fix the power state as stable as possible. now, kmd support four level:
profile_standard,peak,min_sclk,min_mclk

move common related code to amd_powerplay.c

Change-Id Ie06c122199b7246f5b1951c354cf502bbed27485
---
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c      | 40 +++++++++++++++++++++-
 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c     | 24 +------------
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   | 25 +-------------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 25 +-------------
 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h          |  3 +-
 5 files changed, 44 insertions(+), 73 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +39 -1
index f73e80c..310f34a 100644
@@ -30,7 +30,7 @@
 #include "pp_instance.h"
 #include "power_state.h"
 #include "eventmanager.h"
-
+#include "eventtasks.h"
 
 static inline int pp_check(struct pp_instance *handle)
 {
@@ -324,12 +324,44 @@ static int pp_dpm_fw_loading_complete(void *handle)
 	return 0;
 }
 
+static void pp_dpm_en_umd_pstate(struct pp_hwmgr  *hwmgr,
+						enum amd_dpm_forced_level level)
+{
+	uint32_t profile_mode_mask = AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
+					AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
+					AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |
+					AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
+
+	if (!(hwmgr->dpm_level & profile_mode_mask)) {
+		/* enter umd pstate, save current level, disable gfx cg*/
+		if (level & profile_mode_mask) {
+			hwmgr->saved_dpm_level = hwmgr->dpm_level;
+			hwmgr->en_umd_pstate = true;
+			cgs_set_clockgating_state(hwmgr->device,
+						AMD_IP_BLOCK_TYPE_GFX,
+						AMD_CG_STATE_UNGATE);
+		}
+	} else {
+		/* exit umd pstate, restore level, enable gfx cg*/
+		if (!(level & profile_mode_mask)) {
+			if (level == AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)
+				level = hwmgr->saved_dpm_level;
+			hwmgr->en_umd_pstate = false;
+			cgs_set_clockgating_state(hwmgr->device,
+					AMD_IP_BLOCK_TYPE_GFX,
+					AMD_CG_STATE_GATE);
+		}
+	}
+	return;
+}
+
 static int pp_dpm_force_performance_level(void *handle,
 					enum amd_dpm_forced_level level)
 {
 	struct pp_hwmgr  *hwmgr;
 	struct pp_instance *pp_handle = (struct pp_instance *)handle;
 	int ret = 0;
+	struct pem_event_data data = { {0} };
 
 	ret = pp_check(pp_handle);
 
@@ -338,13 +370,19 @@ static int pp_dpm_force_performance_level(void *handle,
 
 	hwmgr = pp_handle->hwmgr;
 
+	if (level == hwmgr->dpm_level)
+		return 0;
+
 	if (hwmgr->hwmgr_func->force_dpm_level == NULL) {
 		pr_info("%s was not implemented.\n", __func__);
 		return 0;
 	}
 
 	mutex_lock(&pp_handle->pp_lock);
+	pp_dpm_en_umd_pstate(hwmgr, level);
+	pem_task_adjust_power_state(pp_handle->eventmgr, &data);
 	hwmgr->hwmgr_func->force_dpm_level(hwmgr, level);
+
 	mutex_unlock(&pp_handle->pp_lock);
 	return 0;
 }
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +1 -23
index bc839ff..a125e30 100644
@@ -1355,31 +1355,9 @@ static int cz_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,
 {
 	uint32_t sclk = 0;
 	int ret = 0;
-	uint32_t profile_mode_mask = AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
-					AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
-					AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
 
 	if (level == hwmgr->dpm_level)
-		return ret;
-
-	if (!(hwmgr->dpm_level & profile_mode_mask)) {
-		/* enter profile mode, save current level, disable gfx cg*/
-		if (level & profile_mode_mask) {
-			hwmgr->saved_dpm_level = hwmgr->dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-						AMD_IP_BLOCK_TYPE_GFX,
-						AMD_CG_STATE_UNGATE);
-		}
-	} else {
-		/* exit profile mode, restore level, enable gfx cg*/
-		if (!(level & profile_mode_mask)) {
-			if (level == AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)
-				level = hwmgr->saved_dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-					AMD_IP_BLOCK_TYPE_GFX,
-					AMD_CG_STATE_GATE);
-		}
-	}
+		return 0;
 
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1 -24
index f7aa057..a917fc5 100644
@@ -2577,32 +2577,9 @@ static int smu7_force_dpm_level(struct pp_hwmgr *hwmgr,
 	uint32_t sclk_mask = 0;
 	uint32_t mclk_mask = 0;
 	uint32_t pcie_mask = 0;
-	uint32_t profile_mode_mask = AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
-					AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
-					AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |
-					AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
 
 	if (level == hwmgr->dpm_level)
-		return ret;
-
-	if (!(hwmgr->dpm_level & profile_mode_mask)) {
-		/* enter profile mode, save current level, disable gfx cg*/
-		if (level & profile_mode_mask) {
-			hwmgr->saved_dpm_level = hwmgr->dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-						AMD_IP_BLOCK_TYPE_GFX,
-						AMD_CG_STATE_UNGATE);
-		}
-	} else {
-		/* exit profile mode, restore level, enable gfx cg*/
-		if (!(level & profile_mode_mask)) {
-			if (level == AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)
-				level = hwmgr->saved_dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-					AMD_IP_BLOCK_TYPE_GFX,
-					AMD_CG_STATE_GATE);
-		}
-	}
+		return 0;
 
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -24
index 268fa24..f14047d 100644
@@ -4536,32 +4536,9 @@ static int vega10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,
 	uint32_t sclk_mask = 0;
 	uint32_t mclk_mask = 0;
 	uint32_t soc_mask = 0;
-	uint32_t profile_mode_mask = AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
-					AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
-					AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |
-					AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
 
 	if (level == hwmgr->dpm_level)
-		return ret;
-
-	if (!(hwmgr->dpm_level & profile_mode_mask)) {
-		/* enter profile mode, save current level, disable gfx cg*/
-		if (level & profile_mode_mask) {
-			hwmgr->saved_dpm_level = hwmgr->dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-						AMD_IP_BLOCK_TYPE_GFX,
-						AMD_CG_STATE_UNGATE);
-		}
-	} else {
-		/* exit profile mode, restore level, enable gfx cg*/
-		if (!(level & profile_mode_mask)) {
-			if (level == AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)
-				level = hwmgr->saved_dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-					AMD_IP_BLOCK_TYPE_GFX,
-					AMD_CG_STATE_GATE);
-		}
-	}
+		return 0;
 
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +2 -1
index eb2e277..d2224ed 100644
@@ -802,12 +802,13 @@ struct pp_hwmgr {
 	struct amd_pp_display_configuration display_config;
 	uint32_t feature_mask;
 
-	/* power profile */
+	/* UMD Pstate */
 	struct amd_pp_profile gfx_power_profile;
 	struct amd_pp_profile compute_power_profile;
 	struct amd_pp_profile default_gfx_power_profile;
 	struct amd_pp_profile default_compute_power_profile;
 	enum amd_pp_profile_type current_power_profile;
+	bool en_umd_pstate;
 };
 
 extern int hwmgr_early_init(struct pp_instance *handle);
Signature · 6 lines
1.9.1

_______________________________________________
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): 1503998069-32488-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH 2/2 drm/amd/powerplay: set uvd/vce/nb/mclk level as pstate requested

Change-Id: Ibd74590c3fe9dbdeac924b697d18448bddbefcdb

---
 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +9 -2
index a125e30..10bf687 100644
@@ -1359,6 +1359,11 @@ static int cz_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,
 	if (level == hwmgr->dpm_level)
 		return 0;
 
+	if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+		cz_nbdpm_pstate_enable_disable(hwmgr, false, false);
+	else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD)
+		cz_nbdpm_pstate_enable_disable(hwmgr, false, true);
+
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
 	case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:
@@ -1435,7 +1440,8 @@ int cz_dpm_update_uvd_dpm(struct pp_hwmgr *hwmgr, bool bgate)
 	if (!bgate) {
 		/* Stable Pstate is enabled and we need to set the UVD DPM to highest level */
 		if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
-					 PHM_PlatformCaps_StablePState)) {
+					 PHM_PlatformCaps_StablePState)
+			|| hwmgr->en_umd_pstate) {
 			cz_hwmgr->uvd_dpm.hard_min_clk =
 				   ptable->entries[ptable->count - 1].vclk;
 
@@ -1464,7 +1470,8 @@ int  cz_dpm_update_vce_dpm(struct pp_hwmgr *hwmgr)
 
 	/* Stable Pstate is enabled and we need to set the VCE DPM to highest level */
 	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
-					 PHM_PlatformCaps_StablePState)) {
+					PHM_PlatformCaps_StablePState)
+					|| hwmgr->en_umd_pstate) {
 		cz_hwmgr->vce_dpm.hard_min_clk =
 				  ptable->entries[ptable->count - 1].ecclk;
 
Signature · 6 lines
1.9.1

_______________________________________________
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): 1503998069-32488-2-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

#4 lore raw

RE: [PATCH 2/2] drm/amd/powerplay: set uvd/vce/nb/mclk level as pstate requested

Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Tuesday, August 29, 2017 5:14 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 2/2] drm/amd/powerplay: set uvd/vce/nb/mclk level as pstate requested

Change-Id: Ibd74590c3fe9dbdeac924b697d18448bddbefcdb

Missing your signed-off-by.

Quoted 10 lines
---
 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +0 -0
index a125e30..10bf687 100644

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c static int cz_dpm_force_dpm_level(struct · line 1367

Quoted 9 lines
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +5 -0
@@ -1359,6 +1359,11 @@ static int cz_dpm_force_dpm_level(struct
 pp_hwmgr *hwmgr,
 	if (level == hwmgr->dpm_level)
 		return 0;
 
+	if (level == AMD_DPM_FORCED_LEVEL_PROFILE_PEAK)
+		cz_nbdpm_pstate_enable_disable(hwmgr, false, false);
+	else if (level == AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD)
+		cz_nbdpm_pstate_enable_disable(hwmgr, false, true);
+

Do we need a default case here as well for the nbdpm to reset it back to normal when profiling mode is disabled?

Alex

Quoted 31 lines
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +0 -0
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +0 -0
 	case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK:
@@ -1435,7 +1440,8 @@ int cz_dpm_update_uvd_dpm(struct pp_hwmgr
 *hwmgr, bool bgate)
 	if (!bgate) {
 		/* Stable Pstate is enabled and we need to set the UVD DPM

to highest level */
if (phm_cap_enabled(hwmgr-

Quoted 1 line

platform_descriptor.platformCaps,

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +2 -1
-					 PHM_PlatformCaps_StablePState)) {
+					 PHM_PlatformCaps_StablePState)
+			|| hwmgr->en_umd_pstate) {
 			cz_hwmgr->uvd_dpm.hard_min_clk =
 				   ptable->entries[ptable->count - 1].vclk;
@@ -1464,7 +1470,8 @@ int  cz_dpm_update_vce_dpm(struct pp_hwmgr
 *hwmgr)
 
 	/* Stable Pstate is enabled and we need to set the VCE DPM to

highest level */

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +2 -2
 	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
-					 PHM_PlatformCaps_StablePState)) {
+					PHM_PlatformCaps_StablePState)
+					|| hwmgr->en_umd_pstate) {
 		cz_hwmgr->vce_dpm.hard_min_clk =
 				  ptable->entries[ptable->count - 1].ecclk;
 
--

1.9.1

Quoted 4 lines

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

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

Reviewed-by Alex Deucher
#5 lore raw
In reply to a message not in the archive
Quoted 74 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Tuesday, August 29, 2017 5:14 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 1/2] drm/amd/powerplay: add UMD P-state in powerplay.

This feature is for UMD to run benchmark in a power state that is as steady as possible. kmd need to fix the power state as stable as possible. now, kmd support four level:
profile_standard,peak,min_sclk,min_mclk

move common related code to amd_powerplay.c

Change-Id Ie06c122199b7246f5b1951c354cf502bbed27485
---
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c      | 40
+++++++++++++++++++++-
 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c     | 24 +------------
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   | 25 +-------------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 25 +------------
(quoted diff) +0 -1
-
 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h          |  3 +-
 5 files changed, 44 insertions(+), 73 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +5 -1
index f73e80c..310f34a 100644
@@ -30,7 +30,7 @@
 #include "pp_instance.h"
 #include "power_state.h"
 #include "eventmanager.h"
-
+#include "eventtasks.h"
 
 static inline int pp_check(struct pp_instance *handle)
 {
@@ -324,12 +324,44 @@ static int pp_dpm_fw_loading_complete(void
 *handle)
 	return 0;
 }
 
+static void pp_dpm_en_umd_pstate(struct pp_hwmgr  *hwmgr,
+						enum
 amd_dpm_forced_level level)
+{
+	uint32_t profile_mode_mask =

AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
+
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |
+

	AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +14 -0
+
+	if (!(hwmgr->dpm_level & profile_mode_mask)) {
+		/* enter umd pstate, save current level, disable gfx cg*/
+		if (level & profile_mode_mask) {
+			hwmgr->saved_dpm_level = hwmgr->dpm_level;
+			hwmgr->en_umd_pstate = true;
+			cgs_set_clockgating_state(hwmgr->device,
+						AMD_IP_BLOCK_TYPE_GFX,
+						AMD_CG_STATE_UNGATE);
+		}
+	} else {
+		/* exit umd pstate, restore level, enable gfx cg*/
+		if (!(level & profile_mode_mask)) {
+			if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)

drivers/gpu/drm/amd/powerplay/amd_powerplay.c static int pp_dpm_fw_loading_complete(void *handle) · line 355

Quoted 8 lines
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +8 -0
+				level = hwmgr->saved_dpm_level;
+			hwmgr->en_umd_pstate = false;
+			cgs_set_clockgating_state(hwmgr->device,
+					AMD_IP_BLOCK_TYPE_GFX,
+					AMD_CG_STATE_GATE);
+		}
+	}
+	return;

Can drop the return here. With that fixed:

Quoted 189 lines
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +9 -0
+}
+
 static int pp_dpm_force_performance_level(void *handle,
 					enum amd_dpm_forced_level level)
 {
 	struct pp_hwmgr  *hwmgr;
 	struct pp_instance *pp_handle = (struct pp_instance *)handle;
 	int ret = 0;
+	struct pem_event_data data = { {0} };
 
 	ret = pp_check(pp_handle);
@@ -338,13 +370,19 @@ static int pp_dpm_force_performance_level(void
 *handle,
 
 	hwmgr = pp_handle->hwmgr;
 
+	if (level == hwmgr->dpm_level)
+		return 0;
+
 	if (hwmgr->hwmgr_func->force_dpm_level == NULL) {
 		pr_info("%s was not implemented.\n", __func__);
 		return 0;
 	}
 
 	mutex_lock(&pp_handle->pp_lock);
+	pp_dpm_en_umd_pstate(hwmgr, level);
+	pem_task_adjust_power_state(pp_handle->eventmgr, &data);
 	hwmgr->hwmgr_func->force_dpm_level(hwmgr, level);
+
 	mutex_unlock(&pp_handle->pp_lock);
 	return 0;

}

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +0 -1
index bc839ff..a125e30 100644
@@ -1355,31 +1355,9 @@ static int cz_dpm_force_dpm_level(struct
 pp_hwmgr *hwmgr,
 {
 	uint32_t sclk = 0;
 	int ret = 0;
-	uint32_t profile_mode_mask =

AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
-
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
-

	AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +0 -14
 	if (level == hwmgr->dpm_level)
-		return ret;
-
-	if (!(hwmgr->dpm_level & profile_mode_mask)) {
-		/* enter profile mode, save current level, disable gfx cg*/
-		if (level & profile_mode_mask) {
-			hwmgr->saved_dpm_level = hwmgr->dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-						AMD_IP_BLOCK_TYPE_GFX,
-						AMD_CG_STATE_UNGATE);
-		}
-	} else {
-		/* exit profile mode, restore level, enable gfx cg*/
-		if (!(level & profile_mode_mask)) {
-			if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +1 -6
-				level = hwmgr->saved_dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-					AMD_IP_BLOCK_TYPE_GFX,
-					AMD_CG_STATE_GATE);
-		}
-	}
+		return 0;
 
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0 -1
index f7aa057..a917fc5 100644
@@ -2577,32 +2577,9 @@ static int smu7_force_dpm_level(struct
 pp_hwmgr *hwmgr,
 	uint32_t sclk_mask = 0;
 	uint32_t mclk_mask = 0;
 	uint32_t pcie_mask = 0;
-	uint32_t profile_mode_mask =

AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
-
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
-
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |
-

	AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0 -14
 	if (level == hwmgr->dpm_level)
-		return ret;
-
-	if (!(hwmgr->dpm_level & profile_mode_mask)) {
-		/* enter profile mode, save current level, disable gfx cg*/
-		if (level & profile_mode_mask) {
-			hwmgr->saved_dpm_level = hwmgr->dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-						AMD_IP_BLOCK_TYPE_GFX,
-						AMD_CG_STATE_UNGATE);
-		}
-	} else {
-		/* exit profile mode, restore level, enable gfx cg*/
-		if (!(level & profile_mode_mask)) {
-			if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1 -6
-				level = hwmgr->saved_dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-					AMD_IP_BLOCK_TYPE_GFX,
-					AMD_CG_STATE_GATE);
-		}
-	}
+		return 0;
 
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -1
index 268fa24..f14047d 100644
@@ -4536,32 +4536,9 @@ static int vega10_dpm_force_dpm_level(struct
 pp_hwmgr *hwmgr,
 	uint32_t sclk_mask = 0;
 	uint32_t mclk_mask = 0;
 	uint32_t soc_mask = 0;
-	uint32_t profile_mode_mask =

AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD |
-
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK |
-
AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK |
-

	AMD_DPM_FORCED_LEVEL_PROFILE_PEAK;
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -14
 	if (level == hwmgr->dpm_level)
-		return ret;
-
-	if (!(hwmgr->dpm_level & profile_mode_mask)) {
-		/* enter profile mode, save current level, disable gfx cg*/
-		if (level & profile_mode_mask) {
-			hwmgr->saved_dpm_level = hwmgr->dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-						AMD_IP_BLOCK_TYPE_GFX,
-						AMD_CG_STATE_UNGATE);
-		}
-	} else {
-		/* exit profile mode, restore level, enable gfx cg*/
-		if (!(level & profile_mode_mask)) {
-			if (level ==

AMD_DPM_FORCED_LEVEL_PROFILE_EXIT)

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -6
-				level = hwmgr->saved_dpm_level;
-			cgs_set_clockgating_state(hwmgr->device,
-					AMD_IP_BLOCK_TYPE_GFX,
-					AMD_CG_STATE_GATE);
-		}
-	}
+		return 0;
 
 	switch (level) {
 	case AMD_DPM_FORCED_LEVEL_HIGH:
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +2 -2
index eb2e277..d2224ed 100644
@@ -802,12 +802,13 @@ struct pp_hwmgr {
 	struct amd_pp_display_configuration display_config;
 	uint32_t feature_mask;
 
-	/* power profile */
+	/* UMD Pstate */
 	struct amd_pp_profile gfx_power_profile;
 	struct amd_pp_profile compute_power_profile;
 	struct amd_pp_profile default_gfx_power_profile;
 	struct amd_pp_profile default_compute_power_profile;
 	enum amd_pp_profile_type current_power_profile;
+	bool en_umd_pstate;
 };
 
 extern int hwmgr_early_init(struct pp_instance *handle);
--

1.9.1

Quoted 4 lines

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

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