From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH v3] drm/i915: intel_hpd_init(): Fix suspend/resume reprobing Date: Thu, 7 Jan 2016 17:10:59 +0100 Message-ID: <20160107161059.GU8076@phenom.ffwll.local> References: <20160106072743.GV8076@phenom.ffwll.local> <1452181408-14777-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1452181408-14777-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lyude Cc: David Airlie , Benjamin Tissoires , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBKYW4gMDcsIDIwMTYgYXQgMTA6NDM6MjhBTSAtMDUwMCwgTHl1ZGUgd3JvdGU6Cj4g VGhpcyBmaXhlcyByZXByb2Jpbmcgb2YgZGlzcGxheSBjb25uZWN0b3JzIG9uIHJlc3VtZS4gIEFm dGVyIHNvbWUKPiB0YWxraW5nIHdpdGggZGFudmV0IG9uIElSQywgSSBsZWFybmVkIHRoYXQgY2Fs bGluZwo+IGRybV9oZWxwZXJfaHBkX2lycV9ldmVudCgpIGRvZXMgYWN0dWFsbHkgdHJpZ2dlciBh IGZ1bGwgcmVwcm9iZSBvZiBlYWNoCj4gY29ubmVjdG9yJ3Mgc3RhdHVzLiBJdCB0dXJucyBvdXQg dGhpcyBpcyB0aGUgYWN0dWFsIHJlYXNvbiByZXByb2Jpbmcgb24KPiByZXN1bWUgaGFzbid0IGJl ZW4gd29ya2luZyAodGhpcyB3YXMgb2JzZXJ2ZWQgb24gYSBUNDQwcyk6Cj4gCj4gCS0gV2UgY2Fs bCBocGRfaW5pdCgpCj4gCS0gV2UgY2hlY2sgZWFjaCBjb25uZWN0b3IgZm9yIGEgY291cGxlIG9m IHRoaW5ncyBiZWZvcmUgbWFya2luZwo+IAkgIGNvbm5lY3Rvci0+cG9sbGVkIHdpdGggRFJNX0NP Tk5FQ1RPUl9QT0xMX0hQRCwgb25lIG9mIHdoaWNoIGlzIGFuCj4gCSAgYWN0aXZlIGVuY29kZXIu IE9mIGNvdXJzZSwgYSBkaXNjb25uZWN0ZWQgcG9ydCB3b24ndCBoYXZlIGFuCj4gCSAgYWN0aXZl IGVuY29kZXIsIHNvIHdlIGRvbid0IGFkZCB0aGUgZmxhZyB0byBhbnkgb2YgdGhlCj4gCSAgY29u bmVjdG9ycy4KPiAJLSBXZSBjYWxsIGRybV9oZWxwZXJfaHBkX2lycV9ldmVudCgpCj4gCS0gZHJt X2hlbHBlcl9pcnFfZXZlbnQoKSBjaGVja3MgZWFjaCBjb25uZWN0b3IgZm9yIHRoZQo+IAkgIERS TV9DT05ORUNUT1JfUE9MTF9IUEQgZmxhZy4gVGhlIG9ubHkgb25lIHRoYXQgaGFzIGl0IGlzIGVE UC0xLAo+IAkgIHNvIHdlIHNraXAgcmVwcm9iaW5nIGVhY2ggY29ubmVjdG9yIGV4Y2VwdCB0aGF0 IG9uZS4KPiAKPiBJbiBhZGRpdGlvbiwgd2UgYWxzbyBub3cgYXZvaWQgc2V0dGluZyBjb25uZWN0 b3ItPnBvbGxlZCB0bwo+IERSTV9DT05ORUNUT1JfUE9MTF9IUEQgZm9yIE1TVCBjb25uZWN0b3Jz LCBzaW5jZSB0aGVpciByZXByb2JpbmcgaXMKPiBoYW5kbGVkIGJ5IHRoZSBtc3QgaGVscGVycy4g VGhpcyBpcyBwcm9iYWJseSB3aGF0IHdhcyBvcmlnaW5hbGx5Cj4gaW50ZW5kZWQgdG8gaGFwcGVu IGhlcmUuCj4gCj4gQ2hhbmdlcyBzaW5jZSBWMToKPiAqIFVzZSB0aGUgZXhwbGFuYXRpb24gb2Yg dGhlIGlzc3VlIGFzIHRoZSBjb21taXQgbWVzc2FnZSBpbnN0ZWFkCj4gKiBDaGFuZ2UgdGhlIHRp dGxlIG9mIHRoZSBjb21taXQsIHNpbmNlIHRoaXMgZG9lcyBtb3JlIHRoZW4ganVzdCBzdG9wIGEK PiAgIGNoZWNrIGZvciBhbiBlbmNvZGVyIG5vdwo+ICogQWRkICJGaXhlcyIgbGluZSBmb3IgdGhl IHBhdGNoIHRoYXQgaW50cm9kdWNlZCB0aGlzIHJlZ3Jlc3Npb24KPiAqIERvbid0IGVuYWJsZSBE Uk1fQ09OTkVDVE9SX1BPTExfSFBEIGZvciBtc3QgY29ubmVjdG9ycwo+IAo+IENoYW5nZXMgc2lu Y2UgVjI6Cj4gKiBQdXQgcGF0Y2ggY2hhbmdlbG9nIGFib3ZlIFNpZ25lZC1vZmYtYnkKPiAqIEZv bGxvdyBEYW5pZWwgVmV0dGVyJ3Mgc3VnZ2VzdGlvbiBmb3IgbWFraW5nIHRoZSBjb2RlIGhlcmUg YSBiaXQgbW9yZQo+ICAgbGVnaWJsZQo+IAo+IEZpeGVzOiAwZTMyYjM5Y2VlZDYgKCJkcm0vaTkx NTogYWRkIERQIDEuMiBNU1Qgc3VwcG9ydCAodjAuNykiKQo+IENjOiBzdGFibGVAdmdlci5rZXJu ZWwub3JnCj4gU2lnbmVkLW9mZi1ieTogTHl1ZGUgPGNwYXVsQHJlZGhhdC5jb20+CgpBd2Vzb21l LCBhbmQgbWVyZ2VkIHRvIGRybS1pbnRlbC4KClRoYW5rcywgRGFuaWVsCgo+IC0tLQo+ICBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMgfCA5ICsrKysrKystLQo+ICAxIGZpbGUg Y2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ob3RwbHVnLmMKPiBpbmRleCBiMTc3ODU3Li5kN2E2NDM3IDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYwo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYwo+IEBAIC00NjgsOSArNDY4LDE0IEBAIHZvaWQg aW50ZWxfaHBkX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICAJbGlz dF9mb3JfZWFjaF9lbnRyeShjb25uZWN0b3IsICZtb2RlX2NvbmZpZy0+Y29ubmVjdG9yX2xpc3Qs IGhlYWQpIHsKPiAgCQlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IgPSB0 b19pbnRlbF9jb25uZWN0b3IoY29ubmVjdG9yKTsKPiAgCQljb25uZWN0b3ItPnBvbGxlZCA9IGlu dGVsX2Nvbm5lY3Rvci0+cG9sbGVkOwo+IC0JCWlmIChjb25uZWN0b3ItPmVuY29kZXIgJiYgIWNv bm5lY3Rvci0+cG9sbGVkICYmIEk5MTVfSEFTX0hPVFBMVUcoZGV2KSAmJiBpbnRlbF9jb25uZWN0 b3ItPmVuY29kZXItPmhwZF9waW4gPiBIUERfTk9ORSkKPiAtCQkJY29ubmVjdG9yLT5wb2xsZWQg PSBEUk1fQ09OTkVDVE9SX1BPTExfSFBEOwo+ICsKPiArCQkvKiBNU1QgaGFzIGEgZHluYW1pYyBp bnRlbF9jb25uZWN0b3ItPmVuY29kZXIgYW5kIGl0J3MgcmVwcm9iaW5nCj4gKwkJICogaXMgYWxs IGhhbmRsZWQgYnkgdGhlIE1TVCBoZWxwZXJzLiAqLwo+ICAJCWlmIChpbnRlbF9jb25uZWN0b3It Pm1zdF9wb3J0KQo+ICsJCQljb250aW51ZTsKPiArCj4gKwkJaWYgKCFjb25uZWN0b3ItPnBvbGxl ZCAmJiBJOTE1X0hBU19IT1RQTFVHKGRldikgJiYKPiArCQkgICAgaW50ZWxfY29ubmVjdG9yLT5l bmNvZGVyLT5ocGRfcGluID4gSFBEX05PTkUpCj4gIAkJCWNvbm5lY3Rvci0+cG9sbGVkID0gRFJN X0NPTk5FQ1RPUl9QT0xMX0hQRDsKPiAgCX0KPiAgCj4gLS0gCj4gMi41LjAKPiAKPiBfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWls aW5nIGxpc3QKPiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAoKLS0gCkRhbmllbCBW ZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZm d2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753568AbcAGQLF (ORCPT ); Thu, 7 Jan 2016 11:11:05 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38140 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751896AbcAGQLB (ORCPT ); Thu, 7 Jan 2016 11:11:01 -0500 Date: Thu, 7 Jan 2016 17:10:59 +0100 From: Daniel Vetter To: Lyude Cc: Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Benjamin Tissoires , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH v3] drm/i915: intel_hpd_init(): Fix suspend/resume reprobing Message-ID: <20160107161059.GU8076@phenom.ffwll.local> Mail-Followup-To: Lyude , Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Benjamin Tissoires , stable@vger.kernel.org References: <20160106072743.GV8076@phenom.ffwll.local> <1452181408-14777-1-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452181408-14777-1-git-send-email-cpaul@redhat.com> X-Operating-System: Linux phenom 4.3.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 07, 2016 at 10:43:28AM -0500, Lyude wrote: > This fixes reprobing of display connectors on resume. After some > talking with danvet on IRC, I learned that calling > drm_helper_hpd_irq_event() does actually trigger a full reprobe of each > connector's status. It turns out this is the actual reason reprobing on > resume hasn't been working (this was observed on a T440s): > > - We call hpd_init() > - We check each connector for a couple of things before marking > connector->polled with DRM_CONNECTOR_POLL_HPD, one of which is an > active encoder. Of course, a disconnected port won't have an > active encoder, so we don't add the flag to any of the > connectors. > - We call drm_helper_hpd_irq_event() > - drm_helper_irq_event() checks each connector for the > DRM_CONNECTOR_POLL_HPD flag. The only one that has it is eDP-1, > so we skip reprobing each connector except that one. > > In addition, we also now avoid setting connector->polled to > DRM_CONNECTOR_POLL_HPD for MST connectors, since their reprobing is > handled by the mst helpers. This is probably what was originally > intended to happen here. > > Changes since V1: > * Use the explanation of the issue as the commit message instead > * Change the title of the commit, since this does more then just stop a > check for an encoder now > * Add "Fixes" line for the patch that introduced this regression > * Don't enable DRM_CONNECTOR_POLL_HPD for mst connectors > > Changes since V2: > * Put patch changelog above Signed-off-by > * Follow Daniel Vetter's suggestion for making the code here a bit more > legible > > Fixes: 0e32b39ceed6 ("drm/i915: add DP 1.2 MST support (v0.7)") > Cc: stable@vger.kernel.org > Signed-off-by: Lyude Awesome, and merged to drm-intel. Thanks, Daniel > --- > drivers/gpu/drm/i915/intel_hotplug.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c > index b177857..d7a6437 100644 > --- a/drivers/gpu/drm/i915/intel_hotplug.c > +++ b/drivers/gpu/drm/i915/intel_hotplug.c > @@ -468,9 +468,14 @@ void intel_hpd_init(struct drm_i915_private *dev_priv) > list_for_each_entry(connector, &mode_config->connector_list, head) { > struct intel_connector *intel_connector = to_intel_connector(connector); > connector->polled = intel_connector->polled; > - if (connector->encoder && !connector->polled && I915_HAS_HOTPLUG(dev) && intel_connector->encoder->hpd_pin > HPD_NONE) > - connector->polled = DRM_CONNECTOR_POLL_HPD; > + > + /* MST has a dynamic intel_connector->encoder and it's reprobing > + * is all handled by the MST helpers. */ > if (intel_connector->mst_port) > + continue; > + > + if (!connector->polled && I915_HAS_HOTPLUG(dev) && > + intel_connector->encoder->hpd_pin > HPD_NONE) > connector->polled = DRM_CONNECTOR_POLL_HPD; > } > > -- > 2.5.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch