Commit 830806c5 authored by Aric Cyr's avatar Aric Cyr Committed by Alex Deucher
Browse files

drm/amd/display: Fix manual trigger source for DCN2 



Fix manual trigger source correctly be TRIGA for DCN2
rather than MANUAL_FLOW.

Signed-off-by: default avatarAric Cyr <aric.cyr@amd.com>
Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ca4f844e

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.c

+1 −7
Original line number Diff line number Diff line
@@ -390,14 +390,8 @@ void optc2_setup_manual_trigger(struct timing_generator *optc) 
{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	REG_SET(OTG_MANUAL_FLOW_CONTROL, 0,

			MANUAL_FLOW_CONTROL, 1);



	REG_SET(OTG_GLOBAL_CONTROL2, 0,

			MANUAL_FLOW_CONTROL_SEL, optc->inst);



	REG_SET_8(OTG_TRIGA_CNTL, 0,

			OTG_TRIGA_SOURCE_SELECT, 22,

			OTG_TRIGA_SOURCE_SELECT, 21,

			OTG_TRIGA_SOURCE_PIPE_SELECT, optc->inst,

			OTG_TRIGA_RISING_EDGE_DETECT_CNTL, 1,

			OTG_TRIGA_FALLING_EDGE_DETECT_CNTL, 0,

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_optc.h

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ void optc2_triplebuffer_lock(struct timing_generator *optc); 
void optc2_triplebuffer_unlock(struct timing_generator *optc);

void optc2_lock_doublebuffer_disable(struct timing_generator *optc);

void optc2_lock_doublebuffer_enable(struct timing_generator *optc);

void optc2_setup_manual_trigger(struct timing_generator *optc);

void optc2_program_manual_trigger(struct timing_generator *optc);

bool optc2_is_two_pixels_per_containter(const struct dc_crtc_timing *timing);

#endif /* __DC_OPTC_DCN20_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE