Skip to contentSkip to conversation

drm/i915: precendence bug in GT_PARITY_ERROR()

PATCH Applied Dan Carpenter 3 participants 3 messages Sep 24, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: precendence bug in GT_PARITY_ERROR()

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

drivers/gpu/drm/i915/i915_reg.h +1 -1
index c4f9bef..876666b 100644
@@ -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)
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Dan Carpenter

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

Introduced in
commit 35a85ac60618521d41cfdb14f3fbfc8ad7329e9e

Author: Ben Widawsky <[email protected]>
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.

Quoted 18 lines
drivers/gpu/drm/i915/i915_reg.h +1 -1
index c4f9bef..876666b 100644
@@ -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
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Signature · 1 line
Jani Nikula, Intel Open Source Technology Center
#2 lore raw
Quoted 8 lines · Jani Nikula
Quoted 4 lines · Dan Carpenter

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

Quoted 8 lines

Introduced in
commit 35a85ac60618521d41cfdb14f3fbfc8ad7329e9e

Author: Ben Widawsky <[email protected]>
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

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch