Commit e3615bd1 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amd/display: fix corruption with high refresh rates on DCN 3.0 

This reverts commit bc87d666 and the
register changes from commit 6d4279cb.

Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3412


Cc: mikhail.v.gavrilov@gmail.com
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Tested-by: default avatarMikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.10.x
parent 4b0eb9ce

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

+3 −12
Original line number Diff line number Diff line
@@ -945,19 +945,10 @@ void optc1_set_drr( 
				OTG_FORCE_LOCK_ON_EVENT, 0,

				OTG_SET_V_TOTAL_MIN_MASK_EN, 0,

				OTG_SET_V_TOTAL_MIN_MASK, 0);

	}



	// Setup manual flow control for EOF via TRIG_A

	optc->funcs->setup_manual_trigger(optc);



	} else {

		REG_UPDATE_4(OTG_V_TOTAL_CONTROL,

				OTG_SET_V_TOTAL_MIN_MASK, 0,

				OTG_V_TOTAL_MIN_SEL, 0,

				OTG_V_TOTAL_MAX_SEL, 0,

				OTG_FORCE_LOCK_ON_EVENT, 0);



		optc->funcs->set_vtotal_min_max(optc, 0, 0);

	}

}



void optc1_set_vtotal_min_max(struct timing_generator *optc, int vtotal_min, int vtotal_max)

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

+10 −0
Original line number Diff line number Diff line
@@ -453,6 +453,16 @@ void optc2_setup_manual_trigger(struct timing_generator *optc) 
{

	struct optc *optc1 = DCN10TG_FROM_TG(optc);



	/* Set the min/max selectors unconditionally so that

	 * DMCUB fw may change OTG timings when necessary

	 * TODO: Remove the w/a after fixing the issue in DMCUB firmware

	 */

	REG_UPDATE_4(OTG_V_TOTAL_CONTROL,

				 OTG_V_TOTAL_MIN_SEL, 1,

				 OTG_V_TOTAL_MAX_SEL, 1,

				 OTG_FORCE_LOCK_ON_EVENT, 0,

				 OTG_SET_V_TOTAL_MIN_MASK, (1 << 1)); /* TRIGA */



	REG_SET_8(OTG_TRIGA_CNTL, 0,

			OTG_TRIGA_SOURCE_SELECT, 21,

			OTG_TRIGA_SOURCE_PIPE_SELECT, optc->inst,