From mboxrd@z Thu Jan  1 00:00:00 1970
From: Damien Lespiau <damien.lespiau@intel.com>
Subject: Re: [PATCH v2 5/7] drm/i915: Provide a bit more info
 when pipestat bits are wrong
Date: Thu, 3 Apr 2014 11:54:32 +0100
Message-ID: <20140403105432.GA18079@strange.amr.corp.intel.com>
References: <20140402213519.GA11052@strange.amr.corp.intel.com>
 <1396520913-31236-1-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 57A566E8F1
 for <intel-gfx@lists.freedesktop.org>; Thu,  3 Apr 2014 03:54:43 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1396520913-31236-1-git-send-email-ville.syrjala@linux.intel.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: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Thu, Apr 03, 2014 at 01:28:33PM +0300, ville.syrjala@linux.intel.com wro=
te:
> From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> =

> Print the enable_mask and status_mask from
> __i915_{enable,disable}_pipestat() when the caller has messed them up
> somehow.
> =

> v2: Use pipe_name() (Damien)
>     Fix a typo in the commit message
> =

> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_irq.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> =

> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_=
irq.c
> index 361e9b3..2343323 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -503,8 +503,10 @@ __i915_enable_pipestat(struct drm_i915_private *dev_=
priv, enum pipe pipe,
>  =

>  	assert_spin_locked(&dev_priv->irq_lock);
>  =

> -	if (WARN_ON_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
> -	                 status_mask & ~PIPESTAT_INT_STATUS_MASK))
> +	if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
> +		      status_mask & ~PIPESTAT_INT_STATUS_MASK,
> +		      "pipe %c: enable_mask=3D0x%x, status_mask=3D0x%x\n",
> +		      pipe_name(pipe), enable_mask, status_mask))
>  		return;
>  =

>  	if ((pipestat & enable_mask) =3D=3D enable_mask)
> @@ -527,8 +529,10 @@ __i915_disable_pipestat(struct drm_i915_private *dev=
_priv, enum pipe pipe,
>  =

>  	assert_spin_locked(&dev_priv->irq_lock);
>  =

> -	if (WARN_ON_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
> -	                 status_mask & ~PIPESTAT_INT_STATUS_MASK))
> +	if (WARN_ONCE(enable_mask & ~PIPESTAT_INT_ENABLE_MASK ||
> +		      status_mask & ~PIPESTAT_INT_STATUS_MASK,
> +		      "pipe %c: enable_mask=3D0x%x, status_mask=3D0x%x\n",
> +		      pipe_name(pipe), enable_mask, status_mask))
>  		return;
>  =

>  	if ((pipestat & enable_mask) =3D=3D 0)
> -- =

> 1.8.3.2
> =