From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Martin Tsai <martin.tsai@amd.com>,
Charlene Liu <Charlene.Liu@amd.com>, Leo Li <sunpeng.li@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.3 013/292] drm/amd/display: Handle virtual signal type in disable_link()
Date: Tue, 10 Dec 2019 16:20:32 -0500 [thread overview]
Message-ID: <20191210212511.11392-13-sashal@kernel.org> (raw)
In-Reply-To: <20191210212511.11392-1-sashal@kernel.org>
From: Martin Tsai <martin.tsai@amd.com>
[ Upstream commit 616f5b65f1c02d3d6ae370644670d14c57de2fd8 ]
[Why]
The new implementation changed the behavior to allow process setMode
to DAL when DAL returns empty mode query for unplugged display.
This will trigger additional disable_link().
When unplug HDMI from MST dock, driver will update stream->signal to
"Virtual". disable_link() will call disable_output() if the signal type
is not DP and induce other displays on MST dock show black screen.
[How]
Don't need to process disable_output() if the signal type is virtual.
Signed-off-by: Martin Tsai <martin.tsai@amd.com>
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com>
Acked-by: Leo Li <sunpeng.li@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/core/dc_link.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
index 355b4ba127966..90217cf83ce17 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
@@ -2157,8 +2157,10 @@ static void disable_link(struct dc_link *link, enum signal_type signal)
dp_set_fec_ready(link, false);
}
#endif
- } else
- link->link_enc->funcs->disable_output(link->link_enc, signal);
+ } else {
+ if (signal != SIGNAL_TYPE_VIRTUAL)
+ link->link_enc->funcs->disable_output(link->link_enc, signal);
+ }
if (signal == SIGNAL_TYPE_DISPLAY_PORT_MST) {
/* MST disable link only when no stream use the link */
--
2.20.1
next prev parent reply other threads:[~2019-12-10 21:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 21:20 [PATCH AUTOSEL 5.3 001/292] drm/vc4/vc4_hdmi: fill in connector info Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 002/292] drm: mst: Fix query_payload ack reply struct Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 003/292] drm/mipi-dbi: fix a loop in debugfs code Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 004/292] drm/panel: Add missing drm_panel_init() in panel drivers Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 005/292] drm: exynos: exynos_hdmi: use cec_notifier_conn_(un)register Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 006/292] drm/amd/display: verify stream link before link test Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 007/292] drm/bridge: analogix-anx78xx: silence -EPROBE_DEFER warnings Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 008/292] iio: max31856: add missing of_node and parent references to iio_dev Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 009/292] iio: light: bh1750: Resolve compiler warning and make code more readable Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 010/292] drm/amdgpu/sriov: add ring_stop before ring_create in psp v11 code Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 011/292] drm/amdgpu: grab the id mgr lock while accessing passid_mapping Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 012/292] ath10k: add cleanup in ath10k_sta_state() Sasha Levin
2019-12-10 21:20 ` Sasha Levin [this message]
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 014/292] iio: tcs3414: fix iio_triggered_buffer_{pre,post}enable positions Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 015/292] ath10k: Check if station exists before forwarding tx airtime report Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 016/292] spi: Add call to spi_slave_abort() function when spidev driver is released Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 017/292] staging: rtl8192u: fix multiple memory leaks on error path Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 018/292] staging: rtl8188eu: fix possible null dereference Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 019/292] objtool: add kunit_try_catch_throw to the noreturn list Sasha Levin
2019-12-10 21:31 ` Brendan Higgins
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 020/292] rtlwifi: prevent memory leak in rtl_usb_probe Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 021/292] libertas: fix a potential NULL pointer dereference Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 022/292] Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit30 when using SSI_SCK2 and SSI_WS2" Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 023/292] Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D" Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 024/292] ath10k: fix backtrace on coredump Sasha Levin
2019-12-10 21:20 ` [PATCH AUTOSEL 5.3 025/292] IB/iser: bound protection_sg size by data_sg size 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=20191210212511.11392-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Charlene.Liu@amd.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.tsai@amd.com \
--cc=stable@vger.kernel.org \
--cc=sunpeng.li@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