mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 07:29:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit d8e4fb9112.

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

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher
2022-06-14 09:57:26 -04:00
parent 914da384ae
commit 4e1db0119c
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View File

@@ -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(