Commit 87325940 authored by Joshua Aberback's avatar Joshua Aberback Committed by Alex Deucher
Browse files

drm/amd/display: Remove duplicate HWSS interfaces 



[Why]
Some interface functions are defined in both the public and private HWSS
interfaces, which can lead to confusion and runtime issues, therefore
the duplicates should be eliminated.

[How]
- power_down should only be private, because it's only used within HWSS.
- update_plane_addr should only be public, as it's used outside HWSS.

Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarJoshua Aberback <joshua.aberback@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 58ed4413

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

+0 −1
Original line number Diff line number Diff line
@@ -3319,7 +3319,6 @@ static const struct hw_sequencer_funcs dce110_funcs = { 


static const struct hwseq_private_funcs dce110_private_funcs = {

	.init_pipes = init_pipes,

	.update_plane_addr = update_plane_addr,

	.set_input_transfer_func = dce110_set_input_transfer_func,

	.set_output_transfer_func = dce110_set_output_transfer_func,

	.power_down = dce110_power_down,

drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c

+5 −5
Original line number Diff line number Diff line
@@ -1696,10 +1696,10 @@ void dcn10_power_down_on_boot(struct dc *dc) 
	if (edp_link && edp_link->link_enc->funcs->is_dig_enabled &&

			edp_link->link_enc->funcs->is_dig_enabled(edp_link->link_enc) &&

			dc->hwseq->funcs.edp_backlight_control &&

			dc->hwss.power_down &&

			dc->hwseq->funcs.power_down &&

			dc->hwss.edp_power_control) {

		dc->hwseq->funcs.edp_backlight_control(edp_link, false);

		dc->hwss.power_down(dc);

		dc->hwseq->funcs.power_down(dc);

		dc->hwss.edp_power_control(edp_link, false);

	} else {

		for (i = 0; i < dc->link_count; i++) {
@@ -1707,8 +1707,8 @@ void dcn10_power_down_on_boot(struct dc *dc) 


			if (link->link_enc && link->link_enc->funcs->is_dig_enabled &&

					link->link_enc->funcs->is_dig_enabled(link->link_enc) &&

					dc->hwss.power_down) {

				dc->hwss.power_down(dc);

					dc->hwseq->funcs.power_down) {

				dc->hwseq->funcs.power_down(dc);

				break;

			}
@@ -2913,7 +2913,7 @@ static void dcn10_update_dchubp_dpp( 


	hubp->power_gated = false;



	hws->funcs.update_plane_addr(dc, pipe_ctx);

	dc->hwss.update_plane_addr(dc, pipe_ctx);



	if (is_pipe_tree_visible(pipe_ctx))

		hubp->funcs->set_blank(hubp, false);

drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c

+0 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ static const struct hw_sequencer_funcs dcn10_funcs = { 
	.get_clock = dcn10_get_clock,

	.get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync,

	.calc_vupdate_position = dcn10_calc_vupdate_position,

	.power_down = dce110_power_down,

	.set_backlight_level = dce110_set_backlight_level,

	.set_abm_immediate_disable = dce110_set_abm_immediate_disable,

	.set_pipe = dce110_set_pipe,
@@ -92,7 +91,6 @@ static const struct hw_sequencer_funcs dcn10_funcs = { 


static const struct hwseq_private_funcs dcn10_private_funcs = {

	.init_pipes = dcn10_init_pipes,

	.update_plane_addr = dcn10_update_plane_addr,

	.plane_atomic_disconnect = dcn10_plane_atomic_disconnect,

	.program_pipe = dcn10_program_pipe,

	.update_mpcc = dcn10_update_mpcc,

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

+1 −1
Original line number Diff line number Diff line
@@ -1825,7 +1825,7 @@ static void dcn20_update_dchubp_dpp( 
			params.subvp_save_surf_addr.subvp_index = pipe_ctx->subvp_index;

			hwss_subvp_save_surf_addr(&params);

		}

		hws->funcs.update_plane_addr(dc, pipe_ctx);

		dc->hwss.update_plane_addr(dc, pipe_ctx);

	}



	if (pipe_ctx->update_flags.bits.enable)

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static const struct hw_sequencer_funcs dcn20_funcs = { 


static const struct hwseq_private_funcs dcn20_private_funcs = {

	.init_pipes = dcn10_init_pipes,

	.update_plane_addr = dcn20_update_plane_addr,

	.plane_atomic_disconnect = dcn10_plane_atomic_disconnect,

	.update_mpcc = dcn20_update_mpcc,

	.set_input_transfer_func = dcn20_set_input_transfer_func,