drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c
Subsystems (3)
PATCH 1/2 drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c
We might get different numbers of clocks from powerplay depending on what the OEM has populated.
--- .../gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +20 -11
@@ -1446,17 +1446,26 @@ void dcn_bw_update_from_pplib(struct dc *dc) res =verify_clock_values (&fclks);if (res) { -ASSERT (fclks.num_levels >=3 ); - dc->dcn_soc->fabric_and_dram_bandwidth_vmin0p65 =32 * (fclks.data[0 ].clocks_in_khz /1000.0 ) /1000.0 ; - dc->dcn_soc->fabric_and_dram_bandwidth_vmid0p72 = dc->dcn_soc->number_of_channels * - (fclks.data[fclks.num_levels - (fclks.num_levels >2 ?3 :2 )].clocks_in_khz /1000.0 ) - * ddr4_dram_factor_single_Channel /1000.0 ; - dc->dcn_soc->fabric_and_dram_bandwidth_vnom0p8 = dc->dcn_soc->number_of_channels * - (fclks.data[fclks.num_levels -2 ].clocks_in_khz /1000.0 ) - * ddr4_dram_factor_single_Channel /1000.0 ; - dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = dc->dcn_soc->number_of_channels * - (fclks.data[fclks.num_levels -1 ].clocks_in_khz /1000.0 ) - * ddr4_dram_factor_single_Channel /1000.0 ; +unsigned vmin0p65_idx =0 ; +unsigned vmid0p72_idx = fclks.num_levels - + (fclks.num_levels >2 ?3 : (fclks.num_levels >1 ?2 :1 )); +unsigned vnom0p8_idx = fclks.num_levels - (fclks.num_levels >1 ?2 :1 ); +unsigned vmax0p9_idx = fclks.num_levels -1 ; + + dc->dcn_soc->fabric_and_dram_bandwidth_vmin0p65 = +32 * (fclks.data[vmin0p65_idx].clocks_in_khz /1000.0 ) /1000.0 ; + dc->dcn_soc->fabric_and_dram_bandwidth_vmid0p72 = + dc->dcn_soc->number_of_channels * + (fclks.data[vmid0p72_idx].clocks_in_khz /1000.0 ) + * ddr4_dram_factor_single_Channel /1000.0 ; + dc->dcn_soc->fabric_and_dram_bandwidth_vnom0p8 = + dc->dcn_soc->number_of_channels * + (fclks.data[vnom0p8_idx].clocks_in_khz /1000.0 ) + * ddr4_dram_factor_single_Channel /1000.0 ; + dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = + dc->dcn_soc->number_of_channels * + (fclks.data[vmax0p9_idx].clocks_in_khz /1000.0 ) + * ddr4_dram_factor_single_Channel /1000.0 ; }else BREAK_TO_DEBUGGER ();
Signature · 6 lines
2.24.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency
Only send non-0 clocks to DC for validation. This mirrors what the windows driver does.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +9 -6
@@ -1026,12 +1026,15 @@ static int smu10_get_clock_by_type_with_latency(struct pp_hwmgr *hwmgr, clocks->num_levels =0 ;for (i =0 ; i < pclk_vol_table->count; i++) { - clocks->data[i].clocks_in_khz = pclk_vol_table->entries[i].clk *10 ; - clocks->data[i].latency_in_us = latency_required ? -smu10_get_mem_latency (hwmgr, - pclk_vol_table->entries[i].clk) : -0 ; - clocks->num_levels++; +if (pclk_vol_table->entries[i].clk) { + clocks->data[clocks->num_levels].clocks_in_khz = + pclk_vol_table->entries[i].clk *10 ; + clocks->data[clocks->num_levels].latency_in_us = latency_required ? +smu10_get_mem_latency (hwmgr, + pclk_vol_table->entries[i].clk) : +0 ; + clocks->num_levels++; + } }return 0 ;
Signature · 6 lines
2.24.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency
Ping?
Quoted 37 lines · Alex Deucher
Only send non-0 clocks to DC for validation. This mirrors what the windows driver does.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +9
-7@@ -1026,12 +1026,15 @@ static int smu10_get_clock_by_type_with_latency(struct pp_hwmgr *hwmgr, clocks->num_levels =0 ;for (i =0 ; i < pclk_vol_table->count; i++) { - clocks->data[i].clocks_in_khz = pclk_vol_table->entries[i].clk *10 ; - clocks->data[i].latency_in_us = latency_required ? -smu10_get_mem_latency (hwmgr, - pclk_vol_table->entries[i].clk) : -0 ; - clocks->num_levels++; +if (pclk_vol_table->entries[i].clk) { + clocks->data[clocks->num_levels].clocks_in_khz = + pclk_vol_table->entries[i].clk *10 ; + clocks->data[clocks->num_levels].latency_in_us = latency_required ? +smu10_get_mem_latency (hwmgr, + pclk_vol_table->entries[i].clk) : +0 ; + clocks->num_levels++; + } }return 0 ; --
Quoted 2 lines
2.24.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency
In reply to Alex Deucher-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, January 29, 2020 3:47 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency
Only send non-0 clocks to DC for validation. This mirrors what the windows driver does.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +9 -6
@@ -1026,12 +1026,15 @@ static int smu10_get_clock_by_type_with_latency(struct pp_hwmgr *hwmgr, clocks->num_levels =0 ;for (i =0 ; i < pclk_vol_table->count; i++) { - clocks->data[i].clocks_in_khz = pclk_vol_table->entries[i].clk *10 ; - clocks->data[i].latency_in_us = latency_required ? -smu10_get_mem_latency (hwmgr, - pclk_vol_table->entries[i].clk) : -0 ; - clocks->num_levels++; +if (pclk_vol_table->entries[i].clk) { + clocks->data[clocks->num_levels].clocks_in_khz = + pclk_vol_table->entries[i].clk *10 ; + clocks->data[clocks->num_levels].latency_in_us = latency_required ? +smu10_get_mem_latency (hwmgr, + pclk_vol_table->entries[i].clk) : +0 ; + clocks->num_levels++; + } }return 0 ;
--
2.24.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cevan.quan%40amd.com%7C201c9325bf144200f84208d7a42ae179%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637158377025674893&sdata=JpmMpRxri5d8oNC8YeMG2SVtJjBucL8H4gmrNDYpVi0%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 23 lines · Alex Deucher
We might get different numbers of clocks from powerplay depending on what the OEM has populated.
--- .../gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +0
-6@@ -1446,17 +1446,26 @@ void dcn_bw_update_from_pplib(struct dc *dc) res =verify_clock_values (&fclks);if (res) { -ASSERT (fclks.num_levels >=3 ); - dc->dcn_soc->fabric_and_dram_bandwidth_vmin0p65 =32 * (fclks.data[0 ].clocks_in_khz /1000.0 ) /1000.0 ; - dc->dcn_soc->fabric_and_dram_bandwidth_vmid0p72 = dc->dcn_soc->number_of_channels * - (fclks.data[fclks.num_levels - (fclks.num_levels >2 ?3 :2 )].clocks_in_khz /1000.0 ) - * ddr4_dram_factor_single_Channel /1000.0 ; - dc->dcn_soc->fabric_and_dram_bandwidth_vnom0p8 = dc->dcn_soc->number_of_channels *
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c void dcn_bw_update_from_pplib(struct dc *dc) · line 1453
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +5
-5- (fclks.data[fclks.num_levels -2 ].clocks_in_khz /1000.0 ) - * ddr4_dram_factor_single_Channel /1000.0 ; - dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = dc->dcn_soc->number_of_channels * - (fclks.data[fclks.num_levels -1 ].clocks_in_khz /1000.0 ) - * ddr4_dram_factor_single_Channel /1000.0 ; +unsigned vmin0p65_idx =0 ; +unsigned vmid0p72_idx = fclks.num_levels - + (fclks.num_levels >2 ?3 : (fclks.num_levels >1 ?2 :1 )); +unsigned vnom0p8_idx = fclks.num_levels - (fclks.num_levels >1 ?2 :1 ); +unsigned vmax0p9_idx = fclks.num_levels -1 ;
Might want an assertion for fclks.num_levels > 0 still, since that's what the function is expecting now.
With that change, this is:
Quoted 9 lines
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +8
-0+ + dc->dcn_soc->fabric_and_dram_bandwidth_vmin0p65 = +32 * (fclks.data[vmin0p65_idx].clocks_in_khz /1000.0 ) /1000.0 ; + dc->dcn_soc->fabric_and_dram_bandwidth_vmid0p72 = + dc->dcn_soc->number_of_channels * + (fclks.data[vmid0p72_idx].clocks_in_khz /1000.0 ) + * ddr4_dram_factor_single_Channel /1000.0 ; + dc->dcn_soc->fabric_and_dram_bandwidth_vnom0p8 =
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c void dcn_bw_update_from_pplib(struct dc *dc) · line 1471
Quoted 10 lines
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +7
-0+ dc->dcn_soc->number_of_channels * + (fclks.data[vnom0p8_idx].clocks_in_khz /1000.0 ) + * ddr4_dram_factor_single_Channel /1000.0 ; + dc->dcn_soc->fabric_and_dram_bandwidth_vmax0p9 = + dc->dcn_soc->number_of_channels * + (fclks.data[vmax0p9_idx].clocks_in_khz /1000.0 ) + * ddr4_dram_factor_single_Channel /1000.0 ; }else BREAK_TO_DEBUGGER ();
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx