From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: re-check the hotplug with a delayed work Date: Wed, 19 Sep 2018 15:27:05 +0300 Message-ID: <87h8ily8o6.fsf@intel.com> References: <20180919112933.47382-1-chiu@endlessm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180919112933.47382-1-chiu@endlessm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie Cc: Chris Chiu , intel-gfx@lists.freedesktop.org, linux@endlessm.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAxOSBTZXAgMjAxOCwgQ2hyaXMgQ2hpdSA8Y2hpdUBlbmRsZXNzbS5jb20+IHdyb3Rl Ogo+IEkgaGF2ZSBmZXcgQVNVUyBsYXB0b3BzLCBYNzA1RkQoSW50ZWwgaTctODU2NSksIFg1NjBV RChJbnRlbCBpNS04MjUwVSkKPiBhbmQgWDUzMFVOKEludGVsIGk3LTg1NTBVKSBzaGFyZSB0aGUg c2FtZSBwcm9ibGVtLiBUaGUgSERNSSBjb25uZWN0b3IKPiBzdGF0dXMgc3RheXMgJ2Nvbm5lY3Rl ZCcgZXZlbiB0aGUgSERNSSBjYWJsZSBoYXMgYmVlbiB1bnBsdWdnZWQuCj4gVGhlbiB0aGUgc3Rh dHVzIGluIHN5c2ZzIHdvdWxkIG5ldmVyIGNoYW5nZSBzaW5jZSB0aGVuIHVudGlsIHdlCj4gZG8g J3hyYW5kcicgdG8gcmVwcm9iZSB0aGUgZGV2aWNlcy4gSXQgd291bGQgYWxzbyBjYXVzZSB0aGUg YXVkaW8KPiBvdXRwdXQgcGF0aCBjYW5ub3QgY29ycmVjdGx5IHN3aWN0aCBiYXNlZCBvbiB0aGUg Y29ubmVjdG9yIHN0YXR1cy4KPgo+IFRoaXMgY29tbWl0IGtpY2tzIG9mZiBhIGRlbGF5ZWQgd29y ayB3aGVuIHRoZSBzdGF0dXMgcmVtYWlucyB1bmNoYW5nZWQKPiBpbiB0aGUgZmlyc3QgaG90cGx1 ZyBldmVudCBoYW5kbGluZywgd2hpY2ggbWF5IG5vdCBiZSB0aGUgcGVyZmVjdAo+IHRpbWluZyBp biBzb21lIHNwZWNpYWwgY2FzZXMuCgpQbGVhc2Ugc2VlIFsxXS4KCkJSLApKYW5pLgoKClsxXSBo dHRwOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC84N2sxbmh5OWllLmZz ZkBpbnRlbC5jb20KCj4KPiBTaWduZWQtb2ZmLWJ5OiBDaHJpcyBDaGl1IDxjaGl1QGVuZGxlc3Nt LmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDEg Kwo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMgfCAzNSArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrLS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlv bnMoKyksIDQgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPiBpbmRleCBk NTFkODU3NGE2NzkuLjc4ZTJjZjA5Y2MxMCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+ IEBAIC0yODYsNiArMjg2LDcgQEAgc3RydWN0IGk5MTVfaG90cGx1ZyB7Cj4gIAl9IHN0YXRzW0hQ RF9OVU1fUElOU107Cj4gIAl1MzIgZXZlbnRfYml0czsKPiAgCXN0cnVjdCBkZWxheWVkX3dvcmsg cmVlbmFibGVfd29yazsKPiArCXN0cnVjdCBkZWxheWVkX3dvcmsgcmVjaGVja193b3JrOwo+ICAK PiAgCXN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmlycV9wb3J0W0k5MTVfTUFYX1BPUlRTXTsK PiAgCXUzMiBsb25nX3BvcnRfbWFzazsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaG90cGx1Zy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5j Cj4gaW5kZXggNDNhYTkyYmVmZjJhLi4wODlhMjQ1ODhlYzggMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaG90cGx1Zy5jCj4gQEAgLTM0OSwxNCArMzQ5LDE1IEBAIHN0YXRpYyB2b2lkIGk5 MTVfZGlncG9ydF93b3JrX2Z1bmMoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQo+ICAJfQo+ICB9 Cj4gIAo+ICsjZGVmaW5lIEhQRF9SRUNIRUNLX0RFTEFZICAgICAgICAoMiAqIDEwMDApCj4gKwo+ ICAvKgo+ICAgKiBIYW5kbGUgaG90cGx1ZyBldmVudHMgb3V0c2lkZSB0aGUgaW50ZXJydXB0IGhh bmRsZXIgcHJvcGVyLgo+ICAgKi8KPiAtc3RhdGljIHZvaWQgaTkxNV9ob3RwbHVnX3dvcmtfZnVu YyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gK3N0YXRpYyB2b2lkIGRvX2k5MTVfaG90cGx1 Z19jaGVjayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmssCj4gKwkJCQkgICBzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gKwkJCQkgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBi b29sIGRvX3JlY2hlY2spCj4gIHsKPiAtCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9Cj4gLQkJY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlLCBob3Rw bHVnLmhvdHBsdWdfd29yayk7Cj4gLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2 LT5kcm07Cj4gIAlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3I7Cj4gIAlz dHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcjsKPiAgCXN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3I7Cj4gQEAgLTM5Niw4ICszOTcsMzEgQEAgc3RhdGljIHZvaWQgaTkxNV9o b3RwbHVnX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gIAo+ICAJaWYgKGNo YW5nZWQpCj4gIAkJZHJtX2ttc19oZWxwZXJfaG90cGx1Z19ldmVudChkZXYpOwo+ICsJZWxzZSBp ZiAoZG9fcmVjaGVjaykgewo+ICsJCXNwaW5fbG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7 Cj4gKwkJZGV2X3ByaXYtPmhvdHBsdWcuZXZlbnRfYml0cyB8PSBocGRfZXZlbnRfYml0czsKPiAr CQlzcGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7Cj4gKwkJc2NoZWR1bGVfZGVs YXllZF93b3JrKCZkZXZfcHJpdi0+aG90cGx1Zy5yZWNoZWNrX3dvcmssIG1zZWNzX3RvX2ppZmZp ZXMoSFBEX1JFQ0hFQ0tfREVMQVkpKTsKPiArCX0KPiAgfQo+ICAKPiArc3RhdGljIHZvaWQgaTkx NV9ob3RwbHVnX3dvcmtfZnVuYyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gK3sKPiArCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9Cj4gKwkJY29udGFpbmVyX29mKHdvcmss IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlLCBob3RwbHVnLmhvdHBsdWdfd29yayk7Cj4gKwlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07Cj4gKwo+ICsJZG9faTkxNV9ob3Rw bHVnX2NoZWNrKHdvcmssIGRldl9wcml2LCBkZXYsIHRydWUpOwo+ICt9Cj4gKwo+ICtzdGF0aWMg dm9pZCBpOTE1X2hvdHBsdWdfcmVjaGVja19mdW5jKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykK PiArewo+ICsJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KPiArCQljb250YWlu ZXJfb2Yod29yaywgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUsIGhvdHBsdWcucmVjaGVja193b3Jr LndvcmspOwo+ICsJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwo+ICsK PiArCWRvX2k5MTVfaG90cGx1Z19jaGVjayh3b3JrLCBkZXZfcHJpdiwgZGV2LCBmYWxzZSk7Cj4g K30KPiAgCj4gIC8qKgo+ICAgKiBpbnRlbF9ocGRfaXJxX2hhbmRsZXIgLSBtYWluIGhvdHBsdWcg aXJxIGhhbmRsZXIKPiBAQCAtNjE5LDYgKzY0Myw4IEBAIHZvaWQgaW50ZWxfaHBkX2luaXRfd29y ayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gIAlJTklUX1dPUksoJmRldl9w cml2LT5ob3RwbHVnLnBvbGxfaW5pdF93b3JrLCBpOTE1X2hwZF9wb2xsX2luaXRfd29yayk7Cj4g IAlJTklUX0RFTEFZRURfV09SSygmZGV2X3ByaXYtPmhvdHBsdWcucmVlbmFibGVfd29yaywKPiAg CQkJICBpbnRlbF9ocGRfaXJxX3N0b3JtX3JlZW5hYmxlX3dvcmspOwo+ICsJSU5JVF9ERUxBWUVE X1dPUksoJmRldl9wcml2LT5ob3RwbHVnLnJlY2hlY2tfd29yaywKPiArCQkJICBpOTE1X2hvdHBs dWdfcmVjaGVja19mdW5jKTsKPiAgfQo+ICAKPiAgdm9pZCBpbnRlbF9ocGRfY2FuY2VsX3dvcmso c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+IEBAIC02MzUsNiArNjYxLDcgQEAg dm9pZCBpbnRlbF9ocGRfY2FuY2VsX3dvcmsoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQo+ICAJY2FuY2VsX3dvcmtfc3luYygmZGV2X3ByaXYtPmhvdHBsdWcuaG90cGx1Z193b3Jr KTsKPiAgCWNhbmNlbF93b3JrX3N5bmMoJmRldl9wcml2LT5ob3RwbHVnLnBvbGxfaW5pdF93b3Jr KTsKPiAgCWNhbmNlbF9kZWxheWVkX3dvcmtfc3luYygmZGV2X3ByaXYtPmhvdHBsdWcucmVlbmFi bGVfd29yayk7Cj4gKwljYW5jZWxfZGVsYXllZF93b3JrX3N5bmMoJmRldl9wcml2LT5ob3RwbHVn LnJlY2hlY2tfd29yayk7Cj4gIH0KPiAgCj4gIGJvb2wgaW50ZWxfaHBkX2Rpc2FibGUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIGhwZF9waW4gcGluKQoKLS0gCkphbmkg TmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBHcmFwaGljcyBDZW50ZXIKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC4C8C433F4 for ; Wed, 19 Sep 2018 12:27:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F5D82150F for ; Wed, 19 Sep 2018 12:27:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F5D82150F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731577AbeISSEv (ORCPT ); Wed, 19 Sep 2018 14:04:51 -0400 Received: from mga04.intel.com ([192.55.52.120]:26903 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731343AbeISSEv (ORCPT ); Wed, 19 Sep 2018 14:04:51 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Sep 2018 05:27:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,393,1531810800"; d="scan'208";a="91430850" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.72.61]) by fmsmga001.fm.intel.com with ESMTP; 19 Sep 2018 05:26:58 -0700 From: Jani Nikula To: Chris Chiu , joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux@endlessm.com, Chris Chiu Subject: Re: [PATCH] drm/i915: re-check the hotplug with a delayed work In-Reply-To: <20180919112933.47382-1-chiu@endlessm.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20180919112933.47382-1-chiu@endlessm.com> Date: Wed, 19 Sep 2018 15:27:05 +0300 Message-ID: <87h8ily8o6.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 19 Sep 2018, Chris Chiu wrote: > I have few ASUS laptops, X705FD(Intel i7-8565), X560UD(Intel i5-8250U) > and X530UN(Intel i7-8550U) share the same problem. The HDMI connector > status stays 'connected' even the HDMI cable has been unplugged. > Then the status in sysfs would never change since then until we > do 'xrandr' to reprobe the devices. It would also cause the audio > output path cannot correctly swicth based on the connector status. > > This commit kicks off a delayed work when the status remains unchanged > in the first hotplug event handling, which may not be the perfect > timing in some special cases. Please see [1]. BR, Jani. [1] http://patchwork.freedesktop.org/patch/msgid/87k1nhy9ie.fsf@intel.com > > Signed-off-by: Chris Chiu > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/intel_hotplug.c | 35 +++++++++++++++++++++++++++++++---- > 2 files changed, 32 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index d51d8574a679..78e2cf09cc10 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -286,6 +286,7 @@ struct i915_hotplug { > } stats[HPD_NUM_PINS]; > u32 event_bits; > struct delayed_work reenable_work; > + struct delayed_work recheck_work; > > struct intel_digital_port *irq_port[I915_MAX_PORTS]; > u32 long_port_mask; > diff --git a/drivers/gpu/drm/i915/intel_hotplug.c b/drivers/gpu/drm/i915/intel_hotplug.c > index 43aa92beff2a..089a24588ec8 100644 > --- a/drivers/gpu/drm/i915/intel_hotplug.c > +++ b/drivers/gpu/drm/i915/intel_hotplug.c > @@ -349,14 +349,15 @@ static void i915_digport_work_func(struct work_struct *work) > } > } > > +#define HPD_RECHECK_DELAY (2 * 1000) > + > /* > * Handle hotplug events outside the interrupt handler proper. > */ > -static void i915_hotplug_work_func(struct work_struct *work) > +static void do_i915_hotplug_check(struct work_struct *work, > + struct drm_i915_private *dev_priv, > + struct drm_device *dev, bool do_recheck) > { > - struct drm_i915_private *dev_priv = > - container_of(work, struct drm_i915_private, hotplug.hotplug_work); > - struct drm_device *dev = &dev_priv->drm; > struct intel_connector *intel_connector; > struct intel_encoder *intel_encoder; > struct drm_connector *connector; > @@ -396,8 +397,31 @@ static void i915_hotplug_work_func(struct work_struct *work) > > if (changed) > drm_kms_helper_hotplug_event(dev); > + else if (do_recheck) { > + spin_lock_irq(&dev_priv->irq_lock); > + dev_priv->hotplug.event_bits |= hpd_event_bits; > + spin_unlock_irq(&dev_priv->irq_lock); > + schedule_delayed_work(&dev_priv->hotplug.recheck_work, msecs_to_jiffies(HPD_RECHECK_DELAY)); > + } > } > > +static void i915_hotplug_work_func(struct work_struct *work) > +{ > + struct drm_i915_private *dev_priv = > + container_of(work, struct drm_i915_private, hotplug.hotplug_work); > + struct drm_device *dev = &dev_priv->drm; > + > + do_i915_hotplug_check(work, dev_priv, dev, true); > +} > + > +static void i915_hotplug_recheck_func(struct work_struct *work) > +{ > + struct drm_i915_private *dev_priv = > + container_of(work, struct drm_i915_private, hotplug.recheck_work.work); > + struct drm_device *dev = &dev_priv->drm; > + > + do_i915_hotplug_check(work, dev_priv, dev, false); > +} > > /** > * intel_hpd_irq_handler - main hotplug irq handler > @@ -619,6 +643,8 @@ void intel_hpd_init_work(struct drm_i915_private *dev_priv) > INIT_WORK(&dev_priv->hotplug.poll_init_work, i915_hpd_poll_init_work); > INIT_DELAYED_WORK(&dev_priv->hotplug.reenable_work, > intel_hpd_irq_storm_reenable_work); > + INIT_DELAYED_WORK(&dev_priv->hotplug.recheck_work, > + i915_hotplug_recheck_func); > } > > void intel_hpd_cancel_work(struct drm_i915_private *dev_priv) > @@ -635,6 +661,7 @@ void intel_hpd_cancel_work(struct drm_i915_private *dev_priv) > cancel_work_sync(&dev_priv->hotplug.hotplug_work); > cancel_work_sync(&dev_priv->hotplug.poll_init_work); > cancel_delayed_work_sync(&dev_priv->hotplug.reenable_work); > + cancel_delayed_work_sync(&dev_priv->hotplug.recheck_work); > } > > bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin) -- Jani Nikula, Intel Open Source Graphics Center