From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Check DP link status on long hpd too Date: Fri, 21 Aug 2015 09:40:12 +0300 Message-ID: <87lhd5b0vn.fsf@intel.com> References: <1440088649-27549-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C06F6E563 for ; Thu, 20 Aug 2015 23:37:19 -0700 (PDT) In-Reply-To: <1440088649-27549-1-git-send-email-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: ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org Cc: Dave Airlie , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gVGh1LCAyMCBBdWcgMjAxNSwgdmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20gd3JvdGU6 Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K Pgo+IFdlIGFyZSBubyBsb25nZXIgY2hlY2tsaW5nIHRoZSBEUCBsaW5rIHN0YXR1cyBvbiBsb25n IGhwZC4gV2UgdXNlZCB0byBkbwo+IHRoYXQgZnJvbSB0aGUgLmhvdF9wbHVnKCkgaGFuZGxlciwg YnV0IGl0IHdhcyByZW1vdmVkIHdoZW4gTVNUIGdvdAo+IGludHJvZHVjZWQuCj4KPiBJZiB0aGVy ZSdzIG5vIHVzZXJzcGFjZSB3ZSBub3cgZmFpbCB0byByZXRyYWluIHRoZSBsaW5rIGlmIHRoZSBz aW5rCj4gcG93ZXIgaXMgdG9nZ2xlZCAob3IgY2FibGUgeWFua2VkIGFuZCByZXBsdWdnZWQpLCBt ZWFuaW5nIHRoZSB1c2VyIGlzCj4gbGVmdCBzdGFyaW5nIGF0IGEgYmxhbmsgc2NyZWVuLiBXaXRo IHRoZSByZXRyYWluaW5nIHB1dCBiYWNrIHRoYXQgc2hvdWxkCj4gYmUgZml4ZWQuCj4KPiBBbHNv IHJlbW92ZSB0aGUgbGVmdG92ZXIgY29tbWVudCB0aGF0IHJlZmVycmVkIHRvIHRoZSBvbGQgcmV0 cmFpbmluZwo+IGZyb20gLmhvdF9wbHVnKCkuCj4KPiBGaXhlcyBhIHJlZ3Jlc3Npb24gaW50cm9k dWNlZCBpbjoKPiBjb21taXQgMGUzMmIzOWNlZWQ2NjViZmE0YTc3YTRiYzMwN2I2NjUyYjk5MTYz Mgo+IEF1dGhvcjogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KPiBEYXRlOiAgIEZy aSBNYXkgMiAxNDowMjo0OCAyMDE0ICsxMDAwCj4KPiAgICAgZHJtL2k5MTU6IGFkZCBEUCAxLjIg TVNUIHN1cHBvcnQgKHYwLjcpCj4KPiBCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9w Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk0NTMKClRlc3RlZC1ieTogUGFsbWVyIERhYmJlbHQgPHBh bG1lckBkYWJiZWx0LmNvbT4KCj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5v cmcvc2hvd19idWcuY2dpP2lkPTkxNDA3Cj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVz a3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NDYxCj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5m cmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NTk0Cj4gQnVnemlsbGE6IGh0dHBzOi8v YnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg1NjQxCj4gQ2M6IERhdmUgQWly bGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Cj4gQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcKPiBT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIHwgMTEgKysrKyst LS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkK Pgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+IGluZGV4IGQzMmNlNDguLmIwMTQxNTggMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RwLmMKPiBAQCAtNTAyNCw5ICs1MDI0LDEyIEBAIGludGVsX2Rw X2hwZF9wdWxzZShzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwgYm9v bCBsb25nX2hwZCkKPiAgCj4gIAkJaW50ZWxfZHBfcHJvYmVfb3VpKGludGVsX2RwKTsKPiAgCj4g LQkJaWYgKCFpbnRlbF9kcF9wcm9iZV9tc3QoaW50ZWxfZHApKQo+ICsJCWlmICghaW50ZWxfZHBf cHJvYmVfbXN0KGludGVsX2RwKSkgewo+ICsJCQlkcm1fbW9kZXNldF9sb2NrKCZkZXYtPm1vZGVf Y29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwo+ICsJCQlpbnRlbF9kcF9jaGVja19saW5r X3N0YXR1cyhpbnRlbF9kcCk7Cj4gKwkJCWRybV9tb2Rlc2V0X3VubG9jaygmZGV2LT5tb2RlX2Nv bmZpZy5jb25uZWN0aW9uX211dGV4KTsKPiAgCQkJZ290byBtc3RfZmFpbDsKPiAtCj4gKwkJfQo+ ICAJfSBlbHNlIHsKPiAgCQlpZiAoaW50ZWxfZHAtPmlzX21zdCkgewo+ICAJCQlpZiAoaW50ZWxf ZHBfY2hlY2tfbXN0X3N0YXR1cyhpbnRlbF9kcCkgPT0gLUVJTlZBTCkKPiBAQCAtNTAzNCwxMCAr NTAzNyw2IEBAIGludGVsX2RwX2hwZF9wdWxzZShzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICpp bnRlbF9kaWdfcG9ydCwgYm9vbCBsb25nX2hwZCkKPiAgCQl9Cj4gIAo+ICAJCWlmICghaW50ZWxf ZHAtPmlzX21zdCkgewo+IC0JCQkvKgo+IC0JCQkgKiB3ZSdsbCBjaGVjayB0aGUgbGluayBzdGF0 dXMgdmlhIHRoZSBub3JtYWwgaG90IHBsdWcgcGF0aCBsYXRlciAtCj4gLQkJCSAqIGJ1dCBmb3Ig c2hvcnQgaHBkcyB3ZSBzaG91bGQgY2hlY2sgaXQgbm93Cj4gLQkJCSAqLwo+ICAJCQlkcm1fbW9k ZXNldF9sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwo+ICAJ CQlpbnRlbF9kcF9jaGVja19saW5rX3N0YXR1cyhpbnRlbF9kcCk7Cj4gIAkJCWRybV9tb2Rlc2V0 X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4KTsKPiAtLSAKPiAyLjQu Ngo+Cj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJ bnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+ IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK Ci0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9neSBDZW50ZXIKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:26073 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844AbbHUGhT convert rfc822-to-8bit (ORCPT ); Fri, 21 Aug 2015 02:37:19 -0400 From: Jani Nikula To: ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org Cc: Dave Airlie , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Check DP link status on long hpd too In-Reply-To: <1440088649-27549-1-git-send-email-ville.syrjala@linux.intel.com> References: <1440088649-27549-1-git-send-email-ville.syrjala@linux.intel.com> Date: Fri, 21 Aug 2015 09:40:12 +0300 Message-ID: <87lhd5b0vn.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: On Thu, 20 Aug 2015, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä > > We are no longer checkling the DP link status on long hpd. We used to do > that from the .hot_plug() handler, but it was removed when MST got > introduced. > > If there's no userspace we now fail to retrain the link if the sink > power is toggled (or cable yanked and replugged), meaning the user is > left staring at a blank screen. With the retraining put back that should > be fixed. > > Also remove the leftover comment that referred to the old retraining > from .hot_plug(). > > Fixes a regression introduced in: > commit 0e32b39ceed665bfa4a77a4bc307b6652b991632 > Author: Dave Airlie > Date: Fri May 2 14:02:48 2014 +1000 > > drm/i915: add DP 1.2 MST support (v0.7) > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89453 Tested-by: Palmer Dabbelt > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91407 > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89461 > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89594 > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85641 > Cc: Dave Airlie > Cc: stable@vger.kernel.org > Signed-off-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/intel_dp.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index d32ce48..b014158 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -5024,9 +5024,12 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) > > intel_dp_probe_oui(intel_dp); > > - if (!intel_dp_probe_mst(intel_dp)) > + if (!intel_dp_probe_mst(intel_dp)) { > + drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); > + intel_dp_check_link_status(intel_dp); > + drm_modeset_unlock(&dev->mode_config.connection_mutex); > goto mst_fail; > - > + } > } else { > if (intel_dp->is_mst) { > if (intel_dp_check_mst_status(intel_dp) == -EINVAL) > @@ -5034,10 +5037,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) > } > > if (!intel_dp->is_mst) { > - /* > - * we'll check the link status via the normal hot plug path later - > - * but for short hpds we should check it now > - */ > drm_modeset_lock(&dev->mode_config.connection_mutex, NULL); > intel_dp_check_link_status(intel_dp); > drm_modeset_unlock(&dev->mode_config.connection_mutex); > -- > 2.4.6 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center