From: jsg <jsg@openbsd.org>
Date: Mon, 29 Apr 2024 06:25:15 +0000 (+0000)
Subject: drm/amd/display: Do not recursively call manual trigger programming
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=7586747450d7c909b1fdbe5c497fe5843ce4d4b9;p=openbsd

drm/amd/display: Do not recursively call manual trigger programming

From Dillon Varone
a17236f99f49c5e3c2a052302127284a99fc07bb in linux-6.6.y/6.6.29
953927587f37b731abdeabe46ad44a3b3ec67a52 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c b/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c
index e817fa4efee..058dee76054 100644
--- a/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn32/dcn32_optc.c
@@ -236,9 +236,6 @@ static void optc32_setup_manual_trigger(struct timing_generator *optc)
 				OTG_V_TOTAL_MAX_SEL, 1,
 				OTG_FORCE_LOCK_ON_EVENT, 0,
 				OTG_SET_V_TOTAL_MIN_MASK, (1 << 1)); /* TRIGA */
-
-		// Setup manual flow control for EOF via TRIG_A
-		optc->funcs->setup_manual_trigger(optc);
 	}
 }