From d1da955690c0e1311d2d250bbcc659bcbfba0fef Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Tue, 14 Jun 2022 09:57:26 -0400
Subject: Revert "drm/amdgpu/display: Protect some functions with
CONFIG_DRM_AMD_DC_DCN"
Git-commit: 4e1db0119c64fd81509005a961790d263e99b21b
Patch-mainline: v6.0-rc1
References: jsc#PED-1166 jsc#PED-1168 jsc#PED-1170 jsc#PED-1218 jsc#PED-1220 jsc#PED-1222 jsc#PED-1223 jsc#PED-1225 jsc#PED-2849
This reverts commit d8e4fb9112e88d8d87ffbc38fa511e7118042d4f.
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>
Acked-by: Patrik Jakobsson <pjakobsson@suse.de>
---
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 793a60d01d4f..e60ce66d1298 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1802,7 +1802,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)
@@ -1810,7 +1809,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,
@@ -1835,7 +1833,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)
@@ -1849,7 +1846,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.38.1