diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2022-06-14 09:57:26 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2022-06-14 21:38:41 -0400 |
| commit | 4e1db0119c64fd81509005a961790d263e99b21b (patch) | |
| tree | 5c09bf8e010f859ce5676ba69c7282e9e2b33f59 | |
| parent | 914da384ae9a77079314f07022c18063c7e77778 (diff) | |
| download | linux-4e1db0119c64fd81509005a961790d263e99b21b.tar.bz2 | |
Revert "drm/amdgpu/display: Protect some functions with CONFIG_DRM_AMD_DC_DCN"
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>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 |
1 files changed, 0 insertions, 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 463ff12adbc8..31f0262fc930 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( |