Commit 4e1db011 authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu/display: Protect some functions with CONFIG_DRM_AMD_DC_DCN" 



This reverts commit d8e4fb91.

This is no longer necessary as newer patches require these functions
without CONFIG_DRM_AMD_DC_DCN.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 914da384

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+0 −4
Original line number Diff line number Diff line
@@ -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(