2023-04-20 18:12:24

by Tom Rix

Subject: [PATCH] drm/amd/display: remove unused variables dispclk_delay_subtotal and dout

clang with W=1 reports
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn314/display_rq_dlg_calc_314.c:1003:15:
error: variable 'dispclk_delay_subtotal' set but not used [-Werror,-Wunused-but-set-variable]
unsigned int dispclk_delay_subtotal;
^
This variable is not used, so remove it.
Which made dout unused, so also remove.

Signed-off-by: Tom Rix <[email protected]>
---
.../display/dc/dml/dcn314/display_rq_dlg_calc_314.c | 10 ----------
1 file changed, 10 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
index ea4eb66066c4..239cb8160c77 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
@@ -951,7 +951,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;
@@ -1000,8 +999,6 @@ static void dml_rq_dlg_get_dlg_params(
unsigned int vupdate_width;
unsigned int vready_offset;

- unsigned int dispclk_delay_subtotal;
-
unsigned int vstartup_start;
unsigned int dst_x_after_scaler;
unsigned int dst_y_after_scaler;
@@ -1127,13 +1124,6 @@ static void dml_rq_dlg_get_dlg_params(
vupdate_offset = dst->vupdate_offset;
vupdate_width = dst->vupdate_width;
vready_offset = dst->vready_offset;
- dispclk_delay_subtotal = mode_lib->ip.dispclk_delay_subtotal;
-
- 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) {
--
2.27.0

2023-04-24 16:06:47

by Hamza Mahfooz

Subject: Re: [PATCH] drm/amd/display: remove unused variables dispclk_delay_subtotal and dout

On 4/20/23 14:07, Tom Rix wrote:
> clang with W=1 reports
> drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn314/display_rq_dlg_calc_314.c:1003:15:
> error: variable 'dispclk_delay_subtotal' set but not used [-Werror,-Wunused-but-set-variable]
> unsigned int dispclk_delay_subtotal;
> ^
> This variable is not used, so remove it.
> Which made dout unused, so also remove.
>
> Signed-off-by: Tom Rix <[email protected]>

Applied, thanks!

> ---
> .../display/dc/dml/dcn314/display_rq_dlg_calc_314.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
> index ea4eb66066c4..239cb8160c77 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.c
> @@ -951,7 +951,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;
> @@ -1000,8 +999,6 @@ static void dml_rq_dlg_get_dlg_params(
> unsigned int vupdate_width;
> unsigned int vready_offset;
>
> - unsigned int dispclk_delay_subtotal;
> -
> unsigned int vstartup_start;
> unsigned int dst_x_after_scaler;
> unsigned int dst_y_after_scaler;
> @@ -1127,13 +1124,6 @@ static void dml_rq_dlg_get_dlg_params(
> vupdate_offset = dst->vupdate_offset;
> vupdate_width = dst->vupdate_width;
> vready_offset = dst->vready_offset;
> - dispclk_delay_subtotal = mode_lib->ip.dispclk_delay_subtotal;
> -
> - 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) {
--
Hamza