Skip to contentSkip to conversation

drm/amd/pp: revert "Implement get_performance_level for legacy dgpu"

PATCH In review Christian König 3 participants 3 messages Jul 9, 2018 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/pp: revert "Implement get_performance_level for legacy dgpu"

This reverts commit 3fdadbfe1edf4168b2515083af5651c95aeb299d.

It causes crashes on Tonga so revert it for now. Somebody with better knowledge of the code needs to take a closer look.

---
 .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c  |  2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   | 24 ----------------------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 24 ----------------------
 3 files changed, 1 insertion(+), 49 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +1 -1
index b05b153101c5..53207e76b0f3 100644
@@ -357,7 +357,7 @@ int phm_get_clock_info(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *s
 			PHM_PerformanceLevelDesignation designation)
 {
 	int result;
-	PHM_PerformanceLevel performance_level = {0};
+	PHM_PerformanceLevel performance_level;
 
 	PHM_FUNC_CHECK(hwmgr);
 
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0 -24
index 8eaaa6b7973e..077b79938528 100644
@@ -5006,29 +5006,6 @@ static int smu7_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uint
 	return 0;
 }
 
-static int smu7_get_performance_level(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *state,
-				PHM_PerformanceLevelDesignation designation, uint32_t index,
-				PHM_PerformanceLevel *level)
-{
-	const struct smu7_power_state *ps;
-	struct smu7_hwmgr *data;
-	uint32_t i;
-
-	if (level == NULL || hwmgr == NULL || state == NULL)
-		return -EINVAL;
-
-	data = hwmgr->backend;
-	ps = cast_const_phw_smu7_power_state(state);
-
-	i = index > ps->performance_level_count - 1 ?
-			ps->performance_level_count - 1 : index;
-
-	level->coreClock = ps->performance_levels[i].engine_clock;
-	level->memory_clock = ps->performance_levels[i].memory_clock;
-
-	return 0;
-}
-
 static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
 	.backend_init = &smu7_hwmgr_backend_init,
 	.backend_fini = &smu7_hwmgr_backend_fini,
@@ -5085,7 +5062,6 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
 	.set_power_limit = smu7_set_power_limit,
 	.get_power_profile_mode = smu7_get_power_profile_mode,
 	.set_power_profile_mode = smu7_set_power_profile_mode,
-	.get_performance_level = smu7_get_performance_level,
 };
 
 uint8_t smu7_get_sleep_divider_id_from_clock(uint32_t clock,
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -24
index 5c03df49c076..eb37316cfbf7 100644
@@ -4837,29 +4837,6 @@ static int vega10_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,
 	return 0;
 }
 
-static int vega10_get_performance_level(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *state,
-				PHM_PerformanceLevelDesignation designation, uint32_t index,
-				PHM_PerformanceLevel *level)
-{
-	const struct vega10_power_state *ps;
-	struct vega10_hwmgr *data;
-	uint32_t i;
-
-	if (level == NULL || hwmgr == NULL || state == NULL)
-		return -EINVAL;
-
-	data = hwmgr->backend;
-	ps = cast_const_phw_vega10_power_state(state);
-
-	i = index > ps->performance_level_count - 1 ?
-			ps->performance_level_count - 1 : index;
-
-	level->coreClock = ps->performance_levels[i].gfx_clock;
-	level->memory_clock = ps->performance_levels[i].mem_clock;
-
-	return 0;
-}
-
 static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
 	.backend_init = vega10_hwmgr_backend_init,
 	.backend_fini = vega10_hwmgr_backend_fini,
@@ -4919,7 +4896,6 @@ static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
 	.set_power_profile_mode = vega10_set_power_profile_mode,
 	.set_power_limit = vega10_set_power_limit,
 	.odn_edit_dpm_table = vega10_odn_edit_dpm_table,
-	.get_performance_level = vega10_get_performance_level,
 };
 
 int vega10_enable_smc_features(struct pp_hwmgr *hwmgr,
Signature · 6 lines
2.14.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): 20180709132450.1591-1-christian.koenig-5C7GfCeVMHo@public.gmane.org

Acked-by
#2 lore raw
Quoted 6 lines · Christian König

This reverts commit 3fdadbfe1edf4168b2515083af5651c95aeb299d.

It causes crashes on Tonga so revert it for now. Somebody with better knowledge of the code needs to take a closer look.

Quoted 106 lines
---
 .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c  |  2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   | 24 ----------------------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 24 ----------------------
 3 files changed, 1 insertion(+), 49 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +1 -1
index b05b153101c5..53207e76b0f3 100644
@@ -357,7 +357,7 @@ int phm_get_clock_info(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *s
                        PHM_PerformanceLevelDesignation designation)
 {
        int result;
-       PHM_PerformanceLevel performance_level = {0};
+       PHM_PerformanceLevel performance_level;
 
        PHM_FUNC_CHECK(hwmgr);
 
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0 -24
index 8eaaa6b7973e..077b79938528 100644
@@ -5006,29 +5006,6 @@ static int smu7_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uint
        return 0;
 }
 
-static int smu7_get_performance_level(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *state,
-                               PHM_PerformanceLevelDesignation designation, uint32_t index,
-                               PHM_PerformanceLevel *level)
-{
-       const struct smu7_power_state *ps;
-       struct smu7_hwmgr *data;
-       uint32_t i;
-
-       if (level == NULL || hwmgr == NULL || state == NULL)
-               return -EINVAL;
-
-       data = hwmgr->backend;
-       ps = cast_const_phw_smu7_power_state(state);
-
-       i = index > ps->performance_level_count - 1 ?
-                       ps->performance_level_count - 1 : index;
-
-       level->coreClock = ps->performance_levels[i].engine_clock;
-       level->memory_clock = ps->performance_levels[i].memory_clock;
-
-       return 0;
-}
-
 static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
        .backend_init = &smu7_hwmgr_backend_init,
        .backend_fini = &smu7_hwmgr_backend_fini,
@@ -5085,7 +5062,6 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
        .set_power_limit = smu7_set_power_limit,
        .get_power_profile_mode = smu7_get_power_profile_mode,
        .set_power_profile_mode = smu7_set_power_profile_mode,
-       .get_performance_level = smu7_get_performance_level,
 };
 
 uint8_t smu7_get_sleep_divider_id_from_clock(uint32_t clock,
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -25
index 5c03df49c076..eb37316cfbf7 100644
@@ -4837,29 +4837,6 @@ static int vega10_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,
        return 0;
 }
 
-static int vega10_get_performance_level(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *state,
-                               PHM_PerformanceLevelDesignation designation, uint32_t index,
-                               PHM_PerformanceLevel *level)
-{
-       const struct vega10_power_state *ps;
-       struct vega10_hwmgr *data;
-       uint32_t i;
-
-       if (level == NULL || hwmgr == NULL || state == NULL)
-               return -EINVAL;
-
-       data = hwmgr->backend;
-       ps = cast_const_phw_vega10_power_state(state);
-
-       i = index > ps->performance_level_count - 1 ?
-                       ps->performance_level_count - 1 : index;
-
-       level->coreClock = ps->performance_levels[i].gfx_clock;
-       level->memory_clock = ps->performance_levels[i].mem_clock;
-
-       return 0;
-}
-
 static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
        .backend_init = vega10_hwmgr_backend_init,
        .backend_fini = vega10_hwmgr_backend_fini,
@@ -4919,7 +4896,6 @@ static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
        .set_power_profile_mode = vega10_set_power_profile_mode,
        .set_power_limit = vega10_set_power_limit,
        .odn_edit_dpm_table = vega10_odn_edit_dpm_table,
-       .get_performance_level = vega10_get_performance_level,
 };
 
 int vega10_enable_smc_features(struct pp_hwmgr *hwmgr,
--

2.14.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

#3 lore raw
In reply to a message not in the archive
Quoted 6 lines · Christian König

This reverts commit 3fdadbfe1edf4168b2515083af5651c95aeb299d.

It causes crashes on Tonga so revert it for now. Somebody with better knowledge of the code needs to take a closer look.

Harry

Quoted 97 lines
---
 .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c  |  2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   | 24 ----------------------
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 24 ----------------------
 3 files changed, 1 insertion(+), 49 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c +1 -1
index b05b153101c5..53207e76b0f3 100644
@@ -357,7 +357,7 @@ int phm_get_clock_info(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *s
 			PHM_PerformanceLevelDesignation designation)
 {
 	int result;
-	PHM_PerformanceLevel performance_level = {0};
+	PHM_PerformanceLevel performance_level;
 
 	PHM_FUNC_CHECK(hwmgr);
 
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0 -24
index 8eaaa6b7973e..077b79938528 100644
@@ -5006,29 +5006,6 @@ static int smu7_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uint
 	return 0;
 }
 
-static int smu7_get_performance_level(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *state,
-				PHM_PerformanceLevelDesignation designation, uint32_t index,
-				PHM_PerformanceLevel *level)
-{
-	const struct smu7_power_state *ps;
-	struct smu7_hwmgr *data;
-	uint32_t i;
-
-	if (level == NULL || hwmgr == NULL || state == NULL)
-		return -EINVAL;
-
-	data = hwmgr->backend;
-	ps = cast_const_phw_smu7_power_state(state);
-
-	i = index > ps->performance_level_count - 1 ?
-			ps->performance_level_count - 1 : index;
-
-	level->coreClock = ps->performance_levels[i].engine_clock;
-	level->memory_clock = ps->performance_levels[i].memory_clock;
-
-	return 0;
-}
-
 static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
 	.backend_init = &smu7_hwmgr_backend_init,
 	.backend_fini = &smu7_hwmgr_backend_fini,
@@ -5085,7 +5062,6 @@ static const struct pp_hwmgr_func smu7_hwmgr_funcs = {
 	.set_power_limit = smu7_set_power_limit,
 	.get_power_profile_mode = smu7_get_power_profile_mode,
 	.set_power_profile_mode = smu7_set_power_profile_mode,
-	.get_performance_level = smu7_get_performance_level,
 };
 
 uint8_t smu7_get_sleep_divider_id_from_clock(uint32_t clock,
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -23
index 5c03df49c076..eb37316cfbf7 100644
@@ -4837,29 +4837,6 @@ static int vega10_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,
 	return 0;
 }
 
-static int vega10_get_performance_level(struct pp_hwmgr *hwmgr, const struct pp_hw_power_state *state,
-				PHM_PerformanceLevelDesignation designation, uint32_t index,
-				PHM_PerformanceLevel *level)
-{
-	const struct vega10_power_state *ps;
-	struct vega10_hwmgr *data;
-	uint32_t i;
-
-	if (level == NULL || hwmgr == NULL || state == NULL)
-		return -EINVAL;
-
-	data = hwmgr->backend;
-	ps = cast_const_phw_vega10_power_state(state);
-
-	i = index > ps->performance_level_count - 1 ?
-			ps->performance_level_count - 1 : index;
-
-	level->coreClock = ps->performance_levels[i].gfx_clock;
-	level->memory_clock = ps->performance_levels[i].mem_clock;
-
-	return 0;
-}
-
 static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
 	.backend_init = vega10_hwmgr_backend_init,
 	.backend_fini = vega10_hwmgr_backend_fini,

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c static const struct pp_hwmgr_func vega10_hwmgr_funcs = { · line 4901

Quoted 7 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -1
@@ -4919,7 +4896,6 @@ static const struct pp_hwmgr_func vega10_hwmgr_funcs = {
 	.set_power_profile_mode = vega10_set_power_profile_mode,
 	.set_power_limit = vega10_set_power_limit,
 	.odn_edit_dpm_table = vega10_odn_edit_dpm_table,
-	.get_performance_level = vega10_get_performance_level,
 };
 
 int vega10_enable_smc_features(struct pp_hwmgr *hwmgr,

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