From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Kocialkowski Subject: Re: [PATCH] drm/i915: Synchronize connectors states when switching from poll to irq Date: Tue, 18 Jul 2017 15:11:42 +0300 Message-ID: <1500379902.1351.7.camel@linux.intel.com> References: <20170626123229.27939-1-paul.kocialkowski@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170626123229.27939-1-paul.kocialkowski@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: intel-gfx@lists.freedesktop.org Cc: David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCAyMDE3LTA2LTI2IGF0IDE1OjMyICswMzAwLCBQYXVsIEtvY2lhbGtvd3NraSB3cm90 ZToKPiBBZnRlciBkZXRlY3RpbmcgYW4gSVJRIHN0b3JtLCBob3RwbHVnIGRldGVjdGlvbiB3aWxs IHN3aXRjaCBmcm9tCj4gaXJxLWJhc2VkIGRldGVjdGlvbiB0byBwb2xsLWJhc2VkIGRldGVjdGlv bi4gQWZ0ZXIgYSBzaG9ydCBkZWxheSBvcgo+IHdoZW4gcmVzZXR0aW5nIHN0b3JtIGRldGVjdGlv biBmcm9tIGRlYnVnZnMsIGRldGVjdGlvbiB3aWxsIHN3aXRjaAo+IGJhY2sgdG8gYmVpbmcgaXJx LWJhc2VkLgo+IAo+IEhvd2V2ZXIsIGl0IG1heSBvY2N1ciB0aGF0IHBvbGxpbmcgZG9lcyBub3Qg aGF2ZSBlbm91Z2ggdGltZSB0byBkZXRlY3QKPiB0aGUgY3VycmVudCBjb25uZWN0b3Igc3RhdGUg d2hlbiB0aGF0IHNlY29uZCBzd2l0Y2ggdGFrZXMgcGxhY2UuIFRodXMsCj4gdGhpcyBzZXRzIHRo ZSBhcHByb3ByaWF0ZSBob3RwbHVnIGV2ZW50IGJpdHMgZm9yIHRoZSBjb25jZXJuZWQKPiBjb25u ZWN0b3JzIGFuZCBzY2hlZHVsZXMgdGhlIGhvdHBsdWcgd29yaywgdGhhdCB3aWxsIGVuc3VyZSB0 aGUKPiBjb25uZWN0b3JzIHN0YXRlcyBhcmUgaW4gc3luYyB3aGVuIHN3aXRjaGluZyBiYWNrIHRv IGlycS4KPiAKPiBXaXRob3V0IHRoaXMsIG5vIGlycSB3aWxsIGJlIHRyaWdnZXJlZCBhbmQgdGhl IGhwZCBjaGFuZ2Ugd2lsbCBiZQo+IGxvc3QuCgpEb2VzIGFueW9uZSBoYXZlIGZlZWRiYWNrIHRv IHByb3ZpZGUgb24gdGhpcz8KSXQgbG9va3MgbGlrZSBpdCBzaG91bGQgYmUgYSBuby1icmFpbmVy LgoKQ2hlZXJzLAoKUGF1bAoKPiBTaWduZWQtb2ZmLWJ5OiBQYXVsIEtvY2lhbGtvd3NraSA8cGF1 bC5rb2NpYWxrb3dza2lAbGludXguaW50ZWwuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ob3RwbHVnLmMgfCA4ICsrKysrKystCj4gIDEgZmlsZSBjaGFuZ2VkLCA3IGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCj4gYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o b3RwbHVnLmMKPiBpbmRleCBmMTIwMDI3MmE2OTkuLjI5ZjU1NDgwYjBiYiAxMDA2NDQKPiAtLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMKPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMKPiBAQCAtMjE4LDkgKzIxOCwxMyBAQCBzdGF0aWMg dm9pZAo+IGludGVsX2hwZF9pcnFfc3Rvcm1fcmVlbmFibGVfd29yayhzdHJ1Y3Qgd29ya19zdHJ1 Y3QgKndvcmspCj4gIAkJCXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvciA9 Cj4gdG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7Cj4gIAo+ICAJCQlpZiAoaW50ZWxfY29u bmVjdG9yLT5lbmNvZGVyLT5ocGRfcGluID09IGkpIHsKPiAtCQkJCWlmIChjb25uZWN0b3ItPnBv bGxlZCAhPQo+IGludGVsX2Nvbm5lY3Rvci0+cG9sbGVkKQo+ICsJCQkJaWYgKGNvbm5lY3Rvci0+ cG9sbGVkICE9Cj4gaW50ZWxfY29ubmVjdG9yLT5wb2xsZWQpIHsKPiAgCQkJCQlEUk1fREVCVUdf RFJJVkVSKCJSZWVuYWJsaW5nCj4gSFBEIG9uIGNvbm5lY3RvciAlc1xuIiwKPiAgCQkJCQkJCSBj b25uZWN0b3ItCj4gPm5hbWUpOwo+ICsKPiArCQkJCQlkZXZfcHJpdi0+aG90cGx1Zy5ldmVudF9i aXRzCj4gfD0gKDEgPDwgaSk7Cj4gKwkJCQl9Cj4gKwo+ICAJCQkJY29ubmVjdG9yLT5wb2xsZWQg PSBpbnRlbF9jb25uZWN0b3ItCj4gPnBvbGxlZDsKPiAgCQkJCWlmICghY29ubmVjdG9yLT5wb2xs ZWQpCj4gIAkJCQkJY29ubmVjdG9yLT5wb2xsZWQgPQo+IERSTV9DT05ORUNUT1JfUE9MTF9IUEQ7 Cj4gQEAgLTIzMiw2ICsyMzYsOCBAQCBzdGF0aWMgdm9pZAo+IGludGVsX2hwZF9pcnFfc3Rvcm1f cmVlbmFibGVfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gIAkJZGV2X3ByaXYtPmRp c3BsYXkuaHBkX2lycV9zZXR1cChkZXZfcHJpdik7Cj4gIAlzcGluX3VubG9ja19pcnEoJmRldl9w cml2LT5pcnFfbG9jayk7Cj4gIAo+ICsJc2NoZWR1bGVfd29yaygmZGV2X3ByaXYtPmhvdHBsdWcu aG90cGx1Z193b3JrKTsKPiArCj4gIAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7Cj4g IH0KPiAgCi0tIApQYXVsIEtvY2lhbGtvd3NraSA8cGF1bC5rb2NpYWxrb3dza2lAbGludXguaW50 ZWwuY29tPgpJbnRlbCBGaW5sYW5kIE95IC0gQklDIDAzNTc2MDYtNCAtIFdlc3RlbmRpbmthdHUg NywgMDIxNjAgRXNwb28sIEZpbmxhbmQKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751469AbdGRMLu (ORCPT ); Tue, 18 Jul 2017 08:11:50 -0400 Received: from mga14.intel.com ([192.55.52.115]:37561 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751334AbdGRMLr (ORCPT ); Tue, 18 Jul 2017 08:11:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,377,1496127600"; d="scan'208";a="128707947" Message-ID: <1500379902.1351.7.camel@linux.intel.com> Subject: Re: [PATCH] drm/i915: Synchronize connectors states when switching from poll to irq From: Paul Kocialkowski To: intel-gfx@lists.freedesktop.org Cc: Ville =?ISO-8859-1?Q?Syrj=E4l=E4?= , Martin Peres , Daniel Vetter , Jani Nikula , David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Tue, 18 Jul 2017 15:11:42 +0300 In-Reply-To: <20170626123229.27939-1-paul.kocialkowski@linux.intel.com> References: <20170626123229.27939-1-paul.kocialkowski@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo, Finland Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.24.3 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2017-06-26 at 15:32 +0300, Paul Kocialkowski wrote: > After detecting an IRQ storm, hotplug detection will switch from > irq-based detection to poll-based detection. After a short delay or > when resetting storm detection from debugfs, detection will switch > back to being irq-based. > > However, it may occur that polling does not have enough time to detect > the current connector state when that second switch takes place. Thus, > this sets the appropriate hotplug event bits for the concerned > connectors and schedules the hotplug work, that will ensure the > connectors states are in sync when switching back to irq. > > Without this, no irq will be triggered and the hpd change will be > lost. Does anyone have feedback to provide on this? It looks like it should be a no-brainer. Cheers, Paul > Signed-off-by: Paul Kocialkowski > --- > drivers/gpu/drm/i915/intel_hotplug.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_hotplug.c > b/drivers/gpu/drm/i915/intel_hotplug.c > index f1200272a699..29f55480b0bb 100644 > --- a/drivers/gpu/drm/i915/intel_hotplug.c > +++ b/drivers/gpu/drm/i915/intel_hotplug.c > @@ -218,9 +218,13 @@ static void > intel_hpd_irq_storm_reenable_work(struct work_struct *work) > struct intel_connector *intel_connector = > to_intel_connector(connector); > > if (intel_connector->encoder->hpd_pin == i) { > - if (connector->polled != > intel_connector->polled) > + if (connector->polled != > intel_connector->polled) { > DRM_DEBUG_DRIVER("Reenabling > HPD on connector %s\n", > connector- > >name); > + > + dev_priv->hotplug.event_bits > |= (1 << i); > + } > + > connector->polled = intel_connector- > >polled; > if (!connector->polled) > connector->polled = > DRM_CONNECTOR_POLL_HPD; > @@ -232,6 +236,8 @@ static void > intel_hpd_irq_storm_reenable_work(struct work_struct *work) > dev_priv->display.hpd_irq_setup(dev_priv); > spin_unlock_irq(&dev_priv->irq_lock); > > + schedule_work(&dev_priv->hotplug.hotplug_work); > + > intel_runtime_pm_put(dev_priv); > } > -- Paul Kocialkowski Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo, Finland