drm/amd/powerplay: fix issue dpm can't work on iceland.
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: fix issue dpm can't work on iceland.
In driver, we can't assume there were only
2 performance levels on VI. it was decided by atombios. e.g. there were 3 performance levels in HP atom bios.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 33 +++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +18 -15
@@ -2523,13 +2523,17 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, (struct phm_ppt_v1_information *)(hwmgr->pptable);int32_t count;int32_t stable_pstate_sclk =0 , stable_pstate_mclk =0 ; +uint32_t high_level; data->battery_state = (PP_StateUILabel_Battery == request_ps->classification.ui_label); -PP_ASSERT_WITH_CODE (smu7_ps->performance_level_count ==2 , - "VI should always have 2 performance levels", - ); +if (smu7_ps->performance_level_count <1 ) { +printk (KERN_ERR "No Valid powerstate in pptable\n" ); +return -EINVAL ; + } + + high_level = smu7_ps->performance_level_count -1 ; max_limits = (PP_PowerSource_AC == hwmgr->power_source) ? &(hwmgr->dyn_state.max_clock_voltage_on_ac) :
@@ -2595,7 +2599,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, hwmgr->platform_descriptor.overdriveLimit.engineClock);if (hwmgr->gfx_arbiter.sclk_over_drive >= hwmgr->gfx_arbiter.sclk) - smu7_ps->performance_levels[1 ].engine_clock = + smu7_ps->performance_levels[high_level].engine_clock = hwmgr->gfx_arbiter.sclk_over_drive; }
@@ -2607,7 +2611,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, hwmgr->platform_descriptor.overdriveLimit.memoryClock);if (hwmgr->gfx_arbiter.mclk_over_drive >= hwmgr->gfx_arbiter.mclk) - smu7_ps->performance_levels[1 ].memory_clock = + smu7_ps->performance_levels[high_level].memory_clock = hwmgr->gfx_arbiter.mclk_over_drive; }
@@ -2623,8 +2627,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, mclk = smu7_ps->performance_levels[0 ].memory_clock;if (disable_mclk_switching) - mclk = smu7_ps->performance_levels - [smu7_ps->performance_level_count -1 ].memory_clock; + mclk = smu7_ps->performance_levels[high_level].memory_clock;if (sclk < minimum_clocks.engineClock) sclk = (minimum_clocks.engineClock > max_limits->sclk) ?
@@ -2637,22 +2640,22 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, smu7_ps->performance_levels[0 ].engine_clock = sclk; smu7_ps->performance_levels[0 ].memory_clock = mclk; - smu7_ps->performance_levels[1 ].engine_clock = - (smu7_ps->performance_levels[1 ].engine_clock >= + smu7_ps->performance_levels[high_level].engine_clock = + (smu7_ps->performance_levels[high_level].engine_clock >= smu7_ps->performance_levels[0 ].engine_clock) ? - smu7_ps->performance_levels[1 ].engine_clock : + smu7_ps->performance_levels[high_level].engine_clock : smu7_ps->performance_levels[0 ].engine_clock;if (disable_mclk_switching) { -if (mclk < smu7_ps->performance_levels[1 ].memory_clock) - mclk = smu7_ps->performance_levels[1 ].memory_clock; +if (mclk < smu7_ps->performance_levels[high_level].memory_clock) + mclk = smu7_ps->performance_levels[high_level].memory_clock; smu7_ps->performance_levels[0 ].memory_clock = mclk; - smu7_ps->performance_levels[1 ].memory_clock = mclk; + smu7_ps->performance_levels[high_level].memory_clock = mclk; }else { -if (smu7_ps->performance_levels[1 ].memory_clock < +if (smu7_ps->performance_levels[high_level].memory_clock < smu7_ps->performance_levels[0 ].memory_clock) - smu7_ps->performance_levels[1 ].memory_clock = + smu7_ps->performance_levels[high_level].memory_clock = smu7_ps->performance_levels[0 ].memory_clock; }
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): 1478854181-2427-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Friday, November 11, 2016 3:50 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/powerplay: fix issue dpm can't work on iceland.
Quoted 6 lines
In driver, we can't assume there were only
2 performance levels on VI. it was decided by atombios. e.g. there were 3 performance levels in HP atom bios.Change-Id Ia7645ca12018092c3e5870403abf3d7ba20dc801Signed-off-by Rex Zhu <[email protected]>
Don't we have to increase SMU7_MAX_HARDWARE_POWERLEVELS to something higher? 3? 4? 8?
Alex
Quoted 117 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 33 +++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +7
-3@@ -2523,13 +2523,17 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, (struct phm_ppt_v1_information *)(hwmgr- >pptable);int32_t count;int32_t stable_pstate_sclk =0 , stable_pstate_mclk =0 ; +uint32_t high_level; data->battery_state = (PP_StateUILabel_Battery == request_ps->classification.ui_label); -PP_ASSERT_WITH_CODE (smu7_ps->performance_level_count ==2 , -"VI should always have 2 performance levels", - ); + if (smu7_ps->performance_level_count < 1) { +printk (KERN_ERR "No Valid powerstate in pptable\n" ); +return -EINVAL ; + } + + high_level = smu7_ps->performance_level_count -1 ;drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1max_limits = (PP_PowerSource_AC == hwmgr->power_source) ? &(hwmgr->dyn_state.max_clock_voltage_on_ac) :@@ -2595,7 +2599,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, hwmgr- >platform_descriptor.overdriveLimit.engineClock); if (hwmgr->gfx_arbiter.sclk_over_drive >= hwmgr- >gfx_arbiter.sclk) - smu7_ps->performance_levels[1].engine_clock = + smu7_ps-Quoted 1 line
performance_levels[high_level].engine_clock =
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1hwmgr->gfx_arbiter.sclk_over_drive; }@@ -2607,7 +2611,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, hwmgr- >platform_descriptor.overdriveLimit.memoryClock); if (hwmgr->gfx_arbiter.mclk_over_drive >= hwmgr- >gfx_arbiter.mclk) - smu7_ps->performance_levels[1].memory_clock = + smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock =
hwmgr-
Quoted 1 line
gfx_arbiter.mclk_over_drive;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-2}@@ -2623,8 +2627,7 @@ static int smu7_apply_state_adjust_rules(structpp_hwmgr *hwmgr, mclk = smu7_ps->performance_levels[0 ].memory_clock;if (disable_mclk_switching) - mclk = smu7_ps->performance_levels - [smu7_ps->performance_level_count -1 ].memory_clock; + mclk = smu7_ps- >performance_levels[high_level].memory_clock;drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +2
-2if (sclk < minimum_clocks.engineClock) sclk = (minimum_clocks.engineClock > max_limits->sclk) ?@@ -2637,22 +2640,22 @@ static int smu7_apply_state_adjust_rules(structpp_hwmgr *hwmgr, smu7_ps->performance_levels[0].engine_clock = sclk; smu7_ps->performance_levels[0 ].memory_clock = mclk; - smu7_ps->performance_levels[1 ].engine_clock = - (smu7_ps->performance_levels[1 ].engine_clock >= + smu7_ps->performance_levels[high_level].engine_clock = + (smu7_ps->performance_levels[high_level].engine_clock >= smu7_ps-Quoted 1 line
performance_levels[0].engine_clock) ?
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-1- smu7_ps-Quoted 1 line
performance_levels[1].engine_clock :
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-0+ smu7_ps-Quoted 1 line
performance_levels[high_level].engine_clock :
smu7_ps-
Quoted 1 line
performance_levels[0].engine_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-2if (disable_mclk_switching) { -if (mclk < smu7_ps->performance_levels[1 ].memory_clock) - mclk = smu7_ps-Quoted 1 line
performance_levels[1].memory_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-0+ if (mclk < smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-0+ mclk = smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1smu7_ps->performance_levels[0 ].memory_clock = mclk; - smu7_ps->performance_levels[1 ].memory_clock = mclk; + smu7_ps->performance_levels[high_level].memory_clock =mclk;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1}else { - if (smu7_ps->performance_levels[1].memory_clock < + if (smu7_ps->performance_levels[high_level].memory_clock<
smu7_ps-Quoted 1 line
performance_levels[0].memory_clock)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1- smu7_ps->performance_levels[1].memory_clock = + smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock =
smu7_ps-
Quoted 1 line
performance_levels[0].memory_clock;
}
Quoted 7 lines
--
1.9.1_______________________________________________
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
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB1694E7744EACF536F60E2CA5F7BB0-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Hi Alex,
I think we don't need to increase SMU7_MAX_HARDWARE_POWERLEVELS.
In fact, VI always have 2 performance levels, and we only set up 2 levels in driver. So please ignore my last patch.
And The attached patch can fix the original issue: https://bugs.freedesktop.org/show_bug.cgi?id=97403
Please review.
Best Regards
Rex
-----Original Message-----
From: Deucher, Alexander
Sent: Friday, November 11, 2016 10:55 PM
To: Zhu, Rex; [email protected]
Cc: Zhu, Rex
Subject: RE: [PATCH] drm/amd/powerplay: fix issue dpm can't work on iceland.
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Friday, November 11, 2016 3:50 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/powerplay: fix issue dpm can't work on iceland.
Quoted 6 lines
In driver, we can't assume there were only
2 performance levels on VI. it was decided by atombios. e.g. there were 3 performance levels in HP atom bios.Change-Id Ia7645ca12018092c3e5870403abf3d7ba20dc801Signed-off-by Rex Zhu <[email protected]>
Don't we have to increase SMU7_MAX_HARDWARE_POWERLEVELS to something higher? 3? 4? 8?
Alex
Quoted 119 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 33 +++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-0@@ -2523,13 +2523,17 @@ static intsmu7_apply_state_adjust_rules(struct
pp_hwmgr*hwmgr,
(structphm_ppt_v1_information*)(hwmgr-Quoted 1 line
pptable);
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-2int32_t count;int32_t stable_pstate_sclk =0 , stable_pstate_mclk =0 ; +uint32_t high_level; data->battery_state = (PP_StateUILabel_Battery == request_ps->classification.ui_label); - PP_ASSERT_WITH_CODE(smu7_ps->performance_level_count == 2, - "VI should always have 2 performancelevels",
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +7
-2- ); +if (smu7_ps->performance_level_count <1 ) { +printk (KERN_ERR "No Valid powerstate in pptable\n" ); +return -EINVAL ; + } + + high_level = smu7_ps->performance_level_count -1 ; max_limits = (PP_PowerSource_AC == hwmgr->power_source) ? &(hwmgr->dyn_state.max_clock_voltage_on_ac) :@@ -2595,7 +2599,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, hwmgr- >platform_descriptor.overdriveLimit.engineClock); if (hwmgr->gfx_arbiter.sclk_over_drive >= hwmgr- >gfx_arbiter.sclk) - smu7_ps->performance_levels[1].engine_clock = + smu7_ps-Quoted 1 line
performance_levels[high_level].engine_clock =
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1hwmgr->gfx_arbiter.sclk_over_drive; }@@ -2607,7 +2611,7 @@ static int smu7_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, hwmgr- >platform_descriptor.overdriveLimit.memoryClock); if (hwmgr->gfx_arbiter.mclk_over_drive >= hwmgr- >gfx_arbiter.mclk) - smu7_ps->performance_levels[1].memory_clock = + smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock =
hwmgr-
Quoted 1 line
gfx_arbiter.mclk_over_drive;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-2}@@ -2623,8 +2627,7 @@ static int smu7_apply_state_adjust_rules(structpp_hwmgr *hwmgr, mclk = smu7_ps->performance_levels[0 ].memory_clock;if (disable_mclk_switching) - mclk = smu7_ps->performance_levels - [smu7_ps->performance_level_count -1 ].memory_clock; + mclk = smu7_ps- >performance_levels[high_level].memory_clock;drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-0if (sclk < minimum_clocks.engineClock) sclk = (minimum_clocks.engineClock > max_limits->sclk) ?@@ -2637,22 +2640,22 @@ static intsmu7_apply_state_adjust_rules(struct
pp_hwmgr*hwmgr,drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +2
-2smu7_ps->performance_levels[0 ].engine_clock = sclk; smu7_ps->performance_levels[0 ].memory_clock = mclk; - smu7_ps->performance_levels[1 ].engine_clock = - (smu7_ps->performance_levels[1 ].engine_clock >= + smu7_ps->performance_levels[high_level].engine_clock = + (smu7_ps->performance_levels[high_level].engine_clock >= smu7_ps-Quoted 1 line
performance_levels[0].engine_clock) ?
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-1- smu7_ps-Quoted 1 line
performance_levels[1].engine_clock :
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-0+ smu7_ps-Quoted 1 line
performance_levels[high_level].engine_clock :
smu7_ps-
Quoted 1 line
performance_levels[0].engine_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-2if (disable_mclk_switching) { -if (mclk < smu7_ps->performance_levels[1 ].memory_clock) - mclk = smu7_ps-Quoted 1 line
performance_levels[1].memory_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-0+ if (mclk < smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-0+ mclk = smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1smu7_ps->performance_levels[0 ].memory_clock = mclk; - smu7_ps->performance_levels[1 ].memory_clock = mclk; + smu7_ps->performance_levels[high_level].memory_clock =mclk;
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1}else { - if (smu7_ps->performance_levels[1].memory_clock < + if (smu7_ps->performance_levels[high_level].memory_clock<
smu7_ps-Quoted 1 line
performance_levels[0].memory_clock)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-1- smu7_ps->performance_levels[1].memory_clock = + smu7_ps-Quoted 1 line
performance_levels[high_level].memory_clock =
smu7_ps-
Quoted 1 line
performance_levels[0].memory_clock;
}
Quoted 7 lines
--
1.9.1_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
From dc2af8f1d8274a40cdc5061c6354116515a3fad4 Mon Sep 17 00:00:00 2001
From: Rex Zhu <[email protected]>
Date: Mon, 14 Nov 2016 16:36:08 +0800
Subject: [PATCH] drm/amd/powerplay: fix bug performance level miscalculation.
in some case, performance_level_count add one more.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +6 -6
@@ -2991,19 +2991,19 @@ static int smu7_get_pp_table_entry_callback_func_v0(struct pp_hwmgr *hwmgr,if (!(data->mc_micro_code_feature &DISABLE_MC_LOADMICROCODE ) && memory_clock > data->highest_mclk) data->highest_mclk = memory_clock; - performance_level = &(ps->performance_levels - [ps->performance_level_count++]); -PP_ASSERT_WITH_CODE ( (ps->performance_level_count <smum_get_mac_definition (hwmgr->smumgr,SMU_MAX_LEVELS_GRAPHICS )),"Performance levels exceeds SMC limit!" , return -EINVAL );PP_ASSERT_WITH_CODE ( - (ps->performance_level_count <= + (ps->performance_level_count < hwmgr->platform_descriptor.hardwareActivityPerformanceLevels), -"Performance levels exceeds Driver limit!" , - return -EINVAL ); +"Performance levels exceeds Driver limit, Skip!" , + return 0); + + performance_level = &(ps->performance_levels + [ps->performance_level_count++]);/* Performance levels are arranged from low to high. */ performance_level->memory_clock = memory_clock;
Signature · 1 line
1.9.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx