From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com ([134.134.136.31]:62561 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752534AbdDMM1p (ORCPT ); Thu, 13 Apr 2017 08:27:45 -0400 Date: Thu, 13 Apr 2017 15:27:40 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: intel-gfx@lists.freedesktop.org Cc: stable@vger.kernel.org, Manasi Navare , Palmer Dabbelt Subject: Re: [PATCH v3] drm/i915: Perform link quality check unconditionally during long pulse Message-ID: <20170413122740.GV30290@intel.com> References: <20170216153007.14868-1-ville.syrjala@linux.intel.com> <20170412193017.21029-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170412193017.21029-1-ville.syrjala@linux.intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Apr 12, 2017 at 10:30:17PM +0300, ville.syrjala@linux.intel.com wrote: > From: Ville Syrj�l� > > Apparently some DP sinks are a little nuts and cause HPD to drop > intermittently during modesets. This happens eg. on an ASUS PB287Q. > In oder to recover from this we can't really use the previous > connector status to determine if the link needs retraining, so let's > just ignore that piece of information and do the retrain > unconditionally. We do of course still check whether the link is > supposed to be running or not. > > To actually get read out the EDID and update things properly we > also need to nuke the goto out added by commit 7d23e3c37bb3 > ("drm/i915: Cleaning up intel_dp_hpd_pulse"). I'm actually not sure > why that was there. Perhaps to avoid an EDID read if the connector > status didn't appear to change, but that sort of thing is quite racy > and would have failed anyway if we failed to keep up with the > hotplugs (if we missed the HPD down in between two HPD ups). And > now that we take this codepath unconditionally we definitely need > to drop the goto as otherwise we would never do the EDID read. > > v2: Drop the goto that made us skip EDID reads entirely. Doh! > v3: Rebase due to locking changes > s/apparely/apparently/ in the comment (Chris) > > Cc: stable@vger.kernel.org > Cc: Manasi Navare > Cc: Palmer Dabbelt > Reported-by: Palmer Dabbelt > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99766 > References: https://lists.freedesktop.org/archives/intel-gfx/2017-February/119779.html > Signed-off-by: Ville Syrj�l� > Reviewed-by: Chris Wilson And pushed to dinq. Thanks for the review. > --- > drivers/gpu/drm/i915/intel_dp.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 16b7bf7af537..09601a22d3cc 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4685,9 +4685,20 @@ intel_dp_long_pulse(struct intel_connector *intel_connector) > */ > status = connector_status_disconnected; > goto out; > - } else if (connector->status == connector_status_connected) { > + } else { > + /* > + * If display is now connected check links status, > + * there has been known issues of link loss triggerring > + * 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. > + */ > intel_dp_check_link_status(intel_dp); > - goto out; > } > > /* > -- > 2.10.2 -- Ville Syrj�l� Intel OTC From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v3] drm/i915: Perform link quality check unconditionally during long pulse Date: Thu, 13 Apr 2017 15:27:40 +0300 Message-ID: <20170413122740.GV30290@intel.com> References: <20170216153007.14868-1-ville.syrjala@linux.intel.com> <20170412193017.21029-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 760956E2DE for ; Thu, 13 Apr 2017 12:27:44 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20170412193017.21029-1-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Palmer Dabbelt , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBBcHIgMTIsIDIwMTcgYXQgMTA6MzA6MTdQTSArMDMwMCwgdmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KPiAKPiBBcHBhcmVudGx5IHNvbWUgRFAgc2lua3MgYXJlIGEg bGl0dGxlIG51dHMgYW5kIGNhdXNlIEhQRCB0byBkcm9wCj4gaW50ZXJtaXR0ZW50bHkgZHVyaW5n IG1vZGVzZXRzLiBUaGlzIGhhcHBlbnMgZWcuIG9uIGFuIEFTVVMgUEIyODdRLgo+IEluIG9kZXIg dG8gcmVjb3ZlciBmcm9tIHRoaXMgd2UgY2FuJ3QgcmVhbGx5IHVzZSB0aGUgcHJldmlvdXMKPiBj b25uZWN0b3Igc3RhdHVzIHRvIGRldGVybWluZSBpZiB0aGUgbGluayBuZWVkcyByZXRyYWluaW5n LCBzbyBsZXQncwo+IGp1c3QgaWdub3JlIHRoYXQgcGllY2Ugb2YgaW5mb3JtYXRpb24gYW5kIGRv IHRoZSByZXRyYWluCj4gdW5jb25kaXRpb25hbGx5LiBXZSBkbyBvZiBjb3Vyc2Ugc3RpbGwgY2hl Y2sgd2hldGhlciB0aGUgbGluayBpcwo+IHN1cHBvc2VkIHRvIGJlIHJ1bm5pbmcgb3Igbm90Lgo+ IAo+IFRvIGFjdHVhbGx5IGdldCByZWFkIG91dCB0aGUgRURJRCBhbmQgdXBkYXRlIHRoaW5ncyBw cm9wZXJseSB3ZQo+IGFsc28gbmVlZCB0byBudWtlIHRoZSBnb3RvIG91dCBhZGRlZCBieSBjb21t aXQgN2QyM2UzYzM3YmIzCj4gKCJkcm0vaTkxNTogQ2xlYW5pbmcgdXAgaW50ZWxfZHBfaHBkX3B1 bHNlIikuIEknbSBhY3R1YWxseSBub3Qgc3VyZQo+IHdoeSB0aGF0IHdhcyB0aGVyZS4gUGVyaGFw cyB0byBhdm9pZCBhbiBFRElEIHJlYWQgaWYgdGhlIGNvbm5lY3Rvcgo+IHN0YXR1cyBkaWRuJ3Qg YXBwZWFyIHRvIGNoYW5nZSwgYnV0IHRoYXQgc29ydCBvZiB0aGluZyBpcyBxdWl0ZSByYWN5Cj4g YW5kIHdvdWxkIGhhdmUgZmFpbGVkIGFueXdheSBpZiB3ZSBmYWlsZWQgdG8ga2VlcCB1cCB3aXRo IHRoZQo+IGhvdHBsdWdzIChpZiB3ZSBtaXNzZWQgdGhlIEhQRCBkb3duIGluIGJldHdlZW4gdHdv IEhQRCB1cHMpLiBBbmQKPiBub3cgdGhhdCB3ZSB0YWtlIHRoaXMgY29kZXBhdGggdW5jb25kaXRp b25hbGx5IHdlIGRlZmluaXRlbHkgbmVlZAo+IHRvIGRyb3AgdGhlIGdvdG8gYXMgb3RoZXJ3aXNl IHdlIHdvdWxkIG5ldmVyIGRvIHRoZSBFRElEIHJlYWQuCj4gCj4gdjI6IERyb3AgdGhlIGdvdG8g dGhhdCBtYWRlIHVzIHNraXAgRURJRCByZWFkcyBlbnRpcmVseS4gRG9oIQo+IHYzOiBSZWJhc2Ug ZHVlIHRvIGxvY2tpbmcgY2hhbmdlcwo+ICAgICBzL2FwcGFyZWx5L2FwcGFyZW50bHkvIGluIHRo ZSBjb21tZW50IChDaHJpcykKPiAKPiBDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZwo+IENjOiBN YW5hc2kgTmF2YXJlIDxtYW5hc2kuZC5uYXZhcmVAaW50ZWwuY29tPgo+IENjOiBQYWxtZXIgRGFi YmVsdCA8cGFsbWVyQGRhYmJlbHQuY29tPgo+IFJlcG9ydGVkLWJ5OiBQYWxtZXIgRGFiYmVsdCA8 cGFsbWVyQGRhYmJlbHQuY29tPgo+IEJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Au b3JnL3Nob3dfYnVnLmNnaT9pZD05OTc2Ngo+IFJlZmVyZW5jZXM6IGh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL2FyY2hpdmVzL2ludGVsLWdmeC8yMDE3LUZlYnJ1YXJ5LzExOTc3OS5odG1s Cj4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbT4KPiBSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u Y28udWs+CgpBbmQgcHVzaGVkIHRvIGRpbnEuIFRoYW5rcyBmb3IgdGhlIHJldmlldy4KCj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCAxNSArKysrKysrKysrKysrLS0K PiAgMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCj4gCj4g ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcC5jCj4gaW5kZXggMTZiN2JmN2FmNTM3Li4wOTYwMWEyMmQzY2Mg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ICsrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiBAQCAtNDY4NSw5ICs0Njg1LDIwIEBAIGlu dGVsX2RwX2xvbmdfcHVsc2Uoc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9y KQo+ICAJCSAqLwo+ICAJCXN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0dXNfZGlzY29ubmVjdGVkOwo+ ICAJCWdvdG8gb3V0Owo+IC0JfSBlbHNlIGlmIChjb25uZWN0b3ItPnN0YXR1cyA9PSBjb25uZWN0 b3Jfc3RhdHVzX2Nvbm5lY3RlZCkgewo+ICsJfSBlbHNlIHsKPiArCQkvKgo+ICsJCSAqIElmIGRp c3BsYXkgaXMgbm93IGNvbm5lY3RlZCBjaGVjayBsaW5rcyBzdGF0dXMsCj4gKwkJICogdGhlcmUg aGFzIGJlZW4ga25vd24gaXNzdWVzIG9mIGxpbmsgbG9zcyB0cmlnZ2VycmluZwo+ICsJCSAqIGxv bmcgcHVsc2UuCj4gKwkJICoKPiArCQkgKiBTb21lIHNpbmtzIChlZy4gQVNVUyBQQjI4N1EpIHNl ZW0gdG8gcGVyZm9ybSBzb21lCj4gKwkJICogd2VpcmQgSFBEIHBpbmcgcG9uZyBkdXJpbmcgbW9k ZXNldHMuIFNvIHdlIGNhbiBhcHBhcmVudGx5Cj4gKwkJICogZW5kIHVwIHdpdGggSFBEIGdvaW5n IGxvdyBkdXJpbmcgYSBtb2Rlc2V0LCBhbmQgdGhlbgo+ICsJCSAqIGdvaW5nIGJhY2sgdXAgc29v biBhZnRlci4gQW5kIG9uY2UgdGhhdCBoYXBwZW5zIHdlIG11c3QKPiArCQkgKiByZXRyYWluIHRo ZSBsaW5rIHRvIGdldCBhIHBpY3R1cmUuIFRoYXQncyBpbiBjYXNlIG5vCj4gKwkJICogdXNlcnNw YWNlIGNvbXBvbmVudCByZWFjdGVkIHRvIGludGVybWl0dGVudCBIUEQgZGlwLgo+ICsJCSAqLwo+ ICAJCWludGVsX2RwX2NoZWNrX2xpbmtfc3RhdHVzKGludGVsX2RwKTsKPiAtCQlnb3RvIG91dDsK PiAgCX0KPiAgCj4gIAkvKgo+IC0tIAo+IDIuMTAuMgoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRl bCBPVEMKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==