summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2014-12-08 18:35:38 +0100
committerJani Nikula <jani.nikula@intel.com>2014-12-10 15:39:24 +0100
commit26459343e0fac1ea4cb5192c490e3e519eed74dd (patch)
tree9d9b57bebdda651662841a4d9bd25bf2cb35a6b6 /drivers/gpu
parentdrm/i915: Invert the mask and val arguments in wa_add() and WA_REG() (diff)
downloadlinux-26459343e0fac1ea4cb5192c490e3e519eed74dd.tar.xz
linux-26459343e0fac1ea4cb5192c490e3e519eed74dd.zip
drm/i915: Remove '& 0xffff' from the mask given to WA_REG()
We may be hidding bugs by doing that, so let remove it and have the actual mask value shine through, for better or worse. Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index ef05af02763a..9f445e9a75d1 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -724,10 +724,10 @@ static int wa_add(struct drm_i915_private *dev_priv,
}
#define WA_SET_BIT_MASKED(addr, mask) \
- WA_REG(addr, (mask) & 0xffff, _MASKED_BIT_ENABLE(mask))
+ WA_REG(addr, (mask), _MASKED_BIT_ENABLE(mask))
#define WA_CLR_BIT_MASKED(addr, mask) \
- WA_REG(addr, (mask) & 0xffff, _MASKED_BIT_DISABLE(mask))
+ WA_REG(addr, (mask), _MASKED_BIT_DISABLE(mask))
#define WA_SET_FIELD_MASKED(addr, mask, value) \
WA_REG(addr, mask, _MASKED_FIELD(mask, value))