public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [patch] drm/i915: precendence bug in GT_PARITY_ERROR()
@ 2013-09-24  7:57 Dan Carpenter
  2013-09-24  8:22 ` Jani Nikula
  0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2013-09-24  7:57 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: David Airlie, intel-gfx, dri-devel, kernel-janitors

The | operation has higher precedence than "?:" so the macro always
returns GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c4f9bef..876666b 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -940,7 +940,7 @@
 
 #define GT_PARITY_ERROR(dev) \
 	(GT_RENDER_L3_PARITY_ERROR_INTERRUPT | \
-	 IS_HASWELL(dev) ? GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 : 0)
+	 (IS_HASWELL(dev) ? GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 : 0))
 
 /* These are all the "old" interrupts */
 #define ILK_BSD_USER_INTERRUPT				(1<<5)

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [patch] drm/i915: precendence bug in GT_PARITY_ERROR()
  2013-09-24  7:57 [patch] drm/i915: precendence bug in GT_PARITY_ERROR() Dan Carpenter
@ 2013-09-24  8:22 ` Jani Nikula
  2013-09-24  9:25   ` Daniel Vetter
  0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2013-09-24  8:22 UTC (permalink / raw)
  To: Dan Carpenter, Daniel Vetter; +Cc: intel-gfx, kernel-janitors, dri-devel

On Tue, 24 Sep 2013, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> The | operation has higher precedence than "?:" so the macro always
> returns GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Introduced in
commit 35a85ac60618521d41cfdb14f3fbfc8ad7329e9e
Author: Ben Widawsky <benjamin.widawsky@intel.com>
Date:   Thu Sep 19 11:13:41 2013 -0700

    drm/i915: Add second slice l3 remapping

which hasn't been merged to Linus' tree yet.


BR,
Jani.


>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index c4f9bef..876666b 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -940,7 +940,7 @@
>  
>  #define GT_PARITY_ERROR(dev) \
>  	(GT_RENDER_L3_PARITY_ERROR_INTERRUPT | \
> -	 IS_HASWELL(dev) ? GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 : 0)
> +	 (IS_HASWELL(dev) ? GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 : 0))
>  
>  /* These are all the "old" interrupts */
>  #define ILK_BSD_USER_INTERRUPT				(1<<5)
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Jani Nikula, Intel Open Source Technology Center

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [patch] drm/i915: precendence bug in GT_PARITY_ERROR()
  2013-09-24  8:22 ` Jani Nikula
@ 2013-09-24  9:25   ` Daniel Vetter
  0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2013-09-24  9:25 UTC (permalink / raw)
  To: Jani Nikula
  Cc: Dan Carpenter, Daniel Vetter, intel-gfx, kernel-janitors,
	dri-devel

On Tue, Sep 24, 2013 at 11:22:56AM +0300, Jani Nikula wrote:
> On Tue, 24 Sep 2013, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > The | operation has higher precedence than "?:" so the macro always
> > returns GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1.
> >
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> Introduced in
> commit 35a85ac60618521d41cfdb14f3fbfc8ad7329e9e
> Author: Ben Widawsky <benjamin.widawsky@intel.com>
> Date:   Thu Sep 19 11:13:41 2013 -0700
> 
>     drm/i915: Add second slice l3 remapping
> 
> which hasn't been merged to Linus' tree yet.

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-09-24  9:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-24  7:57 [patch] drm/i915: precendence bug in GT_PARITY_ERROR() Dan Carpenter
2013-09-24  8:22 ` Jani Nikula
2013-09-24  9:25   ` Daniel Vetter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox