[PATCH 2/2] drm/amdgpu/dc: fix DCN3.1 FP handling

[Kazlauskas, Nicholas]

On 2021-06-04 2:16 p.m., Alex Deucher wrote:
> Missing proper DC_FP_START/DC_FP_END.
> 
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>

Thanks for catching these.

Series is Reviewed-by: Nicholas Kazlauskas

Regards,
Nicholas Kazlauskas

> ---
>   .../drm/amd/display/dc/dcn31/dcn31_resource.c  | 18 +++++++++++++++++-
>   1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> index af978d2cb25f..0d6cb6caad81 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
> @@ -1633,7 +1633,7 @@ static void dcn31_update_soc_for_wm_a(struct dc *dc, struct dc_state *context)
>   	}
>   }
>   
> -static void dcn31_calculate_wm_and_dlg(
> +static void dcn31_calculate_wm_and_dlg_fp(
>   		struct dc *dc, struct dc_state *context,
>   		display_e2e_pipe_params_st *pipes,
>   		int pipe_cnt,
> @@ -1759,6 +1759,17 @@ static void dcn31_calculate_wm_and_dlg(
>   	dcn20_calculate_dlg_params(dc, context, pipes, pipe_cnt, vlevel);
>   }
>   
> +static void dcn31_calculate_wm_and_dlg(
> +		struct dc *dc, struct dc_state *context,
> +		display_e2e_pipe_params_st *pipes,
> +		int pipe_cnt,
> +		int vlevel)
> +{
> +	DC_FP_START();
> +	dcn31_calculate_wm_and_dlg_fp(dc, context, pipes, pipe_cnt, vlevel);
> +	DC_FP_END();
> +}
> +
>   static struct dc_cap_funcs cap_funcs = {
>   	.get_dcc_compression_cap = dcn20_get_dcc_compression_cap
>   };
> @@ -1890,6 +1901,8 @@ static bool dcn31_resource_construct(
>   	struct dc_context *ctx = dc->ctx;
>   	struct irq_service_init_data init_data;
>   
> +	DC_FP_START();
> +
>   	ctx->dc_bios->regs = &bios_regs;
>   
>   	pool->base.res_cap = &res_cap_dcn31;
> @@ -2152,10 +2165,13 @@ static bool dcn31_resource_construct(
>   
>   	dc->cap_funcs = cap_funcs;
>   
> +	DC_FP_END();
> +
>   	return true;
>   
>   create_fail:
>   
> +	DC_FP_END();
>   	dcn31_resource_destruct(pool);
>   
>   	return false;
>