Commit e6c258cb authored by Yongqiang Sun's avatar Yongqiang Sun Committed by Alex Deucher

drm/amd/display: Refactor disable front end pipes.

There are different code to disable front end, it is
difficult to debug and adding new process.
This refactor makes all disable front end call the same
functions.
Signed-off-by: default avatarYongqiang Sun <yongqiang.sun@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 46f6b85c
...@@ -1064,6 +1064,9 @@ bool dcn_validate_bandwidth( ...@@ -1064,6 +1064,9 @@ bool dcn_validate_bandwidth(
hsplit_pipe->stream = NULL; hsplit_pipe->stream = NULL;
hsplit_pipe->top_pipe = NULL; hsplit_pipe->top_pipe = NULL;
hsplit_pipe->bottom_pipe = NULL; hsplit_pipe->bottom_pipe = NULL;
/* Clear plane_res and stream_res */
memset(&hsplit_pipe->plane_res, 0, sizeof(hsplit_pipe->plane_res));
memset(&hsplit_pipe->stream_res, 0, sizeof(hsplit_pipe->stream_res));
resource_build_scaling_params(pipe); resource_build_scaling_params(pipe);
} }
/* for now important to do this after pipe split for building e2e params */ /* for now important to do this after pipe split for building e2e params */
......
...@@ -963,9 +963,11 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc) ...@@ -963,9 +963,11 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc)
post_surface_trace(dc); post_surface_trace(dc);
for (i = 0; i < dc->res_pool->pipe_count; i++) for (i = 0; i < dc->res_pool->pipe_count; i++)
if (context->res_ctx.pipe_ctx[i].stream == NULL if (context->res_ctx.pipe_ctx[i].stream == NULL ||
|| context->res_ctx.pipe_ctx[i].plane_state == NULL) context->res_ctx.pipe_ctx[i].plane_state == NULL) {
dc->hwss.power_down_front_end(dc, i); context->res_ctx.pipe_ctx[i].pipe_idx = i;
dc->hwss.power_down_front_end(dc, &context->res_ctx.pipe_ctx[i]);
}
/* 3rd param should be true, temp w/a for RV*/ /* 3rd param should be true, temp w/a for RV*/
#if defined(CONFIG_DRM_AMD_DC_DCN1_0) #if defined(CONFIG_DRM_AMD_DC_DCN1_0)
...@@ -1339,8 +1341,11 @@ static void commit_planes_for_stream(struct dc *dc, ...@@ -1339,8 +1341,11 @@ static void commit_planes_for_stream(struct dc *dc,
if (update_type != UPDATE_TYPE_FULL || !pipe_ctx->plane_state) if (update_type != UPDATE_TYPE_FULL || !pipe_ctx->plane_state)
continue; continue;
if (!pipe_ctx->top_pipe && pipe_ctx->stream) { if (!pipe_ctx->top_pipe &&
struct dc_stream_status *stream_status = stream_get_status(context, pipe_ctx->stream); pipe_ctx->stream &&
pipe_ctx->stream == stream) {
struct dc_stream_status *stream_status =
stream_get_status(context, pipe_ctx->stream);
dc->hwss.apply_ctx_for_surface( dc->hwss.apply_ctx_for_surface(
dc, pipe_ctx->stream, stream_status->plane_count, context); dc, pipe_ctx->stream, stream_status->plane_count, context);
......
...@@ -1464,7 +1464,9 @@ static void disable_vga_and_power_gate_all_controllers( ...@@ -1464,7 +1464,9 @@ static void disable_vga_and_power_gate_all_controllers(
enable_display_pipe_clock_gating(ctx, enable_display_pipe_clock_gating(ctx,
true); true);
dc->hwss.power_down_front_end(dc, i); dc->current_state->res_ctx.pipe_ctx[i].pipe_idx = i;
dc->hwss.power_down_front_end(dc,
&dc->current_state->res_ctx.pipe_ctx[i]);
} }
} }
...@@ -1890,7 +1892,7 @@ static void dce110_reset_hw_ctx_wrap( ...@@ -1890,7 +1892,7 @@ static void dce110_reset_hw_ctx_wrap(
if (old_clk) if (old_clk)
old_clk->funcs->cs_power_down(old_clk); old_clk->funcs->cs_power_down(old_clk);
dc->hwss.power_down_front_end(dc, pipe_ctx_old->pipe_idx); dc->hwss.power_down_front_end(dc, pipe_ctx_old);
pipe_ctx_old->stream = NULL; pipe_ctx_old->stream = NULL;
} }
...@@ -2950,8 +2952,10 @@ static void dce110_apply_ctx_for_surface( ...@@ -2950,8 +2952,10 @@ static void dce110_apply_ctx_for_surface(
} }
} }
static void dce110_power_down_fe(struct dc *dc, int fe_idx) static void dce110_power_down_fe(struct dc *dc, struct pipe_ctx *pipe_ctx)
{ {
int fe_idx = pipe_ctx->pipe_idx;
/* Do not power down fe when stream is active on dce*/ /* Do not power down fe when stream is active on dce*/
if (dc->current_state->res_ctx.pipe_ctx[fe_idx].stream) if (dc->current_state->res_ctx.pipe_ctx[fe_idx].stream)
return; return;
......
...@@ -129,7 +129,7 @@ struct hw_sequencer_funcs { ...@@ -129,7 +129,7 @@ struct hw_sequencer_funcs {
struct dc_bios *dcb, struct dc_bios *dcb,
enum pipe_gating_control power_gating); enum pipe_gating_control power_gating);
void (*power_down_front_end)(struct dc *dc, int fe_idx); void (*power_down_front_end)(struct dc *dc, struct pipe_ctx *pipe_ctx);
void (*power_on_front_end)(struct dc *dc, void (*power_on_front_end)(struct dc *dc,
struct pipe_ctx *pipe, struct pipe_ctx *pipe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment