summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
diff options
context:
space:
mode:
authorAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>2017-08-28 14:25:01 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 18:17:16 -0400
commitab8db3e1653c50ae19d1c31d82f94beb5115aeef (patch)
treed4353036c7643ca78ac16d45be51026852eeba7e /drivers/gpu/drm/amd/display/dc/core/dc_resource.c
parentceda4e980058316531a1a6b72797d9068ddacd02 (diff)
drm/amd/display: Move dis_clk into dc_state.
dis_clk is single instance across pipes. Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com> Reviewed-by: Harry Wentland <Harry.Wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/core/dc_resource.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc_resource.c10
1 files changed, 8 insertions, 2 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 a4e92219a594..c7bb966e8b29 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1033,7 +1033,6 @@ static int acquire_first_split_pipe(
pipe_ctx->plane_res.ipp = pool->ipps[i];
pipe_ctx->plane_res.xfm = pool->transforms[i];
pipe_ctx->stream_res.opp = pool->opps[i];
- pipe_ctx->dis_clk = pool->display_clock;
pipe_ctx->pipe_idx = i;
pipe_ctx->stream = stream;
@@ -1368,7 +1367,6 @@ static int acquire_first_free_pipe(
pipe_ctx->plane_res.ipp = pool->ipps[i];
pipe_ctx->plane_res.xfm = pool->transforms[i];
pipe_ctx->stream_res.opp = pool->opps[i];
- pipe_ctx->dis_clk = pool->display_clock;
pipe_ctx->pipe_idx = i;
@@ -1714,6 +1712,14 @@ void dc_resource_state_copy_construct_current(
dc_resource_state_copy_construct(dc->current_state, dst_ctx);
}
+
+void dc_resource_state_construct(
+ const struct dc *dc,
+ struct dc_state *dst_ctx)
+{
+ dst_ctx->dis_clk = dc->res_pool->display_clock;
+}
+
bool dc_validate_global_state(
struct dc *dc,
struct dc_state *new_ctx)