From: Piotr Maziarz <[email protected]> This commit contains renames, adding const to pipe_ctx in build_cursor_pos_update_params and also removing unnecessary checks before dc_dmub_srv_is_cursor_offload_enabled().
[Why] It improves code clarity. Reviewed-by: Alvin Lee <[email protected]> Signed-off-by: Piotr Maziarz <[email protected]> Signed-off-by: George Zhang <[email protected]> --- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 19 +++++++------------ .../gpu/drm/amd/display/dc/core/dc_resource.c | 6 +++--- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.h | 2 +- .../amd/display/dc/hwss/dcn10/dcn10_init.c | 2 +- .../amd/display/dc/hwss/dcn20/dcn20_init.c | 2 +- .../amd/display/dc/hwss/dcn201/dcn201_init.c | 2 +- .../amd/display/dc/hwss/dcn21/dcn21_init.c | 2 +- .../amd/display/dc/hwss/dcn30/dcn30_init.c | 2 +- .../amd/display/dc/hwss/dcn301/dcn301_init.c | 2 +- .../amd/display/dc/hwss/dcn31/dcn31_init.c | 2 +- .../amd/display/dc/hwss/dcn314/dcn314_init.c | 2 +- .../amd/display/dc/hwss/dcn32/dcn32_init.c | 2 +- .../amd/display/dc/hwss/dcn35/dcn35_init.c | 2 +- .../amd/display/dc/hwss/dcn351/dcn351_init.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_init.c | 2 +- .../amd/display/dc/hwss/dcn42/dcn42_init.c | 2 +- .../amd/display/dc/hwss/dcn60/dcn60_init.c | 2 +- .../display/dc/hwss/hw_sequencer_private.h | 2 +- drivers/gpu/drm/amd/display/dc/inc/resource.h | 2 +- 22 files changed, 30 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c index 0a7408692cbe..28897addb553 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c @@ -1301,12 +1301,7 @@ void hwss_build_fast_sequence(struct dc *dc, } /* Track cursor lock state - separate locks for attribute and position updates */ - bool enable_cursor_offload = false; - - if ((dc->hwss.set_cursor_attribute && stream->update_flags.bits.cursor_attr) || - (dc->hwseq && dc->hwseq->funcs.build_cursor_position && - dc->hwss.set_cursor_position && stream->update_flags.bits.cursor_pos)) - enable_cursor_offload = dc_dmub_srv_is_cursor_offload_enabled(dc); + bool enable_cursor_offload = dc_dmub_srv_is_cursor_offload_enabled(dc); /* Cursor attribute updates - separate lock/iterate/unlock */ if (dc->hwss.set_cursor_attribute && stream->update_flags.bits.cursor_attr) { @@ -1391,7 +1386,7 @@ void hwss_build_fast_sequence(struct dc *dc, } /* Cursor position updates */ - if (dc->hwseq && dc->hwseq->funcs.build_cursor_position && + if (dc->hwseq && dc->hwseq->funcs.build_cursor_pos_update_params && dc->hwss.set_cursor_position && stream->update_flags.bits.cursor_pos) { struct pipe_ctx *cursor_pipe_to_program = NULL; @@ -1422,7 +1417,7 @@ void hwss_build_fast_sequence(struct dc *dc, } } - dc->hwseq->funcs.build_cursor_position(current_pipe, &pos, ¶m); + dc->hwseq->funcs.build_cursor_pos_update_params(current_pipe, &pos, ¶m); block_sequence[*num_steps].params.set_cursor_position_params.dc = dc; block_sequence[*num_steps].params.set_cursor_position_params.hubp = current_pipe->plane_res.hubp; @@ -4379,11 +4374,11 @@ void hwss_set_cursor_position(union block_sequence_params *params) void hwss_program_cursor_position(struct dc *dc, struct pipe_ctx *pipe_ctx) { - if (dc->hwseq && dc->hwseq->funcs.build_cursor_position && dc->hwss.set_cursor_position) { + if (dc->hwseq && dc->hwseq->funcs.build_cursor_pos_update_params && dc->hwss.set_cursor_position) { struct dc_cursor_position pos; struct dc_cursor_mi_param param; - dc->hwseq->funcs.build_cursor_position(pipe_ctx, &pos, ¶m); + dc->hwseq->funcs.build_cursor_pos_update_params(pipe_ctx, &pos, ¶m); dc->hwss.set_cursor_position(pipe_ctx->plane_res.hubp, pipe_ctx->plane_res.dpp, &pos, ¶m); } else if (dc->hwss.set_cursor_position_legacy) { @@ -5812,12 +5807,12 @@ void hwss_add_set_cursor_position(struct block_sequence_state *seq_state, struct pipe_ctx *pipe_ctx) { if (*seq_state->num_steps < MAX_HWSS_BLOCK_SEQUENCE_SIZE && - dc->hwseq && dc->hwseq->funcs.build_cursor_position && + dc->hwseq && dc->hwseq->funcs.build_cursor_pos_update_params && dc->hwss.set_cursor_position) { struct dc_cursor_position pos; struct dc_cursor_mi_param param; - dc->hwseq->funcs.build_cursor_position(pipe_ctx, &pos, ¶m); + dc->hwseq->funcs.build_cursor_pos_update_params(pipe_ctx, &pos, ¶m); seq_state->steps[*seq_state->num_steps].func = SET_CURSOR_POSITION; seq_state->steps[*seq_state->num_steps].params.set_cursor_position_params.dc = dc; 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 ecbd2b4a0c22..549f9885b762 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1049,7 +1049,7 @@ static struct rect calculate_mpc_slice_in_timing_active( return mpc_rec; } -static void calculate_adjust_recout_for_visual_confirm(struct pipe_ctx *pipe_ctx, +static void calculate_adjust_recout_for_visual_confirm(const struct pipe_ctx *pipe_ctx, unsigned int *base_offset, unsigned int *dpp_offset) { struct dc *dc = pipe_ctx->stream->ctx->dc; @@ -1070,7 +1070,7 @@ static void calculate_adjust_recout_for_visual_confirm(struct pipe_ctx *pipe_ctx } static void reverse_adjust_recout_for_visual_confirm(struct rect *recout, - struct pipe_ctx *pipe_ctx) + const struct pipe_ctx *pipe_ctx) { unsigned int dpp_offset, base_offset; @@ -1775,7 +1775,7 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) return res; } -bool resource_can_pipe_disable_cursor(struct pipe_ctx *pipe_ctx) +bool resource_can_pipe_disable_cursor(const struct pipe_ctx *pipe_ctx) { struct pipe_ctx *test_pipe, *split_pipe; struct rect r1 = pipe_ctx->plane_res.scl_data.recout; diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c index 613f1f62cd80..884319b22cc1 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c @@ -3729,7 +3729,7 @@ void dcn10_update_dchub(struct dce_hwseq *hws, struct dchub_init_data *dh_data) hubbub->funcs->update_dchub(hubbub, dh_data); } -void dcn10_build_cursor_position(struct pipe_ctx *pipe_ctx, +void dcn10_build_cursor_pos_update_params(const struct pipe_ctx *pipe_ctx, struct dc_cursor_position *pos_out, struct dc_cursor_mi_param *param_out) { diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h index 9c4f1186ca9f..383998531503 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h @@ -177,7 +177,7 @@ void dce110_edp_power_control( void dce110_edp_wait_for_hpd_ready( struct dc_link *link, bool power_up); -void dcn10_build_cursor_position(struct pipe_ctx *pipe_ctx, +void dcn10_build_cursor_pos_update_params(const struct pipe_ctx *pipe_ctx, struct dc_cursor_position *pos, struct dc_cursor_mi_param *param); void dcn10_set_cursor_position(struct hubp *hubp, struct dpp *dpp, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c index ddd52722bc49..bc3ac96de688 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c @@ -94,7 +94,7 @@ static const struct hw_sequencer_funcs dcn10_funcs = { }; static const struct hwseq_private_funcs dcn10_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .program_pipe = dcn10_program_pipe, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c index 5817fb44d2e0..789bde439192 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c @@ -107,7 +107,7 @@ static const struct hw_sequencer_funcs dcn20_funcs = { }; static const struct hwseq_private_funcs dcn20_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_init.c index d421bc813cbd..33c22d9bbd2e 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn201/dcn201_init.c @@ -99,7 +99,7 @@ static const struct hw_sequencer_funcs dcn201_funcs = { }; static const struct hwseq_private_funcs dcn201_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = NULL, .plane_atomic_disconnect = dcn201_plane_atomic_disconnect, .program_pipe = dcn10_program_pipe, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c index e691e86629c5..39bf0e51ec7c 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c @@ -110,7 +110,7 @@ static const struct hw_sequencer_funcs dcn21_funcs = { }; static const struct hwseq_private_funcs dcn21_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c index f7a095796039..ce42b8216f3b 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c @@ -117,7 +117,7 @@ static const struct hw_sequencer_funcs dcn30_funcs = { }; static const struct hwseq_private_funcs dcn30_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c index 191245bde1ca..5ed4305e4663 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn301/dcn301_init.c @@ -113,7 +113,7 @@ static const struct hw_sequencer_funcs dcn301_funcs = { }; static const struct hwseq_private_funcs dcn301_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c index 5500eb46dedb..c7055312cc3d 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c @@ -119,7 +119,7 @@ static const struct hw_sequencer_funcs dcn31_funcs = { }; static const struct hwseq_private_funcs dcn31_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_init.c index b278f58b844d..2b04598b0935 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_init.c @@ -122,7 +122,7 @@ static const struct hw_sequencer_funcs dcn314_funcs = { }; static const struct hwseq_private_funcs dcn314_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c index 49387de29382..9d3c7b40b21f 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c @@ -130,7 +130,7 @@ static const struct hw_sequencer_funcs dcn32_funcs = { }; static const struct hwseq_private_funcs dcn32_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c index e4864b9606ff..b1933a80fc47 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c @@ -140,7 +140,7 @@ static const struct hw_sequencer_funcs dcn35_funcs = { }; static const struct hwseq_private_funcs dcn35_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn35_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_init.c index f57c0f6adccf..dbd8480b9e05 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_init.c @@ -129,7 +129,7 @@ static const struct hw_sequencer_funcs dcn351_funcs = { }; static const struct hwseq_private_funcs dcn351_private_funcs = { - .build_cursor_position = dcn10_build_cursor_position, + .build_cursor_pos_update_params = dcn10_build_cursor_pos_update_params, .init_pipes = dcn35_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn20_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c index 98398dac9861..7780f37c615c 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c @@ -1045,7 +1045,7 @@ void dcn401_disable_link_output(struct dc_link *link, dc->link_srv->dp_trace_source_sequence(link, DPCD_SOURCE_SEQ_AFTER_DISABLE_LINK_PHY); } -void dcn401_build_cursor_position(struct pipe_ctx *pipe_ctx, +void dcn401_build_cursor_pos_update_params(const struct pipe_ctx *pipe_ctx, struct dc_cursor_position *pos_out, struct dc_cursor_mi_param *param_out) { diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h index f958ea34a3c6..66a0fc8de8ba 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h @@ -55,7 +55,7 @@ void dcn401_disable_link_output(struct dc_link *link, const struct link_resource *link_res, enum signal_type signal); -void dcn401_build_cursor_position(struct pipe_ctx *pipe_ctx, +void dcn401_build_cursor_pos_update_params(const struct pipe_ctx *pipe_ctx, struct dc_cursor_position *pos, struct dc_cursor_mi_param *param); void dcn401_set_cursor_position(struct hubp *hubp, struct dpp *dpp, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c index ac5ebe546d0c..2d3c46c4e00c 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c @@ -125,7 +125,7 @@ static const struct hw_sequencer_funcs dcn401_funcs = { }; static const struct hwseq_private_funcs dcn401_private_funcs = { - .build_cursor_position = dcn401_build_cursor_position, + .build_cursor_pos_update_params = dcn401_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .plane_atomic_disconnect_sequence = dcn401_plane_atomic_disconnect_sequence, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c index eba34f124e39..a28149411821 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c @@ -129,7 +129,7 @@ static const struct hw_sequencer_funcs dcn42_funcs = { }; static const struct hwseq_private_funcs dcn42_private_funcs = { - .build_cursor_position = dcn401_build_cursor_position, + .build_cursor_pos_update_params = dcn401_build_cursor_pos_update_params, .init_pipes = dcn35_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .update_mpcc = dcn42_update_mpcc, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c index ce0905820f7e..c89051a542cb 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c +++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c @@ -128,7 +128,7 @@ static const struct hw_sequencer_funcs dcn60_funcs = { }; static const struct hwseq_private_funcs dcn60_private_funcs = { - .build_cursor_position = dcn401_build_cursor_position, + .build_cursor_pos_update_params = dcn401_build_cursor_pos_update_params, .init_pipes = dcn10_init_pipes, .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, .plane_atomic_disconnect_sequence = dcn401_plane_atomic_disconnect_sequence, diff --git a/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer_private.h b/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer_private.h index 136c2c2eab1c..9586029dcec1 100644 --- a/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer_private.h +++ b/drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer_private.h @@ -229,7 +229,7 @@ struct hwseq_private_funcs { void (*program_cm_hist)(struct dc *dc, struct pipe_ctx *pipe_ctx, const struct dc_plane_state *plane_state); - void (*build_cursor_position)(struct pipe_ctx *pipe_ctx, + void (*build_cursor_pos_update_params)(const struct pipe_ctx *pipe_ctx, struct dc_cursor_position *pos, struct dc_cursor_mi_param *param); }; diff --git a/drivers/gpu/drm/amd/display/dc/inc/resource.h b/drivers/gpu/drm/amd/display/dc/inc/resource.h index 21a6f90956e8..0d9c9771ea7c 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/resource.h +++ b/drivers/gpu/drm/amd/display/dc/inc/resource.h @@ -172,7 +172,7 @@ bool resource_attach_surfaces_to_context( struct dc_state *context, const struct resource_pool *pool); -bool resource_can_pipe_disable_cursor(struct pipe_ctx *pipe_ctx); +bool resource_can_pipe_disable_cursor(const struct pipe_ctx *pipe_ctx); #define FREE_PIPE_INDEX_NOT_FOUND -1 -- 2.55.0
