From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Subject: [PATCH] drm/i915: intel_hpd_init(): Don't check connectors for an encoder Date: Tue, 5 Jan 2016 14:53:08 -0500 Message-ID: <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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Benjamin Tissoires , Lyude List-Id: dri-devel@lists.freedesktop.org VGhlcmUncyBubyByZWFzb24gdG8gY2hlY2sgZm9yIGFuIGFjdGl2ZSBlbmNvZGVyIHdoZW4gc2V0 dGluZyB1cCBocGQsCmVzcGVjaWFsbHkgc2luY2UgYSBkaXNjb25uZWN0ZWQgY29ubmVjdG9yIGlz bid0IGdvaW5nIHRvIGhhdmUgYW4gZW5jb2RlcgppbiB0aGUgZmlyc3QgcGxhY2UuIFRoaXMgZml4 ZXMgcmVwcm9iaW5nIGRpc3BsYXkgY29ubmVjdG9ycyBvbiByZXN1bWUuCgpTaWduZWQtb2ZmLWJ5 OiBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4KLS0tCkFmdGVyIHNvbWUgdGFsa2luZyB3aXRoIGRh bnZldCBvbiBJUkMsIEkgbGVhcm5lZCB0aGF0IGNhbGxpbmcKZHJtX2hlbHBlcl9ocGRfaXJxX2V2 ZW50KCkgZG9lcyBhY3R1YWxseSB0cmlnZ2VyIGEgZnVsbCByZXByb2JlIG9mIGVhY2gKY29ubmVj dG9yJ3Mgc3RhdHVzLiBJdCB0dXJucyBvdXQgdGhpcyBpcyB0aGUgYWN0dWFsIHJlYXNvbiByZXBy b2Jpbmcgb24gcmVzdW1lCmhhc24ndCBiZWVuIHdvcmtpbmcgKHRoaXMgd2FzIG9ic2VydmVkIG9u IGEgVDQ0MHMpOgoKCS0gV2UgY2FsbCBocGRfaW5pdCgpCgktIFdlIGNoZWNrIGVhY2ggY29ubmVj dG9yIGZvciBhIGNvdXBsZSBvZiB0aGluZ3MgYmVmb3JlIG1hcmtpbmcKCSAgY29ubmVjdG9yLT5w b2xsZWQgd2l0aCBEUk1fQ09OTkVDVE9SX1BPTExfSFBELCBvbmUgb2Ygd2hpY2ggaXMgYW4KCSAg YWN0aXZlIGVuY29kZXIuIE9mIGNvdXJzZSwgYSBkaXNjb25uZWN0ZWQgcG9ydCB3b24ndCBoYXZl IGFuIGFjdGl2ZQoJICBlbmNvZGVyLCBzbyB3ZSBkb24ndCBhZGQgdGhlIGZsYWcgdG8gYW55IG9m IHRoZSBjb25uZWN0b3Incy4KCS0gV2UgY2FsbCBkcm1faGVscGVyX2hwZF9pcnFfZXZlbnQoKQoJ LSBkcm1faGVscGVyX2lycV9ldmVudCgpIGNoZWNrcyBlYWNoIGNvbm5lY3RvciBmb3IgdGhlCgkg IERSTV9DT05ORUNUT1JfUE9MTF9IUEQgZmxhZy4gVGhlIG9ubHkgb25lIHRoYXQgaGFzIGl0IGlz IGVEUC0xLCBzbyB3ZQoJICBza2lwIHJlcHJvYmluZyBlYWNoIGNvbm5lY3RvciBleGNlcHQgdGhh dCBvbmUuCgogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jIHwgMiArLQogMSBm aWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaG90cGx1Zy5jCmluZGV4IGIxNzc4NTcuLjE4Nzk3YmMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ob3RwbHVnLmMKQEAgLTQ2OCw3ICs0NjgsNyBAQCB2b2lkIGludGVsX2hwZF9p bml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlsaXN0X2Zvcl9lYWNoX2Vu dHJ5KGNvbm5lY3RvciwgJm1vZGVfY29uZmlnLT5jb25uZWN0b3JfbGlzdCwgaGVhZCkgewogCQlz dHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IgPSB0b19pbnRlbF9jb25uZWN0 b3IoY29ubmVjdG9yKTsKIAkJY29ubmVjdG9yLT5wb2xsZWQgPSBpbnRlbF9jb25uZWN0b3ItPnBv bGxlZDsKLQkJaWYgKGNvbm5lY3Rvci0+ZW5jb2RlciAmJiAhY29ubmVjdG9yLT5wb2xsZWQgJiYg STkxNV9IQVNfSE9UUExVRyhkZXYpICYmIGludGVsX2Nvbm5lY3Rvci0+ZW5jb2Rlci0+aHBkX3Bp biA+IEhQRF9OT05FKQorCQlpZiAoIWNvbm5lY3Rvci0+cG9sbGVkICYmIEk5MTVfSEFTX0hPVFBM VUcoZGV2KSAmJiBpbnRlbF9jb25uZWN0b3ItPmVuY29kZXItPmhwZF9waW4gPiBIUERfTk9ORSkK IAkJCWNvbm5lY3Rvci0+cG9sbGVkID0gRFJNX0NPTk5FQ1RPUl9QT0xMX0hQRDsKIAkJaWYgKGlu dGVsX2Nvbm5lY3Rvci0+bXN0X3BvcnQpCiAJCQljb25uZWN0b3ItPnBvbGxlZCA9IERSTV9DT05O RUNUT1JfUE9MTF9IUEQ7Ci0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752380AbcAETxQ (ORCPT ); Tue, 5 Jan 2016 14:53:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46991 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751667AbcAETxM (ORCPT ); Tue, 5 Jan 2016 14:53:12 -0500 From: Lyude To: Daniel Vetter , Jani Nikula , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Benjamin Tissoires , Lyude Subject: [PATCH] drm/i915: intel_hpd_init(): Don't check connectors for an encoder Date: Tue, 5 Jan 2016 14:53:08 -0500 Message-Id: <1452023588-3857-1-git-send-email-cpaul@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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