| From 4186e9aa172244a2b22368ddf1312aeb0eb7c8c0 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Tue, 24 Sep 2013 10:57:35 +0300 |
| Subject: 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. |
| |
| This regression has been introduce in "drm/i915: Add second slice l3 |
| remapping". |
| |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Reviewed-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 45f80d53b1fe2f68c6c5b2b4518b67278bcde805) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_reg.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/i915_reg.h |
| +++ b/drivers/gpu/drm/i915/i915_reg.h |
| @@ -941,7 +941,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) |
