[PATCH v2 3/4] drm/amd/display: Remove parameters from rq_dlg_get_dlg_reg
Rodrigo Siqueira Jordao
Rodrigo.Siqueira at amd.com
Fri Jul 22 20:11:48 UTC 2022
Hi Maira,
First of all, thanks a lot for this patch. This change is really helpful
for reducing the stack size. I just have few comments inline.
On 2022-07-21 14:36, Maíra Canal wrote:
> Across all DCN's (except DCN32, that has a separate
> rq_dlg_get_dlg_reg), the parameters const bool vm_en, const bool
> ignore_viewport_pos, and const bool immediate_flip_support are not used
> on the function. Therefore, change the rq_dlg_get_dlg_reg signature
> by deleting those parameters.
>
> Signed-off-by: Maíra Canal <mairacanal at riseup.net>
> ---
> v1 -> v2:
> - Replace "enum" to "enum entries" (André Almeida).
> ---
> .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 3 +--
> .../dc/dml/dcn20/display_rq_dlg_calc_20.c | 5 +----
> .../dc/dml/dcn20/display_rq_dlg_calc_20.h | 5 +----
> .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 5 +----
> .../dc/dml/dcn20/display_rq_dlg_calc_20v2.h | 5 +----
> .../dc/dml/dcn21/display_rq_dlg_calc_21.c | 5 +----
> .../dc/dml/dcn21/display_rq_dlg_calc_21.h | 5 +----
> .../dc/dml/dcn30/display_rq_dlg_calc_30.c | 18 +++---------------
> .../dc/dml/dcn30/display_rq_dlg_calc_30.h | 5 +----
> .../dc/dml/dcn31/display_rq_dlg_calc_31.c | 19 +++----------------
> .../dc/dml/dcn31/display_rq_dlg_calc_31.h | 5 +----
> .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 15 ++-------------
> .../dc/dml/dcn314/display_rq_dlg_calc_314.h | 5 +----
> .../drm/amd/display/dc/dml/display_mode_lib.h | 5 +----
> .../gpu/drm/amd/display/dc/dml/dml_wrapper.c | 3 +--
> 15 files changed, 20 insertions(+), 88 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
> index dc60b835e938..d9cfb29a2651 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c
> @@ -857,8 +857,7 @@ void dcn20_calculate_dlg_params(
> pipe_cnt,
> pipe_idx,
> cstate_en,
> - context->bw_ctx.bw.dcn.clk.p_state_change_support,
> - false, false, true);
> + context->bw_ctx.bw.dcn.clk.p_state_change_support);
>
> context->bw_ctx.dml.funcs.rq_dlg_get_rq_reg(&context->bw_ctx.dml,
> &context->res_ctx.pipe_ctx[i].rq_regs,
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
> index 548cdef8a8ad..d0a4c69b47c8 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
> @@ -1553,10 +1553,7 @@ void dml20_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool pstate_en)
> {
> display_rq_params_st rq_param = {0};
> display_dlg_sys_params_st dlg_sys_param = {0};
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h
> index 8b23867e97c1..36c3692e53b8 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.h
> @@ -65,9 +65,6 @@ void dml20_rq_dlg_get_dlg_reg(
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support);
> + const bool pstate_en);
>
> #endif
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
> index 0fc9f3e3ffae..17df9d31c11f 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
> @@ -1554,10 +1554,7 @@ void dml20v2_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool pstate_en)
> {
> display_rq_params_st rq_param = {0};
> display_dlg_sys_params_st dlg_sys_param = {0};
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h
> index 2b4e46ea1c3d..f524f1ccfe41 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.h
> @@ -65,9 +65,6 @@ void dml20v2_rq_dlg_get_dlg_reg(
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support);
> + const bool pstate_en);
>
> #endif
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
> index 618f4b682ab1..502dafc6dd79 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.c
> @@ -1662,10 +1662,7 @@ void dml21_rq_dlg_get_dlg_reg(
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool pstate_en)
> {
> display_rq_params_st rq_param = {0};
> display_dlg_sys_params_st dlg_sys_param = {0};
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h
> index af6ad0ca9cf8..822c68089ca8 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn21/display_rq_dlg_calc_21.h
> @@ -65,9 +65,6 @@ void dml21_rq_dlg_get_dlg_reg(
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support);
> + const bool pstate_en);
>
> #endif
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
> index 8179be1f34bb..b3bdb7283a7e 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c
> @@ -898,10 +898,7 @@ static void dml_rq_dlg_get_dlg_params(struct display_mode_lib *mode_lib,
> const display_rq_dlg_params_st rq_dlg_param,
> const display_dlg_sys_params_st dlg_sys_param,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool pstate_en)
> {
> 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;
> @@ -1031,9 +1028,6 @@ static void dml_rq_dlg_get_dlg_params(struct display_mode_lib *mode_lib,
>
> dml_print("DML_DLG: %s: cstate_en = %d\n", __func__, cstate_en);
> dml_print("DML_DLG: %s: pstate_en = %d\n", __func__, pstate_en);
> - dml_print("DML_DLG: %s: vm_en = %d\n", __func__, vm_en);
> - dml_print("DML_DLG: %s: ignore_viewport_pos = %d\n", __func__, ignore_viewport_pos);
> - dml_print("DML_DLG: %s: immediate_flip_support = %d\n", __func__, immediate_flip_support);
>
> dml_print("DML_DLG: %s: dppclk_freq_in_mhz = %3.2f\n", __func__, dppclk_freq_in_mhz);
> dml_print("DML_DLG: %s: dispclk_freq_in_mhz = %3.2f\n", __func__, dispclk_freq_in_mhz);
> @@ -1746,10 +1740,7 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool pstate_en)
> {
> display_rq_params_st rq_param = { 0 };
> display_dlg_sys_params_st dlg_sys_param = { 0 };
> @@ -1785,10 +1776,7 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
> rq_param.dlg,
> dlg_sys_param,
> cstate_en,
> - pstate_en,
> - vm_en,
> - ignore_viewport_pos,
> - immediate_flip_support);
> + pstate_en);
> dml_print("DML_DLG: Calculation for pipe[%d] end\n", pipe_idx);
> }
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h
> index 625e41f8d575..d28ed3ae3f94 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h
> @@ -61,9 +61,6 @@ void dml30_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support);
> + const bool pstate_en);
>
> #endif
> 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 66b82e4f05c6..c36dd3a79871 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
> @@ -859,10 +859,7 @@ static void dml_rq_dlg_get_dlg_params(
> const display_rq_dlg_params_st *rq_dlg_param,
> const display_dlg_sys_params_st *dlg_sys_param,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool pstate_en)
> {
> 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;
> @@ -970,9 +967,6 @@ static void dml_rq_dlg_get_dlg_params(
>
> dml_print("DML_DLG: %s: cstate_en = %d\n", __func__, cstate_en);
> dml_print("DML_DLG: %s: pstate_en = %d\n", __func__, pstate_en);
> - dml_print("DML_DLG: %s: vm_en = %d\n", __func__, vm_en);
> - dml_print("DML_DLG: %s: ignore_viewport_pos = %d\n", __func__, ignore_viewport_pos);
> - dml_print("DML_DLG: %s: immediate_flip_support = %d\n", __func__, immediate_flip_support);
>
> dml_print("DML_DLG: %s: dppclk_freq_in_mhz = %3.2f\n", __func__, dppclk_freq_in_mhz);
> dml_print("DML_DLG: %s: refclk_freq_in_mhz = %3.2f\n", __func__, refclk_freq_in_mhz);
> @@ -983,7 +977,6 @@ static void dml_rq_dlg_get_dlg_params(
> disp_dlg_regs->refcyc_per_htotal = (unsigned int) (ref_freq_to_pix_freq * (double) htotal * dml_pow(2, 8));
> disp_dlg_regs->dlg_vblank_end = interlaced ? (vblank_end / 2) : vblank_end; // 15 bits
>
> - //set_prefetch_mode(mode_lib, cstate_en, pstate_en, ignore_viewport_pos, immediate_flip_support);
> min_ttu_vblank = get_min_ttu_vblank_in_us(mode_lib, e2e_pipe_param, num_pipes, pipe_idx); // From VBA
>
> dlg_vblank_start = interlaced ? (vblank_start / 2) : vblank_start;
> @@ -1576,10 +1569,7 @@ void dml31_rq_dlg_get_dlg_reg(
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool pstate_en)
> {
> display_rq_params_st rq_param = {0};
> display_dlg_sys_params_st dlg_sys_param = {0};
> @@ -1610,10 +1600,7 @@ void dml31_rq_dlg_get_dlg_reg(
> &rq_param.dlg,
> &dlg_sys_param,
> cstate_en,
> - pstate_en,
> - vm_en,
> - ignore_viewport_pos,
> - immediate_flip_support);
> + pstate_en);
> dml_print("DML_DLG: Calculation for pipe[%d] end\n", pipe_idx);
> }
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h
> index 8ee991351699..5b0b438a9804 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_rq_dlg_calc_31.h
> @@ -61,9 +61,6 @@ void dml31_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support);
> + const bool pstate_en);
>
> #endif
> 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 61ee9ba063a7..37ecc4a6ae11 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
> @@ -943,11 +943,7 @@ static void dml_rq_dlg_get_dlg_params(
> display_ttu_regs_st *disp_ttu_regs,
> const display_rq_dlg_params_st *rq_dlg_param,
> const display_dlg_sys_params_st *dlg_sys_param,
> - const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support)
> + const bool cstate_en)
> {
> 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;
> @@ -1060,9 +1056,6 @@ static void dml_rq_dlg_get_dlg_params(
>
> dml_print("DML_DLG: %s: cstate_en = %d\n", __func__, cstate_en);
> dml_print("DML_DLG: %s: pstate_en = %d\n", __func__, pstate_en);
hmmm... I'm not sure if I missed something, but you dropped the variable
pstate_en from the parameter list, but you still have it here. Is this
correct?
> - dml_print("DML_DLG: %s: vm_en = %d\n", __func__, vm_en);
> - dml_print("DML_DLG: %s: ignore_viewport_pos = %d\n", __func__, ignore_viewport_pos);
> - dml_print("DML_DLG: %s: immediate_flip_support = %d\n", __func__, immediate_flip_support);
Why are we dropping these logs? It is already hard to debug DML code,
and reducing the amount of information that we can get does not sound
good to me.
Thanks
Siqueira
>
> dml_print("DML_DLG: %s: dppclk_freq_in_mhz = %3.2f\n", __func__, dppclk_freq_in_mhz);
> dml_print("DML_DLG: %s: refclk_freq_in_mhz = %3.2f\n", __func__, refclk_freq_in_mhz);
> @@ -1073,7 +1066,6 @@ static void dml_rq_dlg_get_dlg_params(
> disp_dlg_regs->refcyc_per_htotal = (unsigned int) (ref_freq_to_pix_freq * (double) htotal * dml_pow(2, 8));
> disp_dlg_regs->dlg_vblank_end = interlaced ? (vblank_end / 2) : vblank_end; // 15 bits
>
> - //set_prefetch_mode(mode_lib, cstate_en, pstate_en, ignore_viewport_pos, immediate_flip_support);
> min_ttu_vblank = get_min_ttu_vblank_in_us(mode_lib, e2e_pipe_param, num_pipes, pipe_idx); // From VBA
>
> dlg_vblank_start = interlaced ? (vblank_start / 2) : vblank_start;
> @@ -1725,9 +1717,6 @@ void dml314_rq_dlg_get_dlg_reg(
> &rq_param.dlg,
> &dlg_sys_param,
> cstate_en,
> - pstate_en,
> - vm_en,
> - ignore_viewport_pos,
> - immediate_flip_support);
> + pstate_en);
> dml_print("DML_DLG: Calculation for pipe[%d] end\n", pipe_idx);
> }
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h
> index 49cb85d1056c..d2c1ba8b7ebf 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_rq_dlg_calc_314.h
> @@ -62,9 +62,6 @@ void dml314_rq_dlg_get_dlg_reg(struct display_mode_lib *mode_lib,
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support);
> + const bool pstate_en);
>
> #endif
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
> index 2bdd6ed22611..8a4b60a278b5 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
> +++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h
> @@ -55,10 +55,7 @@ struct dml_funcs {
> const unsigned int num_pipes,
> const unsigned int pipe_idx,
> const bool cstate_en,
> - const bool pstate_en,
> - const bool vm_en,
> - const bool ignore_viewport_pos,
> - const bool immediate_flip_support);
> + const bool pstate_en);
> void (*rq_dlg_get_rq_reg)(
> struct display_mode_lib *mode_lib,
> display_rq_regs_st *rq_regs,
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c b/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c
> index b4b51e51fc25..e39e2363ea0a 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dml_wrapper.c
> @@ -1647,8 +1647,7 @@ static void dml_calculate_dlg_params(
> pipe_cnt,
> pipe_idx,
> cstate_en,
> - context->bw_ctx.bw.dcn.clk.p_state_change_support,
> - false, false, true);
> + context->bw_ctx.bw.dcn.clk.p_state_change_support);
>
> context->bw_ctx.dml.funcs.rq_dlg_get_rq_reg(&context->bw_ctx.dml,
> &context->res_ctx.pipe_ctx[i].rq_regs,
More information about the amd-gfx
mailing list