From: James Lin <PingLei.Lin@amd.com>
To: <amd-gfx@lists.freedesktop.org>
Cc: Harry Wentland <harry.wentland@amd.com>,
Leo Li <sunpeng.li@amd.com>,
Aurabindo Pillai <aurabindo.pillai@amd.com>,
Roman Li <roman.li@amd.com>, Wayne Lin <wayne.lin@amd.com>,
Tom Chung <chiahsuan.chung@amd.com>,
"Fangzhi Zuo" <jerry.zuo@amd.com>,
Dan Wheeler <daniel.wheeler@amd.com>, Ray Wu <Ray.Wu@amd.com>,
Ivan Lipski <ivan.lipski@amd.com>, Alex Hung <alex.hung@amd.com>,
James Lin <PingLei.Lin@amd.com>,
Chenyu Chen <Chen-Yu.Chen@amd.com>,
Michael Strauss <michael.strauss@amd.com>,
Aric Cyr <aric.cyr@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
<stable@vger.kernel.org>, James Lin <pinglei.lin@amd.com>
Subject: [PATCH 01/33] drm/amd/display: Clear OTG_AUTO_FORCE_VSYNC_MODE on OTG disable
Date: Tue, 17 Nov 2026 05:50:38 +0800 [thread overview]
Message-ID: <20261116215641.2800595-2-PingLei.Lin@amd.com> (raw)
In-Reply-To: <20261116215641.2800595-1-PingLei.Lin@amd.com>
From: Michael Strauss <michael.strauss@amd.com>
[WHY]
A frame-lock reset trigger sets OTG_AUTO_FORCE_VSYNC_MODE. If the bit is
not cleared when the OTG is released, the OTG keeps forcing vsync on
every trigger event.
When a display stream later reuses that OTG with DRR enabled, each DRR
manual trigger forces an early vsync and cuts the frame short. The
display then runs above its programmed refresh rate and underflows,
leaving the external monitor with no signal.
[HOW]
Clear OTG_AUTO_FORCE_VSYNC_MODE in the DCN31/314/35 disable_crtc so a
released OTG is left clean.
Cc: Aric Cyr <aric.cyr@amd.com>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Michael Strauss <michael.strauss@amd.com>
Signed-off-by: James Lin <pinglei.lin@amd.com>
---
drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 4 ++++
drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 4 ++++
drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 4 ++++
3 files changed, 12 insertions(+)
diff --git a/drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c b/drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c
index ce9cd32b807a..7706f5f16a68 100644
--- a/drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c
+++ b/drivers/gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c
@@ -143,6 +143,10 @@ static bool optc31_disable_crtc(struct timing_generator *optc)
1, 100000);
optc1_clear_optc_underflow(optc);
+ /* a stale frame-lock force-vsync would cut every DRR-triggered frame short on reuse */
+ REG_UPDATE(OTG_VERT_SYNC_CONTROL,
+ OTG_AUTO_FORCE_VSYNC_MODE, 0);
+
return true;
}
/*
diff --git a/drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.c b/drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.c
index f5faa49680ef..5ec70e849cce 100644
--- a/drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.c
+++ b/drivers/gpu/drm/amd/display/dc/optc/dcn314/dcn314_optc.c
@@ -142,6 +142,10 @@ static bool optc314_disable_crtc(struct timing_generator *optc)
OTG_BUSY, 0,
1, 100000);
+ /* a stale frame-lock force-vsync would cut every DRR-triggered frame short on reuse */
+ REG_UPDATE(OTG_VERT_SYNC_CONTROL,
+ OTG_AUTO_FORCE_VSYNC_MODE, 0);
+
return true;
}
diff --git a/drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c b/drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c
index 406446e5eae5..b4b4792167dd 100644
--- a/drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c
+++ b/drivers/gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c
@@ -162,6 +162,10 @@ static bool optc35_disable_crtc(struct timing_generator *optc)
optc1_clear_optc_underflow(optc);
+ /* a stale frame-lock force-vsync would cut every DRR-triggered frame short on reuse */
+ REG_UPDATE(OTG_VERT_SYNC_CONTROL,
+ OTG_AUTO_FORCE_VSYNC_MODE, 0);
+
return true;
}
--
2.43.0
next parent reply other threads:[~2026-11-17 17:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20261116215641.2800595-1-PingLei.Lin@amd.com>
2026-11-16 21:50 ` James Lin [this message]
2026-11-16 21:50 ` [PATCH 03/33] drm/amd/display: Power up eDP when detect link James Lin
2026-11-16 21:50 ` [PATCH 20/33] drm/amd/display: Honor the Replay stream regeneration wait event James Lin
2026-11-16 21:50 ` [PATCH 22/33] drm/amd/display: Skip DSC padding borrow estimate for zero padding James Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116215641.2800595-2-PingLei.Lin@amd.com \
--to=pinglei.lin@amd.com \
--cc=Chen-Yu.Chen@amd.com \
--cc=Ray.Wu@amd.com \
--cc=alex.hung@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=aric.cyr@amd.com \
--cc=aurabindo.pillai@amd.com \
--cc=chiahsuan.chung@amd.com \
--cc=daniel.wheeler@amd.com \
--cc=harry.wentland@amd.com \
--cc=ivan.lipski@amd.com \
--cc=jerry.zuo@amd.com \
--cc=mario.limonciello@amd.com \
--cc=michael.strauss@amd.com \
--cc=roman.li@amd.com \
--cc=stable@vger.kernel.org \
--cc=sunpeng.li@amd.com \
--cc=wayne.lin@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox