From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH] drm/i915: intel_hpd_init(): Don't check connectors for an encoder Date: Tue, 5 Jan 2016 21:05:49 +0100 Message-ID: <20160105200549.GS8076@phenom.ffwll.local> References: <1452023588-3857-1-git-send-email-cpaul@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BBB26E217 for ; Tue, 5 Jan 2016 12:05:53 -0800 (PST) Received: by mail-wm0-f52.google.com with SMTP id f206so36453421wmf.0 for ; Tue, 05 Jan 2016 12:05:53 -0800 (PST) Content-Disposition: inline In-Reply-To: <1452023588-3857-1-git-send-email-cpaul@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Lyude Cc: Benjamin Tissoires , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBKYW4gMDUsIDIwMTYgYXQgMDI6NTM6MDhQTSAtMDUwMCwgTHl1ZGUgd3JvdGU6Cj4g VGhlcmUncyBubyByZWFzb24gdG8gY2hlY2sgZm9yIGFuIGFjdGl2ZSBlbmNvZGVyIHdoZW4gc2V0 dGluZyB1cCBocGQsCj4gZXNwZWNpYWxseSBzaW5jZSBhIGRpc2Nvbm5lY3RlZCBjb25uZWN0b3Ig aXNuJ3QgZ29pbmcgdG8gaGF2ZSBhbiBlbmNvZGVyCj4gaW4gdGhlIGZpcnN0IHBsYWNlLiBUaGlz IGZpeGVzIHJlcHJvYmluZyBkaXNwbGF5IGNvbm5lY3RvcnMgb24gcmVzdW1lLgo+IAo+IFNpZ25l ZC1vZmYtYnk6IEx5dWRlIDxjcGF1bEByZWRoYXQuY29tPgo+IC0tLQo+IEFmdGVyIHNvbWUgdGFs a2luZyB3aXRoIGRhbnZldCBvbiBJUkMsIEkgbGVhcm5lZCB0aGF0IGNhbGxpbmcKPiBkcm1faGVs cGVyX2hwZF9pcnFfZXZlbnQoKSBkb2VzIGFjdHVhbGx5IHRyaWdnZXIgYSBmdWxsIHJlcHJvYmUg b2YgZWFjaAo+IGNvbm5lY3RvcidzIHN0YXR1cy4gSXQgdHVybnMgb3V0IHRoaXMgaXMgdGhlIGFj dHVhbCByZWFzb24gcmVwcm9iaW5nIG9uIHJlc3VtZQo+IGhhc24ndCBiZWVuIHdvcmtpbmcgKHRo aXMgd2FzIG9ic2VydmVkIG9uIGEgVDQ0MHMpOgo+IAo+IAktIFdlIGNhbGwgaHBkX2luaXQoKQo+ IAktIFdlIGNoZWNrIGVhY2ggY29ubmVjdG9yIGZvciBhIGNvdXBsZSBvZiB0aGluZ3MgYmVmb3Jl IG1hcmtpbmcKPiAJICBjb25uZWN0b3ItPnBvbGxlZCB3aXRoIERSTV9DT05ORUNUT1JfUE9MTF9I UEQsIG9uZSBvZiB3aGljaCBpcyBhbgo+IAkgIGFjdGl2ZSBlbmNvZGVyLiBPZiBjb3Vyc2UsIGEg ZGlzY29ubmVjdGVkIHBvcnQgd29uJ3QgaGF2ZSBhbiBhY3RpdmUKPiAJICBlbmNvZGVyLCBzbyB3 ZSBkb24ndCBhZGQgdGhlIGZsYWcgdG8gYW55IG9mIHRoZSBjb25uZWN0b3Incy4KPiAJLSBXZSBj YWxsIGRybV9oZWxwZXJfaHBkX2lycV9ldmVudCgpCj4gCS0gZHJtX2hlbHBlcl9pcnFfZXZlbnQo KSBjaGVja3MgZWFjaCBjb25uZWN0b3IgZm9yIHRoZQo+IAkgIERSTV9DT05ORUNUT1JfUE9MTF9I UEQgZmxhZy4gVGhlIG9ubHkgb25lIHRoYXQgaGFzIGl0IGlzIGVEUC0xLCBzbyB3ZQo+IAkgIHNr aXAgcmVwcm9iaW5nIGVhY2ggY29ubmVjdG9yIGV4Y2VwdCB0aGF0IG9uZS4KClRoZSBhYm92ZSBl eHBsYW5hdGlvbiBzaG91bGQgYmUgcGFydCBvZiB0aGUgY29tbWl0IG1lc3NhZ2UsIG90aGVyd2lz ZSBpdCdzCmhhcmQgdG8gdW5kZXJzdGFuZCB0aGUgaW1wYWN0IG9mIHRoaXMgZml4LgoKRml4ZXM6 IDBlMzJiMzljZWVkNiAoImRybS9pOTE1OiBhZGQgRFAgMS4yIE1TVCBzdXBwb3J0ICh2MC43KSIp CkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnCgpVbmZvcnR1bmF0ZWx5IERhdmUgZG9lc24ndCBl eHBsYWluIGluIGhpcyBNU1QgY29tbWl0IHdoeSBoZSdzIGRvbmUgdGhpcy4KRGF2ZT8gSSBjYW4n dCBjb21lIHVwIHdpdGggYSByZWFzb24sIGJ1dCBiZXR0ZXIgdG8gdGVzdCB0aGF0LiBMeXVkZT8K CkFueXdheSBsb29rcyBnb29kIHRvIG1lLgoKUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRh bmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cgo+IAo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o b3RwbHVnLmMgfCAyICstCj4gIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxl dGlvbigtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3Rw bHVnLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMKPiBpbmRleCBiMTc3 ODU3Li4xODc5N2JjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hv dHBsdWcuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYwo+IEBA IC00NjgsNyArNDY4LDcgQEAgdm9pZCBpbnRlbF9ocGRfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCj4gIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJm1vZGVf Y29uZmlnLT5jb25uZWN0b3JfbGlzdCwgaGVhZCkgewo+ICAJCXN0cnVjdCBpbnRlbF9jb25uZWN0 b3IgKmludGVsX2Nvbm5lY3RvciA9IHRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpOwo+ICAJ CWNvbm5lY3Rvci0+cG9sbGVkID0gaW50ZWxfY29ubmVjdG9yLT5wb2xsZWQ7Cj4gLQkJaWYgKGNv bm5lY3Rvci0+ZW5jb2RlciAmJiAhY29ubmVjdG9yLT5wb2xsZWQgJiYgSTkxNV9IQVNfSE9UUExV RyhkZXYpICYmIGludGVsX2Nvbm5lY3Rvci0+ZW5jb2Rlci0+aHBkX3BpbiA+IEhQRF9OT05FKQo+ ICsJCWlmICghY29ubmVjdG9yLT5wb2xsZWQgJiYgSTkxNV9IQVNfSE9UUExVRyhkZXYpICYmIGlu dGVsX2Nvbm5lY3Rvci0+ZW5jb2Rlci0+aHBkX3BpbiA+IEhQRF9OT05FKQo+ICAJCQljb25uZWN0 b3ItPnBvbGxlZCA9IERSTV9DT05ORUNUT1JfUE9MTF9IUEQ7Cj4gIAkJaWYgKGludGVsX2Nvbm5l Y3Rvci0+bXN0X3BvcnQpCj4gIAkJCWNvbm5lY3Rvci0+cG9sbGVkID0gRFJNX0NPTk5FQ1RPUl9Q T0xMX0hQRDsKPiAtLSAKPiAyLjUuMAo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+IEludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4CgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0d2FyZSBFbmdpbmVl ciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753934AbcAEUF7 (ORCPT ); Tue, 5 Jan 2016 15:05:59 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:37936 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411AbcAEUFx (ORCPT ); Tue, 5 Jan 2016 15:05:53 -0500 Date: Tue, 5 Jan 2016 21:05:49 +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 Subject: Re: [Intel-gfx] [PATCH] drm/i915: intel_hpd_init(): Don't check connectors for an encoder Message-ID: <20160105200549.GS8076@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 References: <1452023588-3857-1-git-send-email-cpaul@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452023588-3857-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 Tue, Jan 05, 2016 at 02:53:08PM -0500, Lyude wrote: > There's no reason to check for an active encoder when setting up hpd, > especially since a disconnected connector isn't going to have an encoder > in the first place. This fixes reprobing display connectors on resume. > > Signed-off-by: Lyude > --- > 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 connector's. > - 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. The above explanation should be part of the commit message, otherwise it's hard to understand the impact of this fix. Fixes: 0e32b39ceed6 ("drm/i915: add DP 1.2 MST support (v0.7)") Cc: stable@vger.kernel.org Unfortunately Dave doesn't explain in his MST commit why he's done this. Dave? I can't come up with a reason, but better to test that. Lyude? Anyway looks good to me. Reviewed-by: Daniel Vetter > > drivers/gpu/drm/i915/intel_hotplug.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c > index b177857..18797bc 100644 > --- a/drivers/gpu/drm/i915/intel_hotplug.c > +++ b/drivers/gpu/drm/i915/intel_hotplug.c > @@ -468,7 +468,7 @@ 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) > + if (!connector->polled && I915_HAS_HOTPLUG(dev) && intel_connector->encoder->hpd_pin > HPD_NONE) > connector->polled = DRM_CONNECTOR_POLL_HPD; > if (intel_connector->mst_port) > 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