Commit b33cd65d authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Alex Deucher
Browse files

drm/amd/display: Remove OPTC lock check 



At some point, we decided to blank HUBP during pixel data blank, and to
handle that, we added some OPTC lock checks. Later, we realized that
this change caused multiple regression, and we removed it. Nevertheless,
we still have some leftovers that might affect some ASIC behavior, and
this commit drops those changes to keep the code consistent.

Reviewed-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9114b55f

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c

+0 −11
Original line number Diff line number Diff line
@@ -679,16 +679,6 @@ void optc1_unlock(struct timing_generator *optc) 
			OTG_MASTER_UPDATE_LOCK, 0);

}



bool optc1_is_locked(struct timing_generator *optc)

{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);

	uint32_t locked;



	REG_GET(OTG_MASTER_UPDATE_LOCK, UPDATE_LOCK_STATUS, &locked);



	return (locked == 1);

}



void optc1_get_position(struct timing_generator *optc,

		struct crtc_position *position)

{
@@ -1583,7 +1573,6 @@ static const struct timing_generator_funcs dcn10_tg_funcs = { 
		.enable_crtc_reset = optc1_enable_crtc_reset,

		.disable_reset_trigger = optc1_disable_reset_trigger,

		.lock = optc1_lock,

		.is_locked = optc1_is_locked,

		.unlock = optc1_unlock,

		.enable_optc_clock = optc1_enable_optc_clock,

		.set_drr = optc1_set_drr,

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h

+0 −1
Original line number Diff line number Diff line
@@ -654,7 +654,6 @@ void optc1_set_blank(struct timing_generator *optc, 
		bool enable_blanking);



bool optc1_is_blanked(struct timing_generator *optc);

bool optc1_is_locked(struct timing_generator *optc);



void optc1_program_blank_color(

		struct timing_generator *optc,

drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ static struct timing_generator_funcs dcn30_tg_funcs = { 
		.enable_crtc_reset = optc1_enable_crtc_reset,

		.disable_reset_trigger = optc1_disable_reset_trigger,

		.lock = optc3_lock,

		.is_locked = optc1_is_locked,

		.unlock = optc1_unlock,

		.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,

		.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c

+0 −1
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static struct timing_generator_funcs dcn31_tg_funcs = { 
		.enable_crtc_reset = optc1_enable_crtc_reset,

		.disable_reset_trigger = optc1_disable_reset_trigger,

		.lock = optc3_lock,

		.is_locked = optc1_is_locked,

		.unlock = optc1_unlock,

		.lock_doublebuffer_enable = optc3_lock_doublebuffer_enable,

		.lock_doublebuffer_disable = optc3_lock_doublebuffer_disable,

drivers/gpu/drm/amd/display/dc/inc/core_types.h

+0 −1
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ struct pipe_ctx { 
	union pipe_update_flags update_flags;

	struct dwbc *dwbc;

	struct mcif_wb *mcif_wb;

	bool vtp_locked;

};



/* Data used for dynamic link encoder assignment.