From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 10/24] drm/i915: Leave interrupts enabled while disabling crtcs during suspend Date: Thu, 24 Apr 2014 15:33:13 +0200 Message-ID: <20140424133313.GD26374@phenom.ffwll.local> References: <1394209951-9963-1-git-send-email-ville.syrjala@linux.intel.com> <1394209951-9963-11-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com [74.125.83.48]) by gabe.freedesktop.org (Postfix) with ESMTP id C4CAA6E550 for ; Thu, 24 Apr 2014 06:33:18 -0700 (PDT) Received: by mail-ee0-f48.google.com with SMTP id b57so1857407eek.35 for ; Thu, 24 Apr 2014 06:33:17 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1394209951-9963-11-git-send-email-ville.syrjala@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: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 07, 2014 at 06:32:17PM +0200, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > The new watermaek update mechanism requires interrupts to work > correctly. Because of this we need interrupts while disabling crtcs > during suspend. So move the irq disable to happen a bit later. > = > Signed-off-by: Ville Syrj=E4l=E4 I guess we have sufficient amounts of WARN_ON(!dev->irqs_enabled) sprinkled over relevant places already? Just want to start locking down our setup/teardown sequences as much as possible since making them more fancy and dynamic is an ongoing effort. -Daniel > --- > 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 658fe24..079fb904 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -448,7 +448,6 @@ static int i915_drm_freeze(struct drm_device *dev) > = > cancel_delayed_work_sync(&dev_priv->rps.delayed_resume_work); > = > - drm_irq_uninstall(dev); > dev_priv->enable_hotplug_processing =3D false; > /* > * Disable CRTCs directly since we want to preserve sw state > @@ -459,6 +458,8 @@ static int i915_drm_freeze(struct drm_device *dev) > dev_priv->display.crtc_disable(crtc); > mutex_unlock(&dev->mode_config.mutex); > = > + drm_irq_uninstall(dev); > + > intel_modeset_suspend_hw(dev); > } > = > -- = > 1.8.3.2 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch