Revert "drm/amd/display: attempt to fix the logic in commit_planes_for_stream()"
Subsystems (3)
Alex Deucher
maintainerPATCH 1/2 Revert "drm/amd/display: attempt to fix the logic in commit_planes_for_stream()"
This reverts commit a0d10c437c1c9859d24a16b90abf85120603b4ff.
This caused a regression in the DC team testing.
Signed-off-by Alex Deucher <[email protected]>
Cc Alvin Lee <[email protected]>
Cc Martin Leung <[email protected]>
Cc Harry Wentland <[email protected]>
Cc Rodrigo Siqueira <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 45 +++++++++++------------- 1 file changed, 21 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +21 -24
@@ -3229,7 +3229,7 @@ static void commit_planes_for_stream(struct dc *dc, odm_pipe->ttu_regs.min_ttu_vblank =MAX_TTU ; } -if ((update_type !=UPDATE_TYPE_FAST ) && stream->update_flags.bits.dsc_changed) { +if ((update_type !=UPDATE_TYPE_FAST ) && stream->update_flags.bits.dsc_changed)if (top_pipe_to_program && top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) {if (should_use_dmub_lock (stream->link)) {
@@ -3247,7 +3247,6 @@ static void commit_planes_for_stream(struct dc *dc, top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable ( top_pipe_to_program->stream_res.tg); } - }if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) {if (dc->hwss.subvp_pipe_control_lock)
@@ -3456,27 +3455,27 @@ static void commit_planes_for_stream(struct dc *dc, } -if (update_type !=UPDATE_TYPE_FAST ) -if (dc->hwss.commit_subvp_config) - dc->hwss.commit_subvp_config (dc, context); +if (update_type !=UPDATE_TYPE_FAST ) +if (dc->hwss.commit_subvp_config) + dc->hwss.commit_subvp_config (dc, context); -if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) { - dc->hwss.interdependent_update_lock (dc, context, false); - }else { - dc->hwss.pipe_control_lock (dc, top_pipe_to_program, false); - } +if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) { + dc->hwss.interdependent_update_lock (dc, context, false); + }else { + dc->hwss.pipe_control_lock (dc, top_pipe_to_program, false); + } -if ((update_type !=UPDATE_TYPE_FAST ) && stream->update_flags.bits.dsc_changed) { -if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) { - top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( - top_pipe_to_program->stream_res.tg, -CRTC_STATE_VACTIVE ); - top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( - top_pipe_to_program->stream_res.tg, -CRTC_STATE_VBLANK ); - top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( - top_pipe_to_program->stream_res.tg, -CRTC_STATE_VACTIVE ); +if ((update_type !=UPDATE_TYPE_FAST ) && stream->update_flags.bits.dsc_changed) +if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) { + top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( + top_pipe_to_program->stream_res.tg, +CRTC_STATE_VACTIVE ); + top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( + top_pipe_to_program->stream_res.tg, +CRTC_STATE_VBLANK ); + top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( + top_pipe_to_program->stream_res.tg, +CRTC_STATE_VACTIVE );if (should_use_dmub_lock (stream->link)) {union dmub_hw_lock_flags hw_locks = {0 };
@@ -3493,9 +3492,8 @@ static void commit_planes_for_stream(struct dc *dc, top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_disable ( top_pipe_to_program->stream_res.tg); } - } -if (update_type !=UPDATE_TYPE_FAST ) { +if (update_type !=UPDATE_TYPE_FAST ) dc->hwss.post_unlock_program_front_end (dc, context);/* Since phantom pipe programming is moved to post_unlock_program_front_end,
@@ -3508,7 +3506,6 @@ static void commit_planes_for_stream(struct dc *dc,if (dc->hwss.subvp_pipe_control_lock) dc->hwss.subvp_pipe_control_lock (dc, context, false, should_lock_all_pipes, top_pipe_to_program, subvp_prev_use); } - }// Fire manual trigger only when bottom plane is flipped for (j =0 ; j < dc->res_pool->pipe_count; j++) {
Signature · 1 line
2.35.3
Alex Deucher
maintainerPATCH 2/2 drm/amd/display: Fix indentation in commit_planes_for_stream()
No functional change. Just update whitespace.
Signed-off-by Alex Deucher <[email protected]>
Cc Alvin Lee <[email protected]>
Cc Martin Leung <[email protected]>
Cc Harry Wentland <[email protected]>
Cc Rodrigo Siqueira <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +31 -31
@@ -3365,8 +3365,8 @@ static void commit_planes_for_stream(struct dc *dc,struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];if (!pipe_ctx->top_pipe && - !pipe_ctx->prev_odm_pipe && -should_update_pipe_for_stream (context, pipe_ctx, stream)) { + !pipe_ctx->prev_odm_pipe && +should_update_pipe_for_stream (context, pipe_ctx, stream)) {struct dc_stream_status *stream_status =NULL ;if (!pipe_ctx->plane_state)
@@ -3455,27 +3455,27 @@ static void commit_planes_for_stream(struct dc *dc, } -if (update_type !=UPDATE_TYPE_FAST ) -if (dc->hwss.commit_subvp_config) - dc->hwss.commit_subvp_config (dc, context); +if (update_type !=UPDATE_TYPE_FAST ) +if (dc->hwss.commit_subvp_config) + dc->hwss.commit_subvp_config (dc, context); -if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) { - dc->hwss.interdependent_update_lock (dc, context, false); - }else { - dc->hwss.pipe_control_lock (dc, top_pipe_to_program, false); - } +if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) { + dc->hwss.interdependent_update_lock (dc, context, false); + }else { + dc->hwss.pipe_control_lock (dc, top_pipe_to_program, false); + } -if ((update_type !=UPDATE_TYPE_FAST ) && stream->update_flags.bits.dsc_changed) -if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) { - top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( - top_pipe_to_program->stream_res.tg, -CRTC_STATE_VACTIVE ); - top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( - top_pipe_to_program->stream_res.tg, -CRTC_STATE_VBLANK ); - top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( - top_pipe_to_program->stream_res.tg, -CRTC_STATE_VACTIVE ); +if ((update_type !=UPDATE_TYPE_FAST ) && stream->update_flags.bits.dsc_changed) +if (top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_enable) { + top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( + top_pipe_to_program->stream_res.tg, +CRTC_STATE_VACTIVE ); + top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( + top_pipe_to_program->stream_res.tg, +CRTC_STATE_VBLANK ); + top_pipe_to_program->stream_res.tg->funcs->wait_for_state ( + top_pipe_to_program->stream_res.tg, +CRTC_STATE_VACTIVE );if (should_use_dmub_lock (stream->link)) {union dmub_hw_lock_flags hw_locks = {0 };
@@ -3485,9 +3485,9 @@ static void commit_planes_for_stream(struct dc *dc, inst_flags.dig_inst = top_pipe_to_program->stream_res.tg->inst;dmub_hw_lock_mgr_cmd (dc->ctx->dmub_srv, - false, - &hw_locks, - &inst_flags); + false, + &hw_locks, + &inst_flags); }else top_pipe_to_program->stream_res.tg->funcs->lock_doublebuffer_disable ( top_pipe_to_program->stream_res.tg);
@@ -3499,13 +3499,13 @@ static void commit_planes_for_stream(struct dc *dc,/* Since phantom pipe programming is moved to post_unlock_program_front_end, * move the SubVP lock to after the phantom pipes have been setup */ -if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) { -if (dc->hwss.subvp_pipe_control_lock) - dc->hwss.subvp_pipe_control_lock (dc, context, false, should_lock_all_pipes,NULL , subvp_prev_use); - }else { -if (dc->hwss.subvp_pipe_control_lock) - dc->hwss.subvp_pipe_control_lock (dc, context, false, should_lock_all_pipes, top_pipe_to_program, subvp_prev_use); - } +if (should_lock_all_pipes && dc->hwss.interdependent_update_lock) { +if (dc->hwss.subvp_pipe_control_lock) + dc->hwss.subvp_pipe_control_lock (dc, context, false, should_lock_all_pipes,NULL , subvp_prev_use); + }else { +if (dc->hwss.subvp_pipe_control_lock) + dc->hwss.subvp_pipe_control_lock (dc, context, false, should_lock_all_pipes, top_pipe_to_program, subvp_prev_use); + }// Fire manual trigger only when bottom plane is flipped for (j =0 ; j < dc->res_pool->pipe_count; j++) {
Signature · 1 line
2.35.3