This reverts commit b109b14682230f06f70a35a0f1ee36a7d43840e2. This is no longer necessary as newer patches require these functions without CONFIG_DRM_AMD_DC_DCN. Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ---- 1 file changed, 4 deletions(-) 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 b7dc65800b1e..28803ca9e3f2 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1801,7 +1801,6 @@ 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) @@ -1809,7 +1808,6 @@ 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, @@ -1834,7 +1832,6 @@ 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) @@ -1848,7 +1845,6 @@ 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( -- 2.35.3
