[PATCH] drm/amd/display: refactor CalculateWriteBackDelay to use vba_vars_st ptr
Maíra Canal
mairacanal at riseup.net
Mon Sep 19 22:54:45 UTC 2022
Hi Tom
Nice to see this patch coming to the DML! Some small nits inline.
On 9/17/22 15:37, Tom Rix wrote:
> Mimimize the function signature by passing a pointer and an index instead
> of passing several elements of the pointer.
>
> The dml2x,dml3x families uses the same algorithm. Remove the duplicates.
> Use dml20_ and dml30_ prefix to distinguish the two variants.
>
> Signed-off-by: Tom Rix <trix at redhat.com>
> ---
> .../dc/dml/dcn20/display_mode_vba_20.c | 78 +++---------
> .../dc/dml/dcn20/display_mode_vba_20v2.c | 115 ++----------------
> .../dc/dml/dcn21/display_mode_vba_21.c | 114 +----------------
> .../dc/dml/dcn30/display_mode_vba_30.c | 74 +++--------
> .../dc/dml/dcn31/display_mode_vba_31.c | 76 +-----------
> .../dc/dml/dcn314/display_mode_vba_314.c | 76 +-----------
> .../dc/dml/dcn32/display_mode_vba_32.c | 42 +------
> .../dc/dml/dcn32/display_mode_vba_util_32.c | 30 -----
> .../dc/dml/dcn32/display_mode_vba_util_32.h | 10 +-
> 9 files changed, 63 insertions(+), 552 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
> index d3b5b6fedf04..6e9d7e2b5243 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c
> @@ -217,16 +217,8 @@ static void CalculateFlipSchedule(
> double *DestinationLinesToRequestRowInImmediateFlip,
> double *final_flip_bw,
> bool *ImmediateFlipSupportedForPipe);
> -static double CalculateWriteBackDelay(
> - enum source_format_class WritebackPixelFormat,
> - double WritebackHRatio,
> - double WritebackVRatio,
> - unsigned int WritebackLumaHTaps,
> - unsigned int WritebackLumaVTaps,
> - unsigned int WritebackChromaHTaps,
> - unsigned int WritebackChromaVTaps,
> - unsigned int WritebackDestinationWidth);
>
> +double dlm20_CalculateWriteBackDelay(struct vba_vars_st *vba, unsigned int i);
Small typo here: s/dlm/dml
> static void dml20_DisplayPipeConfiguration(struct display_mode_lib *mode_lib);
> static void dml20_DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerformanceCalculation(
> struct display_mode_lib *mode_lib);
> @@ -1085,6 +1077,7 @@ static unsigned int CalculateVMAndRowBytes(
> static void dml20_DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerformanceCalculation(
> struct display_mode_lib *mode_lib)
> {
> + struct vba_vars_st *v = &mode_lib->vba;
> unsigned int j, k;
>
> mode_lib->vba.WritebackDISPCLK = 0.0;
> @@ -1980,36 +1973,15 @@ static void dml20_DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPer
> if (mode_lib->vba.BlendingAndTiming[k] == k) {
> if (mode_lib->vba.WritebackEnable[k] == true) {
> mode_lib->vba.WritebackDelay[mode_lib->vba.VoltageLevel][k] =
> - mode_lib->vba.WritebackLatency
> - + CalculateWriteBackDelay(
> - mode_lib->vba.WritebackPixelFormat[k],
> - mode_lib->vba.WritebackHRatio[k],
> - mode_lib->vba.WritebackVRatio[k],
> - mode_lib->vba.WritebackLumaHTaps[k],
> - mode_lib->vba.WritebackLumaVTaps[k],
> - mode_lib->vba.WritebackChromaHTaps[k],
> - mode_lib->vba.WritebackChromaVTaps[k],
> - mode_lib->vba.WritebackDestinationWidth[k])
> - / mode_lib->vba.DISPCLK;
> + mode_lib->vba.WritebackLatency + dlm20_CalculateWriteBackDelay(v, k) / mode_lib->vba.DISPCLK;
> } else
> mode_lib->vba.WritebackDelay[mode_lib->vba.VoltageLevel][k] = 0;
> for (j = 0; j < mode_lib->vba.NumberOfActivePlanes; ++j) {
> if (mode_lib->vba.BlendingAndTiming[j] == k
> && mode_lib->vba.WritebackEnable[j] == true) {
> mode_lib->vba.WritebackDelay[mode_lib->vba.VoltageLevel][k] =
> - dml_max(
> - mode_lib->vba.WritebackDelay[mode_lib->vba.VoltageLevel][k],
> - mode_lib->vba.WritebackLatency
> - + CalculateWriteBackDelay(
> - mode_lib->vba.WritebackPixelFormat[j],
> - mode_lib->vba.WritebackHRatio[j],
> - mode_lib->vba.WritebackVRatio[j],
> - mode_lib->vba.WritebackLumaHTaps[j],
> - mode_lib->vba.WritebackLumaVTaps[j],
> - mode_lib->vba.WritebackChromaHTaps[j],
> - mode_lib->vba.WritebackChromaVTaps[j],
> - mode_lib->vba.WritebackDestinationWidth[j])
> - / mode_lib->vba.DISPCLK);
> + dml_max(mode_lib->vba.WritebackDelay[mode_lib->vba.VoltageLevel][k],
> + mode_lib->vba.WritebackLatency + dlm20_CalculateWriteBackDelay(v, j) / mode_lib->vba.DISPCLK);
> }
> }
> }
[...]
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> index ad100658132f..9778effba7a4 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
> @@ -597,15 +597,7 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman
> if (mode_lib->vba.BlendingAndTiming[k] == k) {
> if (mode_lib->vba.WritebackEnable[k] == true) {
> v->WritebackDelay[mode_lib->vba.VoltageLevel][k] = mode_lib->vba.WritebackLatency
> - + dml32_CalculateWriteBackDelay(
> - mode_lib->vba.WritebackPixelFormat[k],
> - mode_lib->vba.WritebackHRatio[k],
> - mode_lib->vba.WritebackVRatio[k],
> - mode_lib->vba.WritebackVTaps[k],
> - mode_lib->vba.WritebackDestinationWidth[k],
> - mode_lib->vba.WritebackDestinationHeight[k],
> - mode_lib->vba.WritebackSourceHeight[k],
> - mode_lib->vba.HTotal[k]) / mode_lib->vba.DISPCLK;
> + + dml30_CalculateWriteBackDelay(v, k, v->HTotal[k]) / mode_lib->vba.DISPCLK;
> } else
> v->WritebackDelay[mode_lib->vba.VoltageLevel][k] = 0;
> for (j = 0; j < mode_lib->vba.NumberOfActiveSurfaces; ++j) {
> @@ -614,15 +606,7 @@ static void DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndPerforman
> v->WritebackDelay[mode_lib->vba.VoltageLevel][k] =
> dml_max(v->WritebackDelay[mode_lib->vba.VoltageLevel][k],
> mode_lib->vba.WritebackLatency +
> - dml32_CalculateWriteBackDelay(
> - mode_lib->vba.WritebackPixelFormat[j],
> - mode_lib->vba.WritebackHRatio[j],
> - mode_lib->vba.WritebackVRatio[j],
> - mode_lib->vba.WritebackVTaps[j],
> - mode_lib->vba.WritebackDestinationWidth[j],
> - mode_lib->vba.WritebackDestinationHeight[j],
> - mode_lib->vba.WritebackSourceHeight[j],
> - mode_lib->vba.HTotal[k]) / mode_lib->vba.DISPCLK);
> + dml30_CalculateWriteBackDelay(v, j, v->HTotal[k]) / mode_lib->vba.DISPCLK);
> }
> }
> }
> @@ -2864,16 +2848,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
> if (mode_lib->vba.WritebackEnable[k] == true) {
> mode_lib->vba.WritebackDelayTime[k] =
> mode_lib->vba.WritebackLatency
> - + dml32_CalculateWriteBackDelay(
> - mode_lib->vba.WritebackPixelFormat[k],
> - mode_lib->vba.WritebackHRatio[k],
> - mode_lib->vba.WritebackVRatio[k],
> - mode_lib->vba.WritebackVTaps[k],
> - mode_lib->vba.WritebackDestinationWidth[k],
> - mode_lib->vba.WritebackDestinationHeight[k],
> - mode_lib->vba.WritebackSourceHeight[k],
> - mode_lib->vba.HTotal[k])
> - / mode_lib->vba.RequiredDISPCLK[i][j];
> + + dml30_CalculateWriteBackDelay(v, k, v->HTotal[k]) / mode_lib->vba.RequiredDISPCLK[i][j];
> } else {
> mode_lib->vba.WritebackDelayTime[k] = 0.0;
> }
> @@ -2883,16 +2858,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
> mode_lib->vba.WritebackDelayTime[k] =
> dml_max(mode_lib->vba.WritebackDelayTime[k],
> mode_lib->vba.WritebackLatency
> - + dml32_CalculateWriteBackDelay(
> - mode_lib->vba.WritebackPixelFormat[m],
> - mode_lib->vba.WritebackHRatio[m],
> - mode_lib->vba.WritebackVRatio[m],
> - mode_lib->vba.WritebackVTaps[m],
> - mode_lib->vba.WritebackDestinationWidth[m],
> - mode_lib->vba.WritebackDestinationHeight[m],
> - mode_lib->vba.WritebackSourceHeight[m],
> - mode_lib->vba.HTotal[m]) /
> - mode_lib->vba.RequiredDISPCLK[i][j]);
> + + dml30_CalculateWriteBackDelay(v, m, v->HTotal[m]) / mode_lib->vba.RequiredDISPCLK[i][j]);
> }
> }
> }
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c
> index 5b5b94f1024d..a08de0dc080f 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c
> @@ -2856,36 +2856,6 @@ void dml32_CalculateDCFCLKDeepSleep(
> #endif
> } // CalculateDCFCLKDeepSleep
>
> -double dml32_CalculateWriteBackDelay(
> - enum source_format_class WritebackPixelFormat,
> - double WritebackHRatio,
> - double WritebackVRatio,
> - unsigned int WritebackVTaps,
> - unsigned int WritebackDestinationWidth,
> - unsigned int WritebackDestinationHeight,
> - unsigned int WritebackSourceHeight,
> - unsigned int HTotal)
> -{
> - double CalculateWriteBackDelay;
> - double Line_length;
> - double Output_lines_last_notclamped;
> - double WritebackVInit;
> -
> - WritebackVInit = (WritebackVRatio + WritebackVTaps + 1) / 2;
> - Line_length = dml_max((double) WritebackDestinationWidth,
> - dml_ceil((double)WritebackDestinationWidth / 6.0, 1.0) * WritebackVTaps);
> - Output_lines_last_notclamped = WritebackDestinationHeight - 1 -
> - dml_ceil(((double)WritebackSourceHeight -
> - (double) WritebackVInit) / (double)WritebackVRatio, 1.0);
The CalculateWriteBackDelay from the DCN30 states:
Output_lines_last_notclamped = WritebackDestinationHeight - 1 -
dml_ceil((WritebackSourceHeight -
WritebackVInit) / WritebackVRatio, 1);
I'm not sure if the behavior on the DCN32 will stay the same without the
casting to double. Maybe AMD engineers will know better, but I would
check if the behavior of the function stays the same. Moreover, on
DCN30, WritebackDestinationWidth, WritebackDestinationHeight, and
WritebackSourceHeight are long, and here they are unsigned int. Again,
I'm not sure how much this can affect the boundary cases, just something
to check.
Best Regards,
- Maíra Canal
> - if (Output_lines_last_notclamped < 0) {
> - CalculateWriteBackDelay = 0;
> - } else {
> - CalculateWriteBackDelay = Output_lines_last_notclamped * Line_length +
> - (HTotal - WritebackDestinationWidth) + 80;
> - }
> - return CalculateWriteBackDelay;
> -}
> -
> void dml32_UseMinimumDCFCLK(
> enum dm_use_mall_for_pstate_change_mode UseMALLForPStateChange[],
> bool DRRDisplay[],
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h
> index 3dbc9cf46aad..017acfe5af2f 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.h
> @@ -571,15 +571,7 @@ void dml32_CalculateDCFCLKDeepSleep(
> /* Output */
> double *DCFClkDeepSleep);
>
> -double dml32_CalculateWriteBackDelay(
> - enum source_format_class WritebackPixelFormat,
> - double WritebackHRatio,
> - double WritebackVRatio,
> - unsigned int WritebackVTaps,
> - unsigned int WritebackDestinationWidth,
> - unsigned int WritebackDestinationHeight,
> - unsigned int WritebackSourceHeight,
> - unsigned int HTotal);
> +double dml30_CalculateWriteBackDelay(struct vba_vars_st *vba, unsigned int i, unsigned int HTotal);
>
> void dml32_UseMinimumDCFCLK(
> enum dm_use_mall_for_pstate_change_mode UseMALLForPStateChange[],
More information about the amd-gfx
mailing list