From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manasi Navare Subject: Re: [PATCH v3] drm/i915/dp: Do not reset detect_done flag in intel_dp_detect Date: Tue, 17 Jan 2017 09:40:42 -0800 Message-ID: <20170117174041.GB15796@intel.com> References: <1483082068-5833-1-git-send-email-dhinakaran.pandiyan@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 5543D89C25 for ; Tue, 17 Jan 2017 17:36:49 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1483082068-5833-1-git-send-email-dhinakaran.pandiyan@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: jani.nikula@linux.intel.com Cc: Ander Conselvande Oliveira , intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org SSBoYXZlIHZlcmlmaWVkIHRoaXMgcGF0Y2ggd2l0aCB0aGUgbGF0ZXN0IGRybS10aXAgYW5kIGl0 IGlzIGFsc28KYWJzb2x1dGVseSBuZWNlc3NhcnkgdG8gZW5zdXJlIHRoZSBsaW5rIGdldHMgcHJv cGVybHkgcmV0cmFpbmVkCmFmdGVyIGxpbmstc3RhdHVzIGlzIEJBRCBhbmQgYWZ0ZXIgYW5ldyBt b2Rlc2V0IGlzIHRyaWdnZXJlZCBieQp1c2Vyc3BhY2UuIFdpdGhvdXQgdGhpcyBwYXRjaCwgc2lu Y2UgaW50ZWxfZHBfbG9uZ19wdWxzZSBnZXRzIGNhbGxlZAppdCByZXNldHMgdGhlIGxpbmsgZmFp bHVyZSB2YWx1ZXMgYW5kIGxpbmsgcmV0cmFpbmluZyBkb2VzIG5vdCBoYXBwZW4KYXQgbG93ZXIg bGluayByYXRlcy4KClZpbGxlL0phbmkgY291bGQgeW91IHBsZWFzZSByZXZpZXcgdGhpcyBwYXRj aD8KVGhpIGlzIGRlZmluaXRlbHkgYSBidWcgaW4gdGhlIGV4aXN0aW5nIGNvZGViYXNlIGFuZCB3 ZSBuZWVkIHRvIGdldCB0aGlzIG1lcmdlZApzb29uIHRvIGdldCBpdCBmaXhlZC4KClJlZ2FyZHMK TWFuYXNpCgpPbiBUaHUsIERlYyAyOSwgMjAxNiBhdCAxMToxNDoyOFBNIC0wODAwLCBEaGluYWth cmFuIFBhbmRpeWFuIHdyb3RlOgo+IEZyb206ICJOYXZhcmUsIE1hbmFzaSBEIiA8bWFuYXNpLmQu bmF2YXJlQGludGVsLmNvbT4KPiAKPiBUaGUgZGV0ZWN0X2RvbmUgZmxhZyB3YXMgaW50cm9kdWNl ZCBpbiB0aGUgJ2NvbW1pdCA3ZDIzZTNjMzdiYjMKPiAoImRybS9pOTE1OiBDbGVhbmluZyB1cCBp bnRlbF9kcF9ocGRfcHVsc2UiKScgaW4gb3JkZXIgdG8gYXZvaWQgbXVsdGlwbGUKPiBkZXRlY3Rz IG9uIGhvdHBsdWcgd2hlcmUgaW50ZWxfZHBfbG9uZ19wdWxzZSgpIHdhcyBjYWxsZWQgZnJvbSBI UEQgaGFuZGxlcgo+IGFzIHdlbGwgYXMgaW50ZWxfZHBfZGV0ZWN0KCkuIExhdGVyLCAnY29tbWl0 IDEwMTU4MTE2MDljMAo+ICgiZHJtL2k5MTU6IE1vdmUgbG9uZyBocGQgaGFuZGxpbmcgaW50byB0 aGUgaG90cGx1ZyB3b3JrIiknIGRlZmVycmVkIGxvbmcKPiBocGQgaGFuZGxpbmcgdG8gaG90cGx1 ZyB3b3JrIHRvIGF2b2lkIGhhbmRsaW5nIGl0IHR3aWNlLiBCdXQsIHJlc2V0dGluZyB0aGUKPiBm bGFnIGFmdGVyIGxvbmcgaHBkIGhhbmRsaW5nIGxlYWRzIHRvIHRoZSBjb2RlIGJlaW5nIGV4ZWN1 dGVkIGFnYWluIGR1cmluZwo+IG1vZGUgZW51bWVyYXRpb24uCj4gCj4gU28sIGRvIG5vdCByZXNl dCB0aGUgZGV0ZWN0X2RvbmUgZmxhZyB0byBGYWxzZSBpbiBpbnRlbF9kcF9kZXRlY3QoKS4gVGhl Cj4gZmxhZyBpcyByZXNldCBpbiBpbnRlbF9kcF9ocGRfcHVsc2UoKSB0byBhbGxvdyBhIGZ1bGwg ZGV0ZWN0IGFuZCBzZXQgd2hlbgo+IHRoZSBob3RwbHVnIHdvcmsgZG9lcyBhIGZ1bGwgRFBDRCBk ZXRlY3QuIEhvd2V2ZXIgaWYgLT5kZXRlY3QoKSBnZXRzIGNhbGxlZAo+IGR1cmluZyBtb2RlIGVu dW1lcmF0aW9uIGFmdGVyIGEgRFBDRCBkZXRlY3QsIHJldHVybiB0aGUgY2FjaGVkIGNvbm5lY3Rv cgo+IHN0YXR1cy4KPiAKPiBSZXNldHRpbmcgdGhlIGZsYWcgaW4gdGhlIGVuY29kZXIncyByZXNl dCBjYWxsYmFjayBzaG91bGQgdGFrZSBjYXJlIG9mCj4gaG90cGx1ZyBiZXR3ZWVuIHN1c3BlbmQv cmVzdW1lLgo+IAo+IHYyOgo+IEFsbG93IGZ1bGwgZGV0ZWN0IGFmdGVyIGVuY29kZXIgcmVzZXQu IChWaWxsZSkKPiBTZXQgdGhlIGRldGVjdF9kb25lIGZsYWcgZm9yIGNvbm5lY3RvciBkaXNjb25u ZWN0ZWQgY2FzZSB0b28uIChESykKPiBDb21taXQgbWVzc2FnZSBjaGFuZ2VzLgo+IAo+IENjOiBz dGFibGVAdmdlci5rZXJuZWwub3JnCj4gQ2M6IFZpbGxlIFN5cmphbGEgPHZpbGxlLnN5cmphbGFA bGludXguaW50ZWwuY29tPgo+IENjOiBBbmRlciBDb25zZWx2YW5kZSBPbGl2ZWlyYSA8YW5kZXIu Y29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KPiBDYzogSmFuaSBOaWt1bGEgPGphbmku bmlrdWxhQGxpbnV4LmludGVsLmNvbT4KPiBGaXhlczogY29tbWl0IDdkMjNlM2MzN2JiMyAoImRy bS9pOTE1OiBDbGVhbmluZyB1cCBpbnRlbF9kcF9ocGRfcHVsc2UiKQo+IFNpZ25lZC1vZmYtYnk6 IE1hbmFzaSBOYXZhcmUgPG1hbmFzaS5kLm5hdmFyZUBpbnRlbC5jb20+Cj4gU2lnbmVkLW9mZi1i eTogRGhpbmFrYXJhbiBQYW5kaXlhbiA8ZGhpbmFrYXJhbi5wYW5kaXlhbkBpbnRlbC5jb20+Cj4g LS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCA5ICsrKysrLS0tLQo+ICAx IGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHAuYwo+IGluZGV4IGZiMTI4OTYuLjY3MzJjMTcgMTAwNjQ0Cj4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMKPiBAQCAtNDUxNiw3ICs0NTE2LDYgQEAgaW50ZWxfZHBfbG9uZ19wdWxz ZShzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IpCj4gIAlpbnRlbF9kcF9z ZXRfZWRpZChpbnRlbF9kcCk7Cj4gIAlpZiAoaXNfZWRwKGludGVsX2RwKSB8fCBpbnRlbF9jb25u ZWN0b3ItPmRldGVjdF9lZGlkKQo+ICAJCXN0YXR1cyA9IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVj dGVkOwo+IC0JaW50ZWxfZHAtPmRldGVjdF9kb25lID0gdHJ1ZTsKPiAgCj4gIAkvKiBUcnkgdG8g cmVhZCB0aGUgc291cmNlIG9mIHRoZSBpbnRlcnJ1cHQgKi8KPiAgCWlmIChpbnRlbF9kcC0+ZHBj ZFtEUF9EUENEX1JFVl0gPj0gMHgxMSAmJgo+IEBAIC00NTUxLDEwICs0NTUwLDEwIEBAIGludGVs X2RwX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLCBib29sIGZvcmNlKQo+ ICAJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVjdG9yLT5uYW1lKTsKPiAgCj4gIAkv KiBJZiBmdWxsIGRldGVjdCBpcyBub3QgcGVyZm9ybWVkIHlldCwgZG8gYSBmdWxsIGRldGVjdCAq Lwo+IC0JaWYgKCFpbnRlbF9kcC0+ZGV0ZWN0X2RvbmUpCj4gKwlpZiAoIWludGVsX2RwLT5kZXRl Y3RfZG9uZSkgewo+ICsJCWludGVsX2RwLT5kZXRlY3RfZG9uZSA9IHRydWU7Cj4gIAkJc3RhdHVz ID0gaW50ZWxfZHBfbG9uZ19wdWxzZShpbnRlbF9kcC0+YXR0YWNoZWRfY29ubmVjdG9yKTsKPiAt Cj4gLQlpbnRlbF9kcC0+ZGV0ZWN0X2RvbmUgPSBmYWxzZTsKPiArCX0KPiAgCj4gIAlyZXR1cm4g c3RhdHVzOwo+ICB9Cj4gQEAgLTQ4NTksNiArNDg1OCw4IEBAIHZvaWQgaW50ZWxfZHBfZW5jb2Rl cl9yZXNldChzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIpCj4gIAlpZiAobHNwY29uLT5hY3Rp dmUpCj4gIAkJbHNwY29uX3Jlc3VtZShsc3Bjb24pOwo+ICAKPiArCWludGVsX2RwLT5kZXRlY3Rf ZG9uZSA9IGZhbHNlOwo+ICsKPiAgCXBwc19sb2NrKGludGVsX2RwKTsKPiAgCj4gIAlpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCj4gLS0gCj4g Mi43LjQKPiAKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com ([134.134.136.65]:29570 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbdAQRhZ (ORCPT ); Tue, 17 Jan 2017 12:37:25 -0500 Date: Tue, 17 Jan 2017 09:40:42 -0800 From: Manasi Navare To: jani.nikula@linux.intel.com Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org, Ville Syrjala , Ander Conselvande Oliveira , Jani Nikula Subject: Re: [PATCH v3] drm/i915/dp: Do not reset detect_done flag in intel_dp_detect Message-ID: <20170117174041.GB15796@intel.com> References: <1483082068-5833-1-git-send-email-dhinakaran.pandiyan@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1483082068-5833-1-git-send-email-dhinakaran.pandiyan@intel.com> Sender: stable-owner@vger.kernel.org List-ID: I have verified this patch with the latest drm-tip and it is also absolutely necessary to ensure the link gets properly retrained after link-status is BAD and after anew modeset is triggered by userspace. Without this patch, since intel_dp_long_pulse gets called it resets the link failure values and link retraining does not happen at lower link rates. Ville/Jani could you please review this patch? Thi is definitely a bug in the existing codebase and we need to get this merged soon to get it fixed. Regards Manasi On Thu, Dec 29, 2016 at 11:14:28PM -0800, Dhinakaran Pandiyan wrote: > From: "Navare, Manasi D" > > The detect_done flag was introduced in the 'commit 7d23e3c37bb3 > ("drm/i915: Cleaning up intel_dp_hpd_pulse")' in order to avoid multiple > detects on hotplug where intel_dp_long_pulse() was called from HPD handler > as well as intel_dp_detect(). Later, 'commit 1015811609c0 > ("drm/i915: Move long hpd handling into the hotplug work")' deferred long > hpd handling to hotplug work to avoid handling it twice. But, resetting the > flag after long hpd handling leads to the code being executed again during > mode enumeration. > > So, do not reset the detect_done flag to False in intel_dp_detect(). The > flag is reset in intel_dp_hpd_pulse() to allow a full detect and set when > the hotplug work does a full DPCD detect. However if ->detect() gets called > during mode enumeration after a DPCD detect, return the cached connector > status. > > Resetting the flag in the encoder's reset callback should take care of > hotplug between suspend/resume. > > v2: > Allow full detect after encoder reset. (Ville) > Set the detect_done flag for connector disconnected case too. (DK) > Commit message changes. > > Cc: stable@vger.kernel.org > Cc: Ville Syrjala > Cc: Ander Conselvande Oliveira > Cc: Jani Nikula > Fixes: commit 7d23e3c37bb3 ("drm/i915: Cleaning up intel_dp_hpd_pulse") > Signed-off-by: Manasi Navare > Signed-off-by: Dhinakaran Pandiyan > --- > drivers/gpu/drm/i915/intel_dp.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index fb12896..6732c17 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -4516,7 +4516,6 @@ intel_dp_long_pulse(struct intel_connector *intel_connector) > intel_dp_set_edid(intel_dp); > if (is_edp(intel_dp) || intel_connector->detect_edid) > status = connector_status_connected; > - intel_dp->detect_done = true; > > /* Try to read the source of the interrupt */ > if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11 && > @@ -4551,10 +4550,10 @@ intel_dp_detect(struct drm_connector *connector, bool force) > connector->base.id, connector->name); > > /* If full detect is not performed yet, do a full detect */ > - if (!intel_dp->detect_done) > + if (!intel_dp->detect_done) { > + intel_dp->detect_done = true; > status = intel_dp_long_pulse(intel_dp->attached_connector); > - > - intel_dp->detect_done = false; > + } > > return status; > } > @@ -4859,6 +4858,8 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder) > if (lspcon->active) > lspcon_resume(lspcon); > > + intel_dp->detect_done = false; > + > pps_lock(intel_dp); > > if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > -- > 2.7.4 >