From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 055/171] drm/amd/display: set link->dongle_max_pix_clk to 0 on a disconnect Date: Thu, 18 Jul 2019 23:54:46 -0400 Message-ID: <20190719035643.14300-55-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190719035643.14300-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Samson Tam , Alex Deucher , Jun Lei , Bhawanpreet Lakha RnJvbTogU2Ftc29uIFRhbSA8U2Ftc29uLlRhbUBhbWQuY29tPgoKWyBVcHN0cmVhbSBjb21taXQg MjMzZDg3YTU3OWI4YWRjYzZkYTU4MjNmYTUwN2VjYjY2NzVlNzU2MiBdCgpbV2h5XQpGb3VuZCBp c3N1ZSBpbiBFRElEIEVtdWxhdGlvbiB3aGVyZSBpZiB3ZSBjb25uZWN0IGEgZGlzcGxheSB1c2lu ZwogYSBwYXNzaXZlIEhETUktRFAgZG9uZ2xlLCBkaXNjb25uZWN0IGl0IGFuZCB0aGVuIHRyeSB0 byBlbXVsYXRlCiBhIGRpc3BsYXkgdXNpbmcgRFAsIHdlIGNvdWxkIG5vdCBzZWUgNEsgbW9kZXMu ICBUaGlzIHdhcyBiZWNhdXNlCiBvbiBhIGRpc2Nvbm5lY3QsIGRvbmdsZV9tYXhfcGl4X2NsayB3 YXMgc3RpbGwgc2V0IHNvIHdoZW4gd2UKIGVtdWxhdGUgdXNpbmcgRFAsIGluIGRjX2xpbmtfdmFs aWRhdGVfbW9kZV90aW1pbmcoKSwgaXQgd291bGQKIHRoaW5rIHdlIHdlcmUgc3RpbGwgdXNpbmcg YSBkb25nbGUgYW5kIGxpbWl0IHRoZSBtb2RlcyB3ZSBzdXBwb3J0LgoKW0hvd10KSW4gZGNfbGlu a19kZXRlY3QoKSwgc2V0IGRvbmdsZV9tYXhfcGl4X2NsayB0byAwIHdoZW4gd2UgZGV0ZWN0CiBh IGhvdHBsdWcgb3V0ICggaWYgbmV3X2Nvbm5lY3Rpb25fdHlwZSA9IGRjX2Nvbm5lY3Rpb25fbm9u ZSApLgoKU2lnbmVkLW9mZi1ieTogU2Ftc29uIFRhbSA8U2Ftc29uLlRhbUBhbWQuY29tPgpSZXZp ZXdlZC1ieTogSnVuIExlaSA8SnVuLkxlaUBhbWQuY29tPgpBY2tlZC1ieTogQmhhd2FucHJlZXQg TGFraGEgPEJoYXdhbnByZWV0Lkxha2hhQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGV1 Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2 aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9k Yy9jb3JlL2RjX2xpbmsuYyB8IDYgKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNf bGluay5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGluay5jCmlu ZGV4IGIzN2VjYzNlZGU2MS4uYTNmZjMzZmY2ZGExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19saW5rLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2NvcmUvZGNfbGluay5jCkBAIC05NjAsNiArOTYwLDEyIEBAIGJvb2wgZGNf bGlua19kZXRlY3Qoc3RydWN0IGRjX2xpbmsgKmxpbmssIGVudW0gZGNfZGV0ZWN0X3JlYXNvbiBy ZWFzb24pCiAKIAkJbGluay0+dHlwZSA9IGRjX2Nvbm5lY3Rpb25fbm9uZTsKIAkJc2lua19jYXBz LnNpZ25hbCA9IFNJR05BTF9UWVBFX05PTkU7CisJCS8qIFdoZW4gd2UgdW5wbHVnIGEgcGFzc2l2 ZSBEUC1IRE1JIGRvbmdsZSBjb25uZWN0aW9uLCBkb25nbGVfbWF4X3BpeF9jbGsKKwkJICogIGlz IG5vdCBjbGVhcmVkLiBJZiB3ZSBlbXVsYXRlIGEgRFAgc2lnbmFsIG9uIHRoaXMgY29ubmVjdGlv biwgaXQgdGhpbmtzCisJCSAqICB0aGUgZG9uZ2xlIGlzIHN0aWxsIHRoZXJlIGFuZCBsaW1pdHMg dGhlIG51bWJlciBvZiBtb2RlcyB3ZSBjYW4gZW11bGF0ZS4KKwkJICogIENsZWFyIGRvbmdsZV9t YXhfcGl4X2NsayBvbiBkaXNjb25uZWN0IHRvIGZpeCB0aGlzCisJCSAqLworCQlsaW5rLT5kb25n bGVfbWF4X3BpeF9jbGsgPSAwOwogCX0KIAogCUxJTktfSU5GTygibGluaz0lZCwgZGNfc2lua19p bj0lcCBpcyBub3cgJXMgcHJldl9zaW5rPSVwIGRwY2Qgc2FtZT0lZCBlZGlkIHNhbWU9JWRcbiIs Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EECCCC76188 for ; Fri, 19 Jul 2019 04:39:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8B972077C for ; Fri, 19 Jul 2019 04:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563511167; bh=iBNWIBHZgGTe5Q+jdZRd+ngLa9VpaLIgZwj92vwqXyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OEyGDtj3t8b6Xl5j1idEgkLNaj3uQMRW9mQp55WjCDa9qhx3RE/SSNZODw/Ope//N 0ZNh9g+HVLoqP4wn4820+7wnPya0M+YHAuMbkEMLOEqtUFqk44jZCe2iD+NO/xkfEU 8yIAZpWnKpHBHzbkROTV5DFITQpEYh77QrejhQLs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728960AbfGSEj0 (ORCPT ); Fri, 19 Jul 2019 00:39:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:58230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727120AbfGSD6t (ORCPT ); Thu, 18 Jul 2019 23:58:49 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 20E5021850; Fri, 19 Jul 2019 03:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508729; bh=iBNWIBHZgGTe5Q+jdZRd+ngLa9VpaLIgZwj92vwqXyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kxorIxo+cqLMrPMWZfPF0TxLhvDMEk/xqLJascO2VQRbtzGGqvy0lMKuVHaWFSqhJ KkIxN3PI5Ku7e2BTu6v7auoQ2/3kDSqZ/sqfRqtN2LvuOWIUywCbFwbqsOalQhz68v /8z2Yoo2O88Dq1MCSmWYPDRuSi09ECn708NHOx9s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Samson Tam , Jun Lei , Bhawanpreet Lakha , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 055/171] drm/amd/display: set link->dongle_max_pix_clk to 0 on a disconnect Date: Thu, 18 Jul 2019 23:54:46 -0400 Message-Id: <20190719035643.14300-55-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Samson Tam [ Upstream commit 233d87a579b8adcc6da5823fa507ecb6675e7562 ] [Why] Found issue in EDID Emulation where if we connect a display using a passive HDMI-DP dongle, disconnect it and then try to emulate a display using DP, we could not see 4K modes. This was because on a disconnect, dongle_max_pix_clk was still set so when we emulate using DP, in dc_link_validate_mode_timing(), it would think we were still using a dongle and limit the modes we support. [How] In dc_link_detect(), set dongle_max_pix_clk to 0 when we detect a hotplug out ( if new_connection_type = dc_connection_none ). Signed-off-by: Samson Tam Reviewed-by: Jun Lei Acked-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 ++++++ 1 file changed, 6 insertions(+) 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 b37ecc3ede61..a3ff33ff6da1 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -960,6 +960,12 @@ bool dc_link_detect(struct dc_link *link, enum dc_detect_reason reason) link->type = dc_connection_none; sink_caps.signal = SIGNAL_TYPE_NONE; + /* When we unplug a passive DP-HDMI dongle connection, dongle_max_pix_clk + * is not cleared. If we emulate a DP signal on this connection, it thinks + * the dongle is still there and limits the number of modes we can emulate. + * Clear dongle_max_pix_clk on disconnect to fix this + */ + link->dongle_max_pix_clk = 0; } LINK_INFO("link=%d, dc_sink_in=%p is now %s prev_sink=%p dpcd same=%d edid same=%d\n", -- 2.20.1