[PATCH] drm/amd/display: Protect update_bw_bounding_box FPU code.

[PATCH] drm/amd/display: Protect update_bw_bounding_box FPU code.

[Bas Nieuwenhuizen]

For DCN3/3.01/3.02 at least these use the fpu.

Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---
 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 2 ++
 drivers/gpu/drm/amd/display/dc/core/dc.c                     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
index 589131d415fd..220682e45b8d 100644
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
@@ -474,8 +474,10 @@ static void dcn3_get_memclk_states_from_smu(struct clk_mgr *clk_mgr_base)
 	clk_mgr_base->bw_params->dc_mode_softmax_memclk = dcn30_smu_get_dc_mode_max_dpm_freq(clk_mgr, PPCLK_UCLK);
 
 	/* Refresh bounding box */
+	DC_FP_START();
 	clk_mgr_base->ctx->dc->res_pool->funcs->update_bw_bounding_box(
 			clk_mgr->base.ctx->dc, clk_mgr_base->bw_params);
+	DC_FP_END();
 }
 
 static bool dcn3_is_smu_present(struct clk_mgr *clk_mgr_base)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 467f606ba2c7..e46ec8cc2d0a 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -987,8 +987,11 @@ static bool dc_construct(struct dc *dc,
 	dc->clk_mgr->force_smu_not_present = init_params->force_smu_not_present;
 #endif
 
-	if (dc->res_pool->funcs->update_bw_bounding_box)
+	if (dc->res_pool->funcs->update_bw_bounding_box) {
+		DC_FP_START();
 		dc->res_pool->funcs->update_bw_bounding_box(dc, dc->clk_mgr->bw_params);
+		DC_FP_END();
+	}
 
 	/* Creation of current_state must occur after dc->dml
 	 * is initialized in dc_create_resource_pool because
-- 
2.35.1

Re: [PATCH] drm/amd/display: Protect update_bw_bounding_box FPU code.

[Alex Deucher]

Applied.  Thanks!

Alex

On Sat, Feb 12, 2022 at 10:40 AM Bas Nieuwenhuizen
<bas@basnieuwenhuizen.nl> wrote:
>
> For DCN3/3.01/3.02 at least these use the fpu.
>
> Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
> ---
>  drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 2 ++
>  drivers/gpu/drm/amd/display/dc/core/dc.c                     | 5 ++++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
> index 589131d415fd..220682e45b8d 100644
> --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
> +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c
> @@ -474,8 +474,10 @@ static void dcn3_get_memclk_states_from_smu(struct clk_mgr *clk_mgr_base)
>         clk_mgr_base->bw_params->dc_mode_softmax_memclk = dcn30_smu_get_dc_mode_max_dpm_freq(clk_mgr, PPCLK_UCLK);
>
>         /* Refresh bounding box */
> +       DC_FP_START();
>         clk_mgr_base->ctx->dc->res_pool->funcs->update_bw_bounding_box(
>                         clk_mgr->base.ctx->dc, clk_mgr_base->bw_params);
> +       DC_FP_END();
>  }
>
>  static bool dcn3_is_smu_present(struct clk_mgr *clk_mgr_base)
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
> index 467f606ba2c7..e46ec8cc2d0a 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> @@ -987,8 +987,11 @@ static bool dc_construct(struct dc *dc,
>         dc->clk_mgr->force_smu_not_present = init_params->force_smu_not_present;
>  #endif
>
> -       if (dc->res_pool->funcs->update_bw_bounding_box)
> +       if (dc->res_pool->funcs->update_bw_bounding_box) {
> +               DC_FP_START();
>                 dc->res_pool->funcs->update_bw_bounding_box(dc, dc->clk_mgr->bw_params);
> +               DC_FP_END();
> +       }
>
>         /* Creation of current_state must occur after dc->dml
>          * is initialized in dc_create_resource_pool because
> --
> 2.35.1
>