On 7/18/22 16:02, Alex Deucher wrote:
> On Thu, Jul 14, 2022 at 12:46 PM Maíra Canal <mairacanal@xxxxxxxxxx> wrote:
>>
>> The parameters WritebackPixelFormat and WritebackVRatio are removed as
>> they are not used on the function dml30_CalculateWriteBackDISPCLK.
>
> Maybe this is done for consistency with other dml code for other DCN blocks?
>
> Alex
This is reasonable. Anyway, the functions
dml30_CalculateWriteBackDISPCLK and dml31_CalculateWriteBackDISPCLK are
identical. May I send a v2 from PATCH 11/12 with the original function
signature?
Best Regards,
- Maíra Canal
>
>>
>> Signed-off-by: Maíra Canal <mairacanal@xxxxxxxxxx>
>> ---
>> drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 --
>> .../gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 ------
>> .../gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h | 2 --
>> 3 files changed, 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c
>> index a8db1306750e..746bb93ade6c 100644
>> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c
>> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c
>> @@ -322,10 +322,8 @@ void dcn30_fpu_populate_dml_writeback_from_context(
>> * parameters per pipe
>> */
>> writeback_dispclk = dml30_CalculateWriteBackDISPCLK(
>> - dout_wb.wb_pixel_format,
>> pipes[pipe_cnt].pipe.dest.pixel_rate_mhz,
>> dout_wb.wb_hratio,
>> - dout_wb.wb_vratio,
>> dout_wb.wb_htaps_luma,
>> dout_wb.wb_vtaps_luma,
>> dout_wb.wb_src_width,
>> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
>> index 876b321b30ca..37049daaab4c 100644
>> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
>> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
>> @@ -1938,10 +1938,8 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman
>> if (v->WritebackEnable[k]) {
>> v->WritebackDISPCLK = dml_max(v->WritebackDISPCLK,
>> dml30_CalculateWriteBackDISPCLK(
>> - v->WritebackPixelFormat[k],
>> v->PixelClock[k],
>> v->WritebackHRatio[k],
>> - v->WritebackVRatio[k],
>> v->WritebackHTaps[k],
>> v->WritebackVTaps[k],
>> v->WritebackSourceWidth[k],
>> @@ -3284,10 +3282,8 @@ static double CalculateTWait(
>> }
>>
>> double dml30_CalculateWriteBackDISPCLK(
>> - enum source_format_class WritebackPixelFormat,
>> double PixelClock,
>> double WritebackHRatio,
>> - double WritebackVRatio,
>> unsigned int WritebackHTaps,
>> unsigned int WritebackVTaps,
>> long WritebackSourceWidth,
>> @@ -3794,10 +3790,8 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
>> if (v->WritebackEnable[k] == true) {
>> v->WritebackRequiredDISPCLK = dml_max(v->WritebackRequiredDISPCLK,
>> dml30_CalculateWriteBackDISPCLK(
>> - v->WritebackPixelFormat[k],
>> v->PixelClock[k],
>> v->WritebackHRatio[k],
>> - v->WritebackVRatio[k],
>> v->WritebackHTaps[k],
>> v->WritebackVTaps[k],
>> v->WritebackSourceWidth[k],
>> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h
>> index daaf0883b84d..12c070434eee 100644
>> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h
>> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h
>> @@ -29,10 +29,8 @@
>> void dml30_recalculate(struct display_mode_lib *mode_lib);
>> void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib);
>> double dml30_CalculateWriteBackDISPCLK(
>> - enum source_format_class WritebackPixelFormat,
>> double PixelClock,
>> double WritebackHRatio,
>> - double WritebackVRatio,
>> unsigned int WritebackHTaps,
>> unsigned int WritebackVTaps,
>> long WritebackSourceWidth,
>> --
>> 2.36.1
>>
