From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: [PATCH] drm/i915: WARN if interrupts aren't on in
 en/disable_pipestat
Date: Thu, 4 Sep 2014 09:24:21 -0700
Message-ID: <20140904092421.404f0eb2@jbarnes-desktop>
References: <1409129017-16857-1-git-send-email-daniel.vetter@ffwll.ch>
 <20140827160022.2a8fe834@jbarnes-desktop>
 <CAKMK7uEMBoVNMfO7TM=sjT57GZZFJLAhqeZT1zxB=8WKGQoM5A@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-pd0-f177.google.com (mail-pd0-f177.google.com
 [209.85.192.177])
 by gabe.freedesktop.org (Postfix) with ESMTP id BCEFE6E7B3
 for <intel-gfx@lists.freedesktop.org>; Thu,  4 Sep 2014 09:24:14 -0700 (PDT)
Received: by mail-pd0-f177.google.com with SMTP id r10so13738768pdi.22
 for <intel-gfx@lists.freedesktop.org>; Thu, 04 Sep 2014 09:24:13 -0700 (PDT)
In-Reply-To: <CAKMK7uEMBoVNMfO7TM=sjT57GZZFJLAhqeZT1zxB=8WKGQoM5A@mail.gmail.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Paulo Zanoni <paulo.r.zanoni@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

On Thu, 4 Sep 2014 17:59:18 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> On Thu, Aug 28, 2014 at 1:00 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> >> index 9eb303c1b621..76bc4d0de5a4 100644
> >> --- a/drivers/gpu/drm/i915/i915_irq.c
> >> +++ b/drivers/gpu/drm/i915/i915_irq.c
> >> @@ -589,6 +589,7 @@ __i915_enable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
> >>       u32 pipestat = I915_READ(reg) & PIPESTAT_INT_ENABLE_MASK;
> >>
> >>       assert_spin_locked(&dev_priv->irq_lock);
> >> +     WARN_ON(!intel_irqs_enabled(dev_priv));
> >>
> >>       if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
> >>                     status_mask & ~PIPESTAT_INT_STATUS_MASK,
> >> @@ -615,6 +616,7 @@ __i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,
> >>       u32 pipestat = I915_READ(reg) & PIPESTAT_INT_ENABLE_MASK;
> >>
> >>       assert_spin_locked(&dev_priv->irq_lock);
> >> +     WARN_ON(!intel_irqs_enabled(dev_priv));
> >>
> >>       if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
> >>                     status_mask & ~PIPESTAT_INT_STATUS_MASK,
> >
> > Yeah looks good, wonder if it'll trigger any new warnings.
> 
> It will blow up in a bunch of postinstall hooks, just like the one for
> ilk. At least without my patch to shuffle the pm._irqs_disabled
> assignment around.
> 
> > Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> ... so does that count as an implicit r-b on my other patch?

Sure, though didn't Jani find some issues with it?

-- 
Jesse Barnes, Intel Open Source Technology Center