drm/amd/powerplay: fix populate dpm level failed when s3 on vega10.
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: fix populate dpm level failed when s3 on vega10.
As the min clk may be large than boot level can support. in this case, just ignore the min clk.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +6 -7
@@ -3119,11 +3119,10 @@ static int vega10_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, vega10_ps->performance_levels[0 ].gfx_clock = sclk; vega10_ps->performance_levels[0 ].mem_clock = mclk; - vega10_ps->performance_levels[1 ].gfx_clock = - (vega10_ps->performance_levels[1 ].gfx_clock >= - vega10_ps->performance_levels[0 ].gfx_clock) ? - vega10_ps->performance_levels[1 ].gfx_clock : - vega10_ps->performance_levels[0 ].gfx_clock; +if (vega10_ps->performance_levels[1 ].gfx_clock < + vega10_ps->performance_levels[0 ].gfx_clock) + vega10_ps->performance_levels[0 ].gfx_clock = + vega10_ps->performance_levels[1 ].gfx_clock;if (disable_mclk_switching) {/* Set Mclk the max of level 0 and level 1 */
@@ -3146,8 +3145,8 @@ static int vega10_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, }else {if (vega10_ps->performance_levels[1 ].mem_clock < vega10_ps->performance_levels[0 ].mem_clock) - vega10_ps->performance_levels[1 ].mem_clock = - vega10_ps->performance_levels[0 ].mem_clock; + vega10_ps->performance_levels[0 ].mem_clock = + vega10_ps->performance_levels[1 ].mem_clock; } if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
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): 1496405959-5046-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Friday, June 02, 2017 8:19 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/powerplay: fix populate dpm level failed when s3 on vega10.
Quoted 5 lines
As the min clk may be large than boot level can support. in this case, just ignore the min clk.
Change-Id I4fb6c7b269dc517ef4fe77a7288e9640bd0bd63aSigned-off-by Rex Zhu <[email protected]>
Quoted 49 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 13 ++++++---- --- 1 file changed, 6 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0
-3@@ -3119,11 +3119,10 @@ static int vega10_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, vega10_ps->performance_levels[0 ].gfx_clock = sclk; vega10_ps->performance_levels[0 ].mem_clock = mclk; - vega10_ps->performance_levels[1 ].gfx_clock = - (vega10_ps->performance_levels[1 ].gfx_clock >= - vega10_ps-Quoted 1 line
performance_levels[0].gfx_clock) ?
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0
-1- vega10_ps-Quoted 1 line
performance_levels[1].gfx_clock :
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0
-1- vega10_ps-Quoted 1 line
performance_levels[0].gfx_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +4
-0+if (vega10_ps->performance_levels[1 ].gfx_clock < + vega10_ps->performance_levels[0 ].gfx_clock) + vega10_ps->performance_levels[0 ].gfx_clock = + vega10_ps-Quoted 1 line
performance_levels[1].gfx_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2
-2if (disable_mclk_switching) {/* Set Mclk the max of level 0 and level 1 */ @@ -3146,8 +3145,8 @@ static int vega10_apply_state_adjust_rules(struct pp_hwmgr *hwmgr, }else {if (vega10_ps->performance_levels[1 ].mem_clock < vega10_ps- >performance_levels[0 ].mem_clock) - vega10_ps->performance_levels[1 ].mem_clock = - vega10_ps- >performance_levels[0].mem_clock; + vega10_ps->performance_levels[0 ].mem_clock = + vega10_ps-Quoted 1 line
performance_levels[1].mem_clock;
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0
-1} if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, --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