From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 19/19] drm/i915: only enable HWSTAM interrupts on postinstall on ILK+ Date: Tue, 1 Apr 2014 23:29:40 +0200 Message-ID: <20140401212940.GE7225@phenom.ffwll.local> References: <1396377447-2177-1-git-send-email-przanoni@gmail.com> <1396377447-2177-20-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B4126E874 for ; Tue, 1 Apr 2014 14:29:44 -0700 (PDT) Received: by mail-we0-f174.google.com with SMTP id t60so6850021wes.19 for ; Tue, 01 Apr 2014 14:29:43 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1396377447-2177-20-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Tue, Apr 01, 2014 at 03:37:27PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni > > We should only enable interrupts at postinstall. > > And now on ILK/SNB/IVB/HSW the irq_preinstall and irq_postinstall > functions leave the hardware in the same state. > > Signed-off-by: Paulo Zanoni > --- > drivers/gpu/drm/i915/i915_irq.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index fd1ef09..75f1997 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -2912,6 +2912,8 @@ static void ironlake_irq_reset(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > > + I915_WRITE(HWSTAM, 0xffffffff); > + > GEN5_IRQ_RESET(DE); > if (IS_GEN7(dev)) > I915_WRITE(GEN7_ERR_INT, 0xffffffff); > @@ -2923,10 +2925,6 @@ static void ironlake_irq_reset(struct drm_device *dev) > > static void ironlake_irq_preinstall(struct drm_device *dev) > { > - drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; > - > - I915_WRITE(HWSTAM, 0xeffe); > - > ironlake_irq_reset(dev); > } Follow-up patch to remove this wrapper functions and just put foo_irq_reset into the preinstall hooks? In any case entire series merged (with one tiny rebase conflict since drm_i915_private_t is now gone). -Daniel > > @@ -3099,6 +3097,8 @@ static int ironlake_irq_postinstall(struct drm_device *dev) > > dev_priv->irq_mask = ~display_mask; > > + I915_WRITE(HWSTAM, 0xeffe); > + > ibx_irq_pre_postinstall(dev); > > GEN5_IRQ_INIT(DE, dev_priv->irq_mask, display_mask | extra_mask); > @@ -3354,8 +3354,6 @@ static void ironlake_irq_uninstall(struct drm_device *dev) > > intel_hpd_irq_uninstall(dev_priv); > > - I915_WRITE(HWSTAM, 0xffffffff); > - > ironlake_irq_reset(dev); > } > > -- > 1.8.5.3 > > _______________________________________________ > 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