From mboxrd@z Thu Jan 1 00:00:00 1970 From: Manasi Navare Subject: Re: [PATCH] drm/i915: Synchronize connectors states when switching from poll to irq Date: Wed, 19 Jul 2017 23:11:21 -0700 Message-ID: <20170720061121.GA9824@intel.com> References: <20170626123229.27939-1-paul.kocialkowski@linux.intel.com> <1500379902.1351.7.camel@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1500379902.1351.7.camel@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: Paul Kocialkowski Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBKdWwgMTgsIDIwMTcgYXQgMDM6MTE6NDJQTSArMDMwMCwgUGF1bCBLb2NpYWxrb3dz a2kgd3JvdGU6Cj4gT24gTW9uLCAyMDE3LTA2LTI2IGF0IDE1OjMyICswMzAwLCBQYXVsIEtvY2lh bGtvd3NraSB3cm90ZToKPiA+IEFmdGVyIGRldGVjdGluZyBhbiBJUlEgc3Rvcm0sIGhvdHBsdWcg ZGV0ZWN0aW9uIHdpbGwgc3dpdGNoIGZyb20KPiA+IGlycS1iYXNlZCBkZXRlY3Rpb24gdG8gcG9s bC1iYXNlZCBkZXRlY3Rpb24uIEFmdGVyIGEgc2hvcnQgZGVsYXkgb3IKPiA+IHdoZW4gcmVzZXR0 aW5nIHN0b3JtIGRldGVjdGlvbiBmcm9tIGRlYnVnZnMsIGRldGVjdGlvbiB3aWxsIHN3aXRjaAo+ ID4gYmFjayB0byBiZWluZyBpcnEtYmFzZWQuCj4gPiAKPiA+IEhvd2V2ZXIsIGl0IG1heSBvY2N1 ciB0aGF0IHBvbGxpbmcgZG9lcyBub3QgaGF2ZSBlbm91Z2ggdGltZSB0byBkZXRlY3QKPiA+IHRo ZSBjdXJyZW50IGNvbm5lY3RvciBzdGF0ZSB3aGVuIHRoYXQgc2Vjb25kIHN3aXRjaCB0YWtlcyBw bGFjZS4gVGh1cywKPiA+IHRoaXMgc2V0cyB0aGUgYXBwcm9wcmlhdGUgaG90cGx1ZyBldmVudCBi aXRzIGZvciB0aGUgY29uY2VybmVkCj4gPiBjb25uZWN0b3JzIGFuZCBzY2hlZHVsZXMgdGhlIGhv dHBsdWcgd29yaywgdGhhdCB3aWxsIGVuc3VyZSB0aGUKPiA+IGNvbm5lY3RvcnMgc3RhdGVzIGFy ZSBpbiBzeW5jIHdoZW4gc3dpdGNoaW5nIGJhY2sgdG8gaXJxLgo+ID4gCj4gPiBXaXRob3V0IHRo aXMsIG5vIGlycSB3aWxsIGJlIHRyaWdnZXJlZCBhbmQgdGhlIGhwZCBjaGFuZ2Ugd2lsbCBiZQo+ ID4gbG9zdC4KPiAKPiBEb2VzIGFueW9uZSBoYXZlIGZlZWRiYWNrIHRvIHByb3ZpZGUgb24gdGhp cz8KPiBJdCBsb29rcyBsaWtlIGl0IHNob3VsZCBiZSBhIG5vLWJyYWluZXIuCj4gCj4gQ2hlZXJz LAo+IAo+IFBhdWwKPiAKPiA+IFNpZ25lZC1vZmYtYnk6IFBhdWwgS29jaWFsa293c2tpIDxwYXVs LmtvY2lhbGtvd3NraUBsaW51eC5pbnRlbC5jb20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMgfCA4ICsrKysrKystCj4gPiAgMSBmaWxlIGNoYW5nZWQs IDcgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaG90cGx1Zy5jCj4gPiBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2hvdHBsdWcuYwo+ID4gaW5kZXggZjEyMDAyNzJhNjk5Li4yOWY1NTQ4MGIwYmIg MTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ob3RwbHVnLmMKPiA+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hvdHBsdWcuYwo+ID4gQEAgLTIxOCw5 ICsyMTgsMTMgQEAgc3RhdGljIHZvaWQKPiA+IGludGVsX2hwZF9pcnFfc3Rvcm1fcmVlbmFibGVf d29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCj4gPiAgCQkJc3RydWN0IGludGVsX2Nvbm5l Y3RvciAqaW50ZWxfY29ubmVjdG9yID0KPiA+IHRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3Ip Owo+ID4gIAo+ID4gIAkJCWlmIChpbnRlbF9jb25uZWN0b3ItPmVuY29kZXItPmhwZF9waW4gPT0g aSkgewoKU28gaWYgdGhpcyBocGQgcGluIGluIGludGVsX2Nvbm5lY3Rvci0+ZW5jb2RlciBpcyBz ZXQgdGhlbiB0aGF0Cm1lYW5zIGl0IGdvdCB0aGUgaHBkIGJ1dCBiZWNhdXNlIGNvbm5lY3Rvci0+ cG9sbGVkIGlzICE9IGludGVsX2Nvbm5lY3Rvci0+cG9sbGVkCnBvbGxpbmcgZGlkbnQgZGV0ZWN0 IHRoYXQgY29ubmVjdG9yLgpJcyB0aGF0IHdoYXQgeW91IGFyZSB0cnlpbmcgdG8gZG8gaGVyZT8K Ck1hbmFzaQoKCj4gPiAtCQkJCWlmIChjb25uZWN0b3ItPnBvbGxlZCAhPQo+ID4gaW50ZWxfY29u bmVjdG9yLT5wb2xsZWQpCj4gPiArCQkJCWlmIChjb25uZWN0b3ItPnBvbGxlZCAhPQo+ID4gaW50 ZWxfY29ubmVjdG9yLT5wb2xsZWQpIHsKPiA+ICAJCQkJCURSTV9ERUJVR19EUklWRVIoIlJlZW5h YmxpbmcKPiA+IEhQRCBvbiBjb25uZWN0b3IgJXNcbiIsCj4gPiAgCQkJCQkJCSBjb25uZWN0b3It Cj4gPiA+bmFtZSk7Cj4gPiArCj4gPiArCQkJCQlkZXZfcHJpdi0+aG90cGx1Zy5ldmVudF9iaXRz Cj4gPiB8PSAoMSA8PCBpKTsKPiA+ICsJCQkJfQo+ID4gKwo+ID4gIAkJCQljb25uZWN0b3ItPnBv bGxlZCA9IGludGVsX2Nvbm5lY3Rvci0KPiA+ID5wb2xsZWQ7Cj4gPiAgCQkJCWlmICghY29ubmVj dG9yLT5wb2xsZWQpCj4gPiAgCQkJCQljb25uZWN0b3ItPnBvbGxlZCA9Cj4gPiBEUk1fQ09OTkVD VE9SX1BPTExfSFBEOwo+ID4gQEAgLTIzMiw2ICsyMzYsOCBAQCBzdGF0aWMgdm9pZAo+ID4gaW50 ZWxfaHBkX2lycV9zdG9ybV9yZWVuYWJsZV93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykK PiA+ICAJCWRldl9wcml2LT5kaXNwbGF5LmhwZF9pcnFfc2V0dXAoZGV2X3ByaXYpOwo+ID4gIAlz cGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7Cj4gPiAgCj4gPiArCXNjaGVkdWxl X3dvcmsoJmRldl9wcml2LT5ob3RwbHVnLmhvdHBsdWdfd29yayk7Cj4gPiArCj4gPiAgCWludGVs X3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsKPiA+ICB9Cj4gPiAgCj4gLS0gCj4gUGF1bCBLb2Np YWxrb3dza2kgPHBhdWwua29jaWFsa293c2tpQGxpbnV4LmludGVsLmNvbT4KPiBJbnRlbCBGaW5s YW5kIE95IC0gQklDIDAzNTc2MDYtNCAtIFdlc3RlbmRpbmthdHUgNywgMDIxNjAgRXNwb28sIEZp bmxhbmQKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+ IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933593AbdGTGEf (ORCPT ); Thu, 20 Jul 2017 02:04:35 -0400 Received: from mga01.intel.com ([192.55.52.88]:46878 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932710AbdGTGEe (ORCPT ); Thu, 20 Jul 2017 02:04:34 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,382,1496127600"; d="scan'208";a="113383178" Date: Wed, 19 Jul 2017 23:11:21 -0700 From: Manasi Navare To: Paul Kocialkowski Cc: intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter Subject: Re: [PATCH] drm/i915: Synchronize connectors states when switching from poll to irq Message-ID: <20170720061121.GA9824@intel.com> References: <20170626123229.27939-1-paul.kocialkowski@linux.intel.com> <1500379902.1351.7.camel@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1500379902.1351.7.camel@linux.intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 18, 2017 at 03:11:42PM +0300, Paul Kocialkowski wrote: > 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) { So if this hpd pin in intel_connector->encoder is set then that means it got the hpd but because connector->polled is != intel_connector->polled polling didnt detect that connector. Is that what you are trying to do here? Manasi > > - 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 > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel