drm/amdgpu: not hardcode high performance level to 1 on Ci.
Subsystems (2)
PATCH 1/1 drm/amdgpu: not hardcode high performance level to 1 on Ci.
--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +16 -7
@@ -913,6 +913,15 @@ static void ci_apply_state_adjust_rules(struct amdgpu_device *adev,bool disable_mclk_switching;u32 sclk, mclk;int i; +int high_level; + + +if (ps ==NULL || ps->performance_level_count <1 ) { +DRM_ERROR ("failed to apply state adjust\n" ); +return ; + } + + high_level = ps->performance_level_count -1 ;if (rps->vce_active) { rps->evclk = adev->pm.dpm.vce_states[adev->pm.dpm.vce_level].evclk;
@@ -950,7 +959,7 @@ static void ci_apply_state_adjust_rules(struct amdgpu_device *adev,/* XXX validate the min clocks required for display */ if (disable_mclk_switching) { - mclk = ps->performance_levels[ps->performance_level_count -1 ].mclk; + mclk = ps->performance_levels[high_level].mclk; sclk = ps->performance_levels[0 ].sclk; }else { mclk = ps->performance_levels[0 ].mclk;
@@ -973,15 +982,15 @@ static void ci_apply_state_adjust_rules(struct amdgpu_device *adev, ps->performance_levels[0 ].sclk = sclk; ps->performance_levels[0 ].mclk = mclk; -if (ps->performance_levels[1 ].sclk < ps->performance_levels[0 ].sclk) - ps->performance_levels[1 ].sclk = ps->performance_levels[0 ].sclk; +if (ps->performance_levels[high_level].sclk < ps->performance_levels[0 ].sclk) + ps->performance_levels[high_level].sclk = ps->performance_levels[0 ].sclk;if (disable_mclk_switching) { -if (ps->performance_levels[0 ].mclk < ps->performance_levels[1 ].mclk) - ps->performance_levels[0 ].mclk = ps->performance_levels[1 ].mclk; +if (ps->performance_levels[0 ].mclk < ps->performance_levels[high_level].mclk) + ps->performance_levels[0 ].mclk = ps->performance_levels[high_level].mclk; }else { -if (ps->performance_levels[1 ].mclk < ps->performance_levels[0 ].mclk) - ps->performance_levels[1 ].mclk = ps->performance_levels[0 ].mclk; +if (ps->performance_levels[high_level].mclk < ps->performance_levels[0 ].mclk) + ps->performance_levels[high_level].mclk = ps->performance_levels[0 ].mclk; } }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 11 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Friday, November 11, 2016 4:02 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amdgpu: not hardcode high performance level to 1 on Ci.Change-Id I39009697639f1aeaefbe444bae2bf081f156de61Signed-off-by Rex Zhu <[email protected]>
Do we also need to increase CISLANDS_MAX_HARDWARE_POWERLEVELS?
Alex
Quoted 72 lines
--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)drivers/gpu/drm/amd/amdgpu/ci_dpm.c +9
-0@@ -913,6 +913,15 @@ static void ci_apply_state_adjust_rules(structamdgpu_device *adev, bool disable_mclk_switching;u32 sclk, mclk;int i; +int high_level; + + +if (ps ==NULL || ps->performance_level_count <1 ) { +DRM_ERROR ("failed to apply state adjust\n" ); +return ; + } + + high_level = ps->performance_level_count -1 ;if (rps->vce_active) {
rps->evclk= adev->pm.dpm.vce_states[adev-Quoted 1 line
pm.dpm.vce_level].evclk;
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +1
-1@@ -950,7 +959,7 @@ static void ci_apply_state_adjust_rules(structamdgpu_device *adev,/* XXX validate the min clocks required for display */ if (disable_mclk_switching) { - mclk = ps->performance_levels[ps- >performance_level_count - 1].mclk; + mclk = ps->performance_levels[high_level].mclk; sclk = ps->performance_levels[0 ].sclk;drivers/gpu/drm/amd/amdgpu/ci_dpm.c +3
-4}else { mclk = ps->performance_levels[0 ].mclk;@@ -973,15 +982,15 @@ static void ci_apply_state_adjust_rules(structamdgpu_device *adev, ps->performance_levels[0].sclk = sclk; ps->performance_levels[0 ].mclk = mclk; -if (ps->performance_levels[1 ].sclk < ps->performance_levels[0 ].sclk) - ps->performance_levels[1 ].sclk = ps- >performance_levels[0].sclk; + if (ps->performance_levels[high_level].sclk < ps- >performance_levels[0 ].sclk) + ps->performance_levels[high_level].sclk = ps- >performance_levels[0].sclk; if (disable_mclk_switching) { - if (ps->performance_levels[0].mclk < ps- >performance_levels[1].mclk) - ps->performance_levels[0 ].mclk = ps- >performance_levels[1].mclk; + if (ps->performance_levels[0].mclk < ps-Quoted 1 line
performance_levels[high_level].mclk)
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +1
-0+ ps->performance_levels[0].mclk = ps-Quoted 1 line
performance_levels[high_level].mclk;
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +0
-1}else { - if (ps->performance_levels[1].mclk < ps-Quoted 1 line
performance_levels[0].mclk)
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +0
-1- ps->performance_levels[1].mclk = ps-Quoted 1 line
performance_levels[0].mclk;
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +1
-0+ if (ps->performance_levels[high_level].mclk < ps-Quoted 1 line
performance_levels[0].mclk)
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +1
-0+ ps->performance_levels[high_level].mclk = ps-Quoted 1 line
performance_levels[0].mclk;
}
}
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