On 2022-06-01 22:31, Alex Deucher wrote:
> Protect remove_hpo_dp_link_enc_from_ctx() and release_hpo_dp_link_enc()
> with CONFIG_DRM_AMD_DC_DCN as the functions are only called from code
> that is protected by CONFIG_DRM_AMD_DC_DCN. Fixes build fail with
> -Werror=unused-function.
>
> Fixes: 9b0e0d433f74 ("drm/amd/display: Add dependant changes for DCN32/321")
> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: Aurabindo Pillai <aurabindo.pillai@xxxxxxx>
Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx>
Harry
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index b087452e4590..a098fd0cb240 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -1801,6 +1801,7 @@ static inline void retain_hpo_dp_link_enc(
> res_ctx->hpo_dp_link_enc_ref_cnts[enc_index]++;
> }
>
> +#if defined(CONFIG_DRM_AMD_DC_DCN)
> static inline void release_hpo_dp_link_enc(
> struct resource_context *res_ctx,
> int enc_index)
> @@ -1808,6 +1809,7 @@ static inline void release_hpo_dp_link_enc(
> ASSERT(res_ctx->hpo_dp_link_enc_ref_cnts[enc_index] > 0);
> res_ctx->hpo_dp_link_enc_ref_cnts[enc_index]--;
> }
> +#endif
>
> static bool add_hpo_dp_link_enc_to_ctx(struct resource_context *res_ctx,
> const struct resource_pool *pool,
> @@ -1832,6 +1834,7 @@ static bool add_hpo_dp_link_enc_to_ctx(struct resource_context *res_ctx,
> return pipe_ctx->link_res.hpo_dp_link_enc != NULL;
> }
>
> +#if defined(CONFIG_DRM_AMD_DC_DCN)
> static void remove_hpo_dp_link_enc_from_ctx(struct resource_context *res_ctx,
> struct pipe_ctx *pipe_ctx,
> struct dc_stream_state *stream)
> @@ -1845,6 +1848,7 @@ static void remove_hpo_dp_link_enc_from_ctx(struct resource_context *res_ctx,
> pipe_ctx->link_res.hpo_dp_link_enc = NULL;
> }
> }
> +#endif
>
> /* TODO: release audio object */
> void update_audio_usage(
