lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 14 Jul 2022 13:45:06 -0300 From: Maíra Canal <mairacanal@...eup.net> To: Harry Wentland <harry.wentland@....com>, Leo Li <sunpeng.li@....com>, Rodrigo Siqueira <Rodrigo.Siqueira@....com>, Alex Deucher <alexander.deucher@....com>, christian.koenig@....com, Xinhui.Pan@....com, David Airlie <airlied@...ux.ie>, Daniel Vetter <daniel@...ll.ch>, Nicholas Kazlauskas <nicholas.kazlauskas@....com>, Dmytro Laktyushkin <Dmytro.Laktyushkin@....com>, Aurabindo Pillai <aurabindo.pillai@....com> Cc: amd-gfx@...ts.freedesktop.org, linux-kernel@...r.kernel.org, mwen@...lia.com, andrealmeid@...eup.net, Isabella Basso <isabbasso@...eup.net>, magalilemes00@...il.com, tales.aparecida@...il.com, Maíra Canal <mairacanal@...eup.net> Subject: [PATCH 11/12] drm/amd/display: Remove duplicated CalculateWriteBackDISPCLK The functions dml30_CalculateWriteBackDISPCLK and dml31_CalculateWriteBackDISPCLK are identical. Therefor, to avoid code duplication, dml31_CalculateWriteBackDISPCLK is removed and replaced by dml30_CalculateWriteBackDISPCLK. Signed-off-by: Maíra Canal <mairacanal@...eup.net> --- .../dc/dml/dcn31/display_mode_vba_31.c | 28 ++----------------- .../dc/dml/dcn31/display_mode_vba_31.h | 11 -------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c index 3fab19134480..804e45e22693 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c @@ -2085,11 +2085,9 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman if (v->WritebackEnable[k]) { v->WritebackDISPCLK = dml_max( v->WritebackDISPCLK, - dml31_CalculateWriteBackDISPCLK( - v->WritebackPixelFormat[k], + dml30_CalculateWriteBackDISPCLK( v->PixelClock[k], v->WritebackHRatio[k], - v->WritebackVRatio[k], v->WritebackHTaps[k], v->WritebackVTaps[k], v->WritebackSourceWidth[k], @@ -3470,26 +3468,6 @@ static double CalculateTWait(unsigned int PrefetchMode, double DRAMClockChangeLa } } -double dml31_CalculateWriteBackDISPCLK( - enum source_format_class WritebackPixelFormat, - double PixelClock, - double WritebackHRatio, - double WritebackVRatio, - unsigned int WritebackHTaps, - unsigned int WritebackVTaps, - long WritebackSourceWidth, - long WritebackDestinationWidth, - unsigned int HTotal, - unsigned int WritebackLineBufferSize) -{ - double DISPCLK_H, DISPCLK_V, DISPCLK_HB; - - DISPCLK_H = PixelClock * dml_ceil(WritebackHTaps / 8.0, 1) / WritebackHRatio; - DISPCLK_V = PixelClock * (WritebackVTaps * dml_ceil(WritebackDestinationWidth / 6.0, 1) + 8.0) / HTotal; - DISPCLK_HB = PixelClock * WritebackVTaps * (WritebackDestinationWidth * WritebackVTaps - WritebackLineBufferSize / 57.0) / 6.0 / WritebackSourceWidth; - return dml_max3(DISPCLK_H, DISPCLK_V, DISPCLK_HB); -} - static double CalculateWriteBackDelay( enum source_format_class WritebackPixelFormat, double WritebackHRatio, @@ -4055,11 +4033,9 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l if (v->WritebackEnable[k] == true) { v->WritebackRequiredDISPCLK = dml_max( v->WritebackRequiredDISPCLK, - dml31_CalculateWriteBackDISPCLK( - v->WritebackPixelFormat[k], + dml30_CalculateWriteBackDISPCLK( 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/dcn31/display_mode_vba_31.h b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h index 90be612f26b2..654362adcaa9 100644 --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.h @@ -28,16 +28,5 @@ void dml31_recalculate(struct display_mode_lib *mode_lib); void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib); -double dml31_CalculateWriteBackDISPCLK( - enum source_format_class WritebackPixelFormat, - double PixelClock, - double WritebackHRatio, - double WritebackVRatio, - unsigned int WritebackHTaps, - unsigned int WritebackVTaps, - long WritebackSourceWidth, - long WritebackDestinationWidth, - unsigned int HTotal, - unsigned int WritebackLineBufferSize); #endif /* __DML31_DISPLAY_MODE_VBA_H__ */ -- 2.36.1
Powered by blists - more mailing lists