From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Qingqing Zhuo <qingqing.zhuo@amd.com>,
Hersen Wu <hersenxs.wu@amd.com>,
Aurabindo Pillai <aurabindo.pillai@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 5.13 23/24] drm/amd/display: workaround for hard hang on HPD on native DP
Date: Tue, 10 Aug 2021 10:15:04 -0400 [thread overview]
Message-ID: <20210810141505.3117318-23-sashal@kernel.org> (raw)
In-Reply-To: <20210810141505.3117318-1-sashal@kernel.org>
From: Qingqing Zhuo <qingqing.zhuo@amd.com>
[ Upstream commit c4152b297d56d3696ad0a9003169bc5b98ad7b72 ]
[Why]
HPD disable and enable sequences are not mutually exclusive
on Linux. For HPDs that spans over 1s (i.e. HPD low = 1s),
part of the disable sequence (specifically, a request to SMU
to lower refclk) could come right before the call to PHY
enable, causing DMUB to access an unresponsive PHY
and thus a hard hang on the system.
[How]
Disable 48mhz refclk off on native DP.
Reviewed-by: Hersen Wu <hersenxs.wu@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
index 75ba86f951f8..7bbedb6b4a9e 100644
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c
@@ -66,9 +66,11 @@ int rn_get_active_display_cnt_wa(
for (i = 0; i < context->stream_count; i++) {
const struct dc_stream_state *stream = context->streams[i];
+ /* Extend the WA to DP for Linux*/
if (stream->signal == SIGNAL_TYPE_HDMI_TYPE_A ||
stream->signal == SIGNAL_TYPE_DVI_SINGLE_LINK ||
- stream->signal == SIGNAL_TYPE_DVI_DUAL_LINK)
+ stream->signal == SIGNAL_TYPE_DVI_DUAL_LINK ||
+ stream->signal == SIGNAL_TYPE_DISPLAY_PORT)
tmds_present = true;
}
--
2.30.2
next prev parent reply other threads:[~2021-08-10 14:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 14:14 [PATCH AUTOSEL 5.13 01/24] dmaengine: xilinx_dma: Fix read-after-free bug when terminating transfers Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 02/24] dmaengine: usb-dmac: Fix PM reference leak in usb_dmac_probe() Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 03/24] spi: spi-mux: Add module info needed for autoloading Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 04/24] net: xfrm: Fix end of loop tests for list_for_each_entry Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 05/24] ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 06/24] dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet available Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 07/24] scsi: pm80xx: Fix TMF task completion race condition Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 08/24] scsi: megaraid_mm: Fix end of loop tests for list_for_each_entry() Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 09/24] scsi: scsi_dh_rdac: Avoid crash during rdac_bus_attach() Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 10/24] scsi: core: Avoid printing an error if target_alloc() returns -ENXIO Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 11/24] scsi: core: Fix capacity set to zero after offlinining device Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 12/24] drm/amdgpu: fix the doorbell missing when in CGPG issue for renoir Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 13/24] qede: fix crash in rmmod qede while automatic debug collection Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 14/24] ARM: dts: nomadik: Fix up interrupt controller node names Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 16/24] Revert "ACPICA: Fix memory leak caused by _CID repair function" Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 17/24] riscv: dts: fix memory size for the SiFive HiFive Unmatched Sasha Levin
2021-08-10 14:14 ` [PATCH AUTOSEL 5.13 18/24] net: usb: pegasus: Check the return value of get_geristers() and friends; Sasha Levin
2021-08-10 14:15 ` [PATCH AUTOSEL 5.13 19/24] net: usb: lan78xx: don't modify phy_device state concurrently Sasha Levin
2021-08-10 14:15 ` [PATCH AUTOSEL 5.13 20/24] perf/x86: Fix out of bound MSR access Sasha Levin
2021-08-10 14:15 ` [PATCH AUTOSEL 5.13 21/24] spi: cadence-quadspi: Fix check condition for DTR ops Sasha Levin
2021-08-10 14:15 ` [PATCH AUTOSEL 5.13 22/24] drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X Sasha Levin
2021-08-10 14:15 ` Sasha Levin [this message]
2021-08-10 14:15 ` [PATCH AUTOSEL 5.13 24/24] kyber: make trace_block_rq call consistent with documentation Sasha Levin
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=20210810141505.3117318-23-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=aurabindo.pillai@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hersenxs.wu@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=qingqing.zhuo@amd.com \
--cc=stable@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).