From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 001/167] drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse" Date: Tue, 3 Sep 2019 12:22:33 -0400 Message-ID: <20190903162519.7136-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Jan-Marek Glogowski , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogSmFuLU1hcmVrIEdsb2dvd3NraSA8Z2xvZ293QGZiaWhvbWUuZGU+CgpbIFVwc3RyZWFt IGNvbW1pdCAzY2Y3MWJjOTkwNGQ3ZWU0YTI1YTgyMmM1ZGNiNTRjNzgwNGVhMzg4IF0KClRoaXMg cmUtYXBwbGllcyB0aGUgd29ya2Fyb3VuZCBmb3IgInNvbWUgRFAgc2lua3MsIFt3aGljaF0gYXJl IGEKbGl0dGxlIG51dHMiIGZyb20gY29tbWl0IDFhMzYxNDdiYjkzOSAoImRybS9pOTE1OiBQZXJm b3JtIGxpbmsKcXVhbGl0eSBjaGVjayB1bmNvbmRpdGlvbmFsbHkgZHVyaW5nIGxvbmcgcHVsc2Ui KS4KSXQgbWFrZXMgdGhlIHNlY29uZGFyeSBBT0MgRTI0NjBQIG1vbml0b3IgY29ubmVjdGVkIHZp YSBEUCB0byBhbgphY2VyIFZlcml0b24gTjQ2NDBHIHVzYWJsZSBhZ2Fpbi4KClRoaXMgaHVuayB3 YXMgZHJvcHBlZCBpbiBjb21taXQgYzg1ZDIwMGU4MzIxICgiZHJtL2k5MTU6IE1vdmUgU1NUCkRQ IGxpbmsgcmV0cmFpbmluZyBpbnRvIHRoZSAtPnBvc3RfaG90cGx1ZygpIGhvb2siKQoKRml4ZXM6 IGM4NWQyMDBlODMyMSAoImRybS9pOTE1OiBNb3ZlIFNTVCBEUCBsaW5rIHJldHJhaW5pbmcgaW50 byB0aGUgLT5wb3N0X2hvdHBsdWcoKSBob29rIikKW0NsZWFuZWQgdXAgY29tbWl0IG1lc3NhZ2Us IGFkZGVkIHN0YWJsZSBjY10KU2lnbmVkLW9mZi1ieTogTHl1ZGUgUGF1bCA8bHl1ZGVAcmVkaGF0 LmNvbT4KU2lnbmVkLW9mZi1ieTogSmFuLU1hcmVrIEdsb2dvd3NraSA8Z2xvZ293QGZiaWhvbWUu ZGU+CkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCkxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZy ZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE4MDgyNTE5MTAzNS4zOTQ1LTEtbHl1ZGVAcmVk aGF0LmNvbQpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyB8IDE2ICsrKysrKysrKysrKysrKysK IDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMK aW5kZXggZjkyMDc5ZTE5ZGU4ZC4uMjBjZDRjOGFjZWNjMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCkBAIC00NzM5LDYgKzQ3MzksMjIgQEAgaW50ZWxfZHBfbG9uZ19wdWxzZShzdHJ1Y3QgaW50 ZWxfY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCSAqLwogCQlzdGF0dXMgPSBjb25uZWN0b3Jfc3Rh dHVzX2Rpc2Nvbm5lY3RlZDsKIAkJZ290byBvdXQ7CisJfSBlbHNlIHsKKwkJLyoKKwkJICogSWYg ZGlzcGxheSBpcyBub3cgY29ubmVjdGVkIGNoZWNrIGxpbmtzIHN0YXR1cywKKwkJICogdGhlcmUg aGFzIGJlZW4ga25vd24gaXNzdWVzIG9mIGxpbmsgbG9zcyB0cmlnZ2VyaW5nCisJCSAqIGxvbmcg cHVsc2UuCisJCSAqCisJCSAqIFNvbWUgc2lua3MgKGVnLiBBU1VTIFBCMjg3USkgc2VlbSB0byBw ZXJmb3JtIHNvbWUKKwkJICogd2VpcmQgSFBEIHBpbmcgcG9uZyBkdXJpbmcgbW9kZXNldHMuIFNv IHdlIGNhbiBhcHBhcmVudGx5CisJCSAqIGVuZCB1cCB3aXRoIEhQRCBnb2luZyBsb3cgZHVyaW5n IGEgbW9kZXNldCwgYW5kIHRoZW4KKwkJICogZ29pbmcgYmFjayB1cCBzb29uIGFmdGVyLiBBbmQg b25jZSB0aGF0IGhhcHBlbnMgd2UgbXVzdAorCQkgKiByZXRyYWluIHRoZSBsaW5rIHRvIGdldCBh IHBpY3R1cmUuIFRoYXQncyBpbiBjYXNlIG5vCisJCSAqIHVzZXJzcGFjZSBjb21wb25lbnQgcmVh Y3RlZCB0byBpbnRlcm1pdHRlbnQgSFBEIGRpcC4KKwkJICovCisJCXN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyID0gJmRwX3RvX2RpZ19wb3J0KGludGVsX2RwKS0+YmFzZTsKKworCQlpbnRl bF9kcF9yZXRyYWluX2xpbmsoZW5jb2RlciwgY3R4KTsKIAl9CiAKIAkvKgotLSAKMi4yMC4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng= 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 90CC3C3A5A5 for ; Tue, 3 Sep 2019 16:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 603842343A for ; Tue, 3 Sep 2019 16:25:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527931; bh=y6jv+OHUHxEmn5hA5V/b/pfb8RWdE4SDWdiWC+3AyFY=; h=From:To:Cc:Subject:Date:List-ID:From; b=XGVFd3sRlCNvCNQTk9RMFDGrEwnG63Nja1JUP0kg+N65i7rFEySf/LULz04LLFYFL nYo4WlJj7KN6eJLJxSw8wqHNVi9FMUydQgmeYi+rVJst2eFpizHVrjukJ7WXd3rGtL STu57EUovyhCiDVqviRnCAIX9tJiO97ij/Z61hTk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730400AbfICQZa (ORCPT ); Tue, 3 Sep 2019 12:25:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:45392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730355AbfICQZW (ORCPT ); Tue, 3 Sep 2019 12:25:22 -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 11F432343A; Tue, 3 Sep 2019 16:25:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527921; bh=y6jv+OHUHxEmn5hA5V/b/pfb8RWdE4SDWdiWC+3AyFY=; h=From:To:Cc:Subject:Date:From; b=fktxo9kwQhwWMFXoU7eQDyn04xa/nB5bfIOAislXbhxWTJ4g9LGpF9cmGc6rq2ps0 VRB42Q6W2KyfuaY0P5a7TblDJND6KmCI2kShRIn+DhNumBMSbcO1I8AwQm2Rz6g+5W LJqybxcRH3j1hlbMqPd97dqhlnP+Lg263ri59lSU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan-Marek Glogowski , Lyude Paul , Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 001/167] drm/i915: Re-apply "Perform link quality check, unconditionally during long pulse" Date: Tue, 3 Sep 2019 12:22:33 -0400 Message-Id: <20190903162519.7136-1-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 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: Jan-Marek Glogowski [ Upstream commit 3cf71bc9904d7ee4a25a822c5dcb54c7804ea388 ] This re-applies the workaround for "some DP sinks, [which] are a little nuts" from commit 1a36147bb939 ("drm/i915: Perform link quality check unconditionally during long pulse"). It makes the secondary AOC E2460P monitor connected via DP to an acer Veriton N4640G usable again. This hunk was dropped in commit c85d200e8321 ("drm/i915: Move SST DP link retraining into the ->post_hotplug() hook") Fixes: c85d200e8321 ("drm/i915: Move SST DP link retraining into the ->post_hotplug() hook") [Cleaned up commit message, added stable cc] Signed-off-by: Lyude Paul Signed-off-by: Jan-Marek Glogowski Cc: stable@vger.kernel.org Link: https://patchwork.freedesktop.org/patch/msgid/20180825191035.3945-1-lyude@redhat.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/intel_dp.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index f92079e19de8d..20cd4c8acecc3 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4739,6 +4739,22 @@ intel_dp_long_pulse(struct intel_connector *connector, */ status = connector_status_disconnected; goto out; + } else { + /* + * If display is now connected check links status, + * there has been known issues of link loss triggering + * long pulse. + * + * Some sinks (eg. ASUS PB287Q) seem to perform some + * weird HPD ping pong during modesets. So we can apparently + * end up with HPD going low during a modeset, and then + * going back up soon after. And once that happens we must + * retrain the link to get a picture. That's in case no + * userspace component reacted to intermittent HPD dip. + */ + struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; + + intel_dp_retrain_link(encoder, ctx); } /* -- 2.20.1