From: Dale Zhao Date: Thu, 22 Nov 2018 09:13:46 +0000 (+0800) Subject: drm/amd/display: Wait edp HPD to high in detect_sink X-Git-Tag: v4.20.8~147 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e1f7735b261fa71ad85021680dbc9ab391c9d9b7;p=users%2Fdwmw2%2Flinux.git drm/amd/display: Wait edp HPD to high in detect_sink [ Upstream commit 0a6414e75d231ee1bb7ffb2f5eb246b682a884cd ] [Why] In 99% user case, edp will be post by vbios. In 1% / current case: Lenovo don't light up edp panel in vbios post stage, vbios won't be lit up. Thus in dal when we init DCN 10 hw, we power up edp, then we start detect_sink, but internal time is too short, when we detect it, HPD is still low, so we don't detect the edp, and edp shows black. [How] When we init hw, we wait edp HPD to high after power up edp. Signed-off-by: Dale Zhao Reviewed-by: Eric Yang Acked-by: Leo Li Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- 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 ef1b350a45e02..8b69913b6943a 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -208,6 +208,9 @@ bool dc_link_detect_sink(struct dc_link *link, enum dc_connection_type *type) return true; } + if (link->connector_signal == SIGNAL_TYPE_EDP) + link->dc->hwss.edp_wait_for_hpd_ready(link, true); + /* todo: may need to lock gpio access */ hpd_pin = get_hpd_gpio(link->ctx->dc_bios, link->link_id, link->ctx->gpio_service); if (hpd_pin == NULL)