From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760036AbcKCS4n (ORCPT ); Thu, 3 Nov 2016 14:56:43 -0400 Received: from mail.acc.umu.se ([130.239.18.156]:40839 "EHLO mail.acc.umu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758246AbcKCS4l (ORCPT ); Thu, 3 Nov 2016 14:56:41 -0400 X-Greylist: delayed 353 seconds by postgrey-1.27 at vger.kernel.org; Thu, 03 Nov 2016 14:56:41 EDT Date: Thu, 3 Nov 2016 19:50:58 +0100 From: David Weinehall To: Lyude Cc: intel-gfx@lists.freedesktop.org, David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: Reinit polling before hpd when resuming Message-ID: <20161103185058.GH8202@suiko.acc.umu.se> Mail-Followup-To: Lyude , intel-gfx@lists.freedesktop.org, David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter References: <1478187758-32740-1-git-send-email-lyude@redhat.com> <1478187758-32740-3-git-send-email-lyude@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1478187758-32740-3-git-send-email-lyude@redhat.com> X-Editor: Vi Improved X-Accept-Language: Swedish, English X-GPG-Fingerprint: ED69 8CF5 6102 21B9 AFD1 9DB7 0B27 96FD 15DA A404 X-GPG-Key: http://www.acc.umu.se/~tao/files/pub_15daa404.gpg.asc User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 03, 2016 at 11:42:38AM -0400, Lyude wrote: > Now that we don't run the connector reprobing from i915_drm_resume(), we > need to make it so we don't have to wait for reprobing to finish so that > we actually speed things up. In order to do this, we need to make sure > that i915_drm_resume() doesn't get blocked by i915_hpd_poll_init_work() > while trying to acquire the mode_config lock that > drm_kms_helper_poll_enable() needs to acquire. > > The easiest way to do this is to just enable polling before hpd. This > shouldn't break anything since at that point we have everything else we > need for polling enabled. > > As well, this should result in a rather significant improvement in how > quickly we can resume the system. > > Signed-off-by: Lyude > Cc: David Weinehall Tested-by: David Weinehall Reviewed-by: David Weinehall Testcase: analyze_suspend.py -config config/suspend-callgraph.cfg -filter i915 > --- > drivers/gpu/drm/i915/i915_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 532cc0f..f605dde 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -1595,6 +1595,8 @@ static int i915_drm_resume(struct drm_device *dev) > > intel_display_resume(dev); > > + drm_kms_helper_poll_enable(dev); > + > /* > * ... but also need to make sure that hotplug processing > * doesn't cause havoc. Like in the driver load code we don't > @@ -1614,7 +1616,6 @@ static int i915_drm_resume(struct drm_device *dev) > intel_opregion_notify_adapter(dev_priv, PCI_D0); > > intel_autoenable_gt_powersave(dev_priv); > - drm_kms_helper_poll_enable(dev); > > enable_rpm_wakeref_asserts(dev_priv); > > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Weinehall Subject: Re: [PATCH 2/2] drm/i915: Reinit polling before hpd when resuming Date: Thu, 3 Nov 2016 19:50:58 +0100 Message-ID: <20161103185058.GH8202@suiko.acc.umu.se> References: <1478187758-32740-1-git-send-email-lyude@redhat.com> <1478187758-32740-3-git-send-email-lyude@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <1478187758-32740-3-git-send-email-lyude@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Lyude Cc: David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBOb3YgMDMsIDIwMTYgYXQgMTE6NDI6MzhBTSAtMDQwMCwgTHl1ZGUgd3JvdGU6Cj4g Tm93IHRoYXQgd2UgZG9uJ3QgcnVuIHRoZSBjb25uZWN0b3IgcmVwcm9iaW5nIGZyb20gaTkxNV9k cm1fcmVzdW1lKCksIHdlCj4gbmVlZCB0byBtYWtlIGl0IHNvIHdlIGRvbid0IGhhdmUgdG8gd2Fp dCBmb3IgcmVwcm9iaW5nIHRvIGZpbmlzaCBzbyB0aGF0Cj4gd2UgYWN0dWFsbHkgc3BlZWQgdGhp bmdzIHVwLiBJbiBvcmRlciB0byBkbyB0aGlzLCB3ZSBuZWVkIHRvIG1ha2Ugc3VyZQo+IHRoYXQg aTkxNV9kcm1fcmVzdW1lKCkgZG9lc24ndCBnZXQgYmxvY2tlZCBieSBpOTE1X2hwZF9wb2xsX2lu aXRfd29yaygpCj4gd2hpbGUgdHJ5aW5nIHRvIGFjcXVpcmUgdGhlIG1vZGVfY29uZmlnIGxvY2sg dGhhdAo+IGRybV9rbXNfaGVscGVyX3BvbGxfZW5hYmxlKCkgbmVlZHMgdG8gYWNxdWlyZS4KPiAK PiBUaGUgZWFzaWVzdCB3YXkgdG8gZG8gdGhpcyBpcyB0byBqdXN0IGVuYWJsZSBwb2xsaW5nIGJl Zm9yZSBocGQuIFRoaXMKPiBzaG91bGRuJ3QgYnJlYWsgYW55dGhpbmcgc2luY2UgYXQgdGhhdCBw b2ludCB3ZSBoYXZlIGV2ZXJ5dGhpbmcgZWxzZSB3ZQo+IG5lZWQgZm9yIHBvbGxpbmcgZW5hYmxl ZC4KPiAKPiBBcyB3ZWxsLCB0aGlzIHNob3VsZCByZXN1bHQgaW4gYSByYXRoZXIgc2lnbmlmaWNh bnQgaW1wcm92ZW1lbnQgaW4gaG93Cj4gcXVpY2tseSB3ZSBjYW4gcmVzdW1lIHRoZSBzeXN0ZW0u Cj4gCj4gU2lnbmVkLW9mZi1ieTogTHl1ZGUgPGx5dWRlQHJlZGhhdC5jb20+Cj4gQ2M6IERhdmlk IFdlaW5laGFsbCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KClRlc3RlZC1ieTog RGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpSZXZpZXdl ZC1ieTogRGF2aWQgV2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpU ZXN0Y2FzZTogYW5hbHl6ZV9zdXNwZW5kLnB5IC1jb25maWcgY29uZmlnL3N1c3BlbmQtY2FsbGdy YXBoLmNmZyAtZmlsdGVyIGk5MTUKCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMgfCAzICsrLQo+ICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAxIGRlbGV0 aW9uKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gaW5kZXggNTMyY2MwZi4uZjYwNWRk ZSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwo+IEBAIC0xNTk1LDYgKzE1OTUsOCBAQCBz dGF0aWMgaW50IGk5MTVfZHJtX3Jlc3VtZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQo+ICAKPiAg CWludGVsX2Rpc3BsYXlfcmVzdW1lKGRldik7Cj4gIAo+ICsJZHJtX2ttc19oZWxwZXJfcG9sbF9l bmFibGUoZGV2KTsKPiArCj4gIAkvKgo+ICAJICogLi4uIGJ1dCBhbHNvIG5lZWQgdG8gbWFrZSBz dXJlIHRoYXQgaG90cGx1ZyBwcm9jZXNzaW5nCj4gIAkgKiBkb2Vzbid0IGNhdXNlIGhhdm9jLiBM aWtlIGluIHRoZSBkcml2ZXIgbG9hZCBjb2RlIHdlIGRvbid0Cj4gQEAgLTE2MTQsNyArMTYxNiw2 IEBAIHN0YXRpYyBpbnQgaTkxNV9kcm1fcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCj4g IAlpbnRlbF9vcHJlZ2lvbl9ub3RpZnlfYWRhcHRlcihkZXZfcHJpdiwgUENJX0QwKTsKPiAgCj4g IAlpbnRlbF9hdXRvZW5hYmxlX2d0X3Bvd2Vyc2F2ZShkZXZfcHJpdik7Cj4gLQlkcm1fa21zX2hl bHBlcl9wb2xsX2VuYWJsZShkZXYpOwo+ICAKPiAgCWVuYWJsZV9ycG1fd2FrZXJlZl9hc3NlcnRz KGRldl9wcml2KTsKPiAgCj4gLS0gCj4gMi43LjQKPiAKPiBfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwo+IEludGVsLWdmeCBtYWlsaW5nIGxpc3QKPiBJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==