drm/amd/pp: Set Max clock level to display by default
Subsystems (3)
PATCH 1/2 drm/amd/pp: Set Max clock level to display by default
avoid the error in dmesg:
[drm:dm_pp_get_static_clocks]
*ERROR* DM_PPLIB: invalid powerlevel state: 0!
--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +5 -2
@@ -998,7 +998,7 @@ static int pp_get_display_power_level(void *handle,static int pp_get_current_clocks (void *handle,struct amd_pp_clock_info *clocks) { -struct amd_pp_simple_clock_info simple_clocks; +struct amd_pp_simple_clock_info simple_clocks = {0 };struct pp_clock_info hw_clocks;struct pp_hwmgr *hwmgr = handle;int ret =0 ;
@@ -1034,7 +1034,8 @@ static int pp_get_current_clocks(void *handle, clocks->max_engine_clock_in_sr = hw_clocks.max_eng_clk; clocks->min_engine_clock_in_sr = hw_clocks.min_eng_clk; - clocks->max_clocks_state = simple_clocks.level; +if (simple_clocks.level ==0 ) + clocks->max_clocks_state =PP_DAL_POWERLEVEL_7 ;if (0 ==phm_get_current_shallow_sleep_clocks (hwmgr, &hwmgr->current_ps->hardware, &hw_clocks)) { clocks->max_engine_clock_in_sr = hw_clocks.max_eng_clk;
@@ -1137,6 +1138,8 @@ static int pp_get_display_mode_validation_clocks(void *handle,if (!hwmgr || !hwmgr->pm_en ||!clocks)return -EINVAL ; + clocks->level =PP_DAL_POWERLEVEL_7 ; +mutex_lock (&hwmgr->smu_lock);if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_DynamicPatchPowerState))
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): 1531831010-7456-1-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amd/display: Convert 10kHz clks from PPLib into kHz
Except special naming as *_in_khz, The default clock unit in powerplay is in 10KHz. so need to * 10 as expecting clock frequency in display is in kHz.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2 -2
@@ -469,8 +469,8 @@ bool dm_pp_get_static_clocks(return false; static_clk_info->max_clocks_state =pp_to_dc_powerlevel_state (pp_clk_info.max_clocks_state); - static_clk_info->max_mclk_khz = pp_clk_info.max_memory_clock; - static_clk_info->max_sclk_khz = pp_clk_info.max_engine_clock; + static_clk_info->max_mclk_khz = pp_clk_info.max_memory_clock *10 ; + static_clk_info->max_sclk_khz = pp_clk_info.max_engine_clock *10 ;return true; }
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): 1531831010-7456-2-git-send-email-rex.zhu-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 2/2] drm/amd/display: Convert 10kHz clks from PPLib into kHz
Quoted 5 lines · Rex Zhu
Except special naming as
*_in_khz, The default clock unit in powerplay is in 10KHz. so need to * 10 as expecting clock frequency in display is in kHz.Signed-off-by Rex Zhu <[email protected]>
Series is:
Quoted 22 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2
-3@@ -469,8 +469,8 @@ bool dm_pp_get_static_clocks(return false; static_clk_info->max_clocks_state =pp_to_dc_powerlevel_state (pp_clk_info.max_clocks_state); - static_clk_info->max_mclk_khz = pp_clk_info.max_memory_clock; - static_clk_info->max_sclk_khz = pp_clk_info.max_engine_clock; + static_clk_info->max_mclk_khz = pp_clk_info.max_memory_clock *10 ; + static_clk_info->max_sclk_khz = pp_clk_info.max_engine_clock *10 ;return true; } --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
Harry Wentland
Reviewed-byRe: [PATCH 2/2] drm/amd/display: Convert 10kHz clks from PPLib into kHz
In reply to a message not in the archiveQuoted 5 lines · Rex Zhu
Except special naming as
*_in_khz, The default clock unit in powerplay is in 10KHz. so need to * 10 as expecting clock frequency in display is in kHz.Signed-off-by Rex Zhu <[email protected]>
Harry
Quoted 10 lines
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +0
-0
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c bool dm_pp_get_static_clocks( · line 476
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2
-2@@ -469,8 +469,8 @@ bool dm_pp_get_static_clocks(return false; static_clk_info->max_clocks_state =pp_to_dc_powerlevel_state (pp_clk_info.max_clocks_state); - static_clk_info->max_mclk_khz = pp_clk_info.max_memory_clock; - static_clk_info->max_sclk_khz = pp_clk_info.max_engine_clock; + static_clk_info->max_mclk_khz = pp_clk_info.max_memory_clock *10 ; + static_clk_info->max_sclk_khz = pp_clk_info.max_engine_clock *10 ;return true; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 23 lines · Rex Zhu
avoid the error in dmesg:
[drm:dm_pp_get_static_clocks]
*ERROR*DM_PPLIB: invalid powerlevel state: 0!Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/amd_powerplay.c +1
-1@@ -998,7 +998,7 @@ static int pp_get_display_power_level(void *handle,static int pp_get_current_clocks (void *handle,struct amd_pp_clock_info *clocks) { -struct amd_pp_simple_clock_info simple_clocks; +struct amd_pp_simple_clock_info simple_clocks = {0 };struct pp_clock_info hw_clocks;struct pp_hwmgr *hwmgr = handle;int ret =0 ;
drivers/gpu/drm/amd/powerplay/amd_powerplay.c static int pp_get_current_clocks(void *handle, · line 1038
Quoted 6 lines
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-1@@ -1034,7 +1034,8 @@ static int pp_get_current_clocks(void *handle, clocks->max_engine_clock_in_sr = hw_clocks.max_eng_clk; clocks->min_engine_clock_in_sr = hw_clocks.min_eng_clk; - clocks->max_clocks_state = simple_clocks.level; +if (simple_clocks.level ==0 ) + clocks->max_clocks_state =PP_DAL_POWERLEVEL_7 ;
shouldn't we still assign simple_clocks.level to clocks->max_clocks_state if it's non-zero?
Harry
drivers/gpu/drm/amd/powerplay/amd_powerplay.c static int pp_get_display_mode_validation_clocks(void *handle, · line 1145
Quoted 13 lines
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-0if (0 ==phm_get_current_shallow_sleep_clocks (hwmgr, &hwmgr->current_ps->hardware, &hw_clocks)) { clocks->max_engine_clock_in_sr = hw_clocks.max_eng_clk;@@ -1137,6 +1138,8 @@ static int pp_get_display_mode_validation_clocks(void *handle,if (!hwmgr || !hwmgr->pm_en ||!clocks)return -EINVAL ; + clocks->level =PP_DAL_POWERLEVEL_7 ; +mutex_lock (&hwmgr->smu_lock);if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_DynamicPatchPowerState))
_______________________________________________
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): d8d0a85b-c6ab-270b-ab4f-d802ab4cad8b-5C7GfCeVMHo@public.gmane.org
Quoted 1 line
shouldn't we still assign simple_clocks.level to
clocks->max_clocks_stateif it's non-zero?
Yes, Thanks for your reminding.
Best Regards
Rex
________________________________
From: Wentland, Harry
Sent: Wednesday, July 18, 2018 2:29 AM
To: Zhu, Rex; [email protected]
Subject: Re: [PATCH 1/2] drm/amd/pp: Set Max clock level to display by default
Quoted 23 lines · Rex Zhu
avoid the error in dmesg:
[drm:dm_pp_get_static_clocks]
*ERROR*DM_PPLIB: invalid powerlevel state: 0!Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/amd_powerplay.c +1
-1@@ -998,7 +998,7 @@ static int pp_get_display_power_level(void *handle,static int pp_get_current_clocks (void *handle,struct amd_pp_clock_info *clocks) { -struct amd_pp_simple_clock_info simple_clocks; +struct amd_pp_simple_clock_info simple_clocks = {0 };struct pp_clock_info hw_clocks;struct pp_hwmgr *hwmgr = handle;int ret =0 ;
drivers/gpu/drm/amd/powerplay/amd_powerplay.c static int pp_get_current_clocks(void *handle, · line 1038
Quoted 6 lines
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-1@@ -1034,7 +1034,8 @@ static int pp_get_current_clocks(void *handle, clocks->max_engine_clock_in_sr = hw_clocks.max_eng_clk; clocks->min_engine_clock_in_sr = hw_clocks.min_eng_clk; - clocks->max_clocks_state = simple_clocks.level; +if (simple_clocks.level ==0 ) + clocks->max_clocks_state =PP_DAL_POWERLEVEL_7 ;
shouldn't we still assign simple_clocks.level to clocks->max_clocks_state if it's non-zero?
Harry
drivers/gpu/drm/amd/powerplay/amd_powerplay.c static int pp_get_display_mode_validation_clocks(void *handle, · line 1145
Quoted 13 lines
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +2
-0if (0 ==phm_get_current_shallow_sleep_clocks (hwmgr, &hwmgr->current_ps->hardware, &hw_clocks)) { clocks->max_engine_clock_in_sr = hw_clocks.max_eng_clk;@@ -1137,6 +1138,8 @@ static int pp_get_display_mode_validation_clocks(void *handle,if (!hwmgr || !hwmgr->pm_en ||!clocks)return -EINVAL ; + clocks->level =PP_DAL_POWERLEVEL_7 ; +mutex_lock (&hwmgr->smu_lock);if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_DynamicPatchPowerState))
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx