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 Content-Length: 2082 Lines: 54 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