Applied. Thanks!
Alex
On Thu, Jul 14, 2022 at 12:46 PM Maíra Canal <mairacanal@xxxxxxxxxx> wrote:
>
> Remove the variables dispclk_delay_subtotal and dppclk_delay_subtotal from
> the function dml_rq_dlg_get_dlg_params.
>
> This was pointed by clang with the following warning:
>
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_rq_dlg_calc_31.c:920:15:
> warning: variable 'dispclk_delay_subtotal' set but not used [-Wunused-but-set-variable]
> unsigned int dispclk_delay_subtotal;
> ^
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_rq_dlg_calc_31.c:919:15:
> warning: variable 'dppclk_delay_subtotal' set but not used [-Wunused-but-set-variable]
> unsigned int dppclk_delay_subtotal;
> ^
> 2 warnings generated.
>
> Signed-off-by: Maíra Canal <mairacanal@xxxxxxxxxx>
> ---
> .../dc/dml/dcn31/display_rq_dlg_calc_31.c | 19 -------------------
> 1 file changed, 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c
> index c94cf6e01e25..66b82e4f05c6 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.c
> @@ -866,7 +866,6 @@ static void dml_rq_dlg_get_dlg_params(
> {
> const display_pipe_source_params_st *src = &e2e_pipe_param[pipe_idx].pipe.src;
> const display_pipe_dest_params_st *dst = &e2e_pipe_param[pipe_idx].pipe.dest;
> - const display_output_params_st *dout = &e2e_pipe_param[pipe_idx].dout;
> const display_clocks_and_cfg_st *clks = &e2e_pipe_param[pipe_idx].clks_cfg;
> const scaler_ratio_depth_st *scl = &e2e_pipe_param[pipe_idx].pipe.scale_ratio_depth;
> const scaler_taps_st *taps = &e2e_pipe_param[pipe_idx].pipe.scale_taps;
> @@ -916,9 +915,6 @@ static void dml_rq_dlg_get_dlg_params(
> unsigned int vupdate_width;
> unsigned int vready_offset;
>
> - unsigned int dppclk_delay_subtotal;
> - unsigned int dispclk_delay_subtotal;
> -
> unsigned int vstartup_start;
> unsigned int dst_x_after_scaler;
> unsigned int dst_y_after_scaler;
> @@ -1037,21 +1033,6 @@ static void dml_rq_dlg_get_dlg_params(
> vupdate_width = dst->vupdate_width;
> vready_offset = dst->vready_offset;
>
> - dppclk_delay_subtotal = mode_lib->ip.dppclk_delay_subtotal;
> - dispclk_delay_subtotal = mode_lib->ip.dispclk_delay_subtotal;
> -
> - if (scl_enable)
> - dppclk_delay_subtotal += mode_lib->ip.dppclk_delay_scl;
> - else
> - dppclk_delay_subtotal += mode_lib->ip.dppclk_delay_scl_lb_only;
> -
> - dppclk_delay_subtotal += mode_lib->ip.dppclk_delay_cnvc_formatter + src->num_cursors * mode_lib->ip.dppclk_delay_cnvc_cursor;
> -
> - if (dout->dsc_enable) {
> - double dsc_delay = get_dsc_delay(mode_lib, e2e_pipe_param, num_pipes, pipe_idx); // FROM VBA
> - dispclk_delay_subtotal += dsc_delay;
> - }
> -
> vstartup_start = dst->vstartup_start;
> if (interlaced) {
> if (vstartup_start / 2.0 - (double) (vready_offset + vupdate_width + vupdate_offset) / htotal <= vblank_end / 2.0)
> --
> 2.36.1
>
