| Message ID | 1418060138-5004-2-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 08 Dec 2014, Damien Lespiau <damien.lespiau@intel.com> wrote: > 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> Pushed these two to drm-intel-next-fixes, thanks for the patches. BR, Jani. > --- > drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c > index 4f63c39..c715ef0 100644 > --- a/drivers/gpu/drm/i915/intel_ringbuffer.c > +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c > @@ -734,10 +734,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)) > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 4f63c39..c715ef0 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -734,10 +734,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))
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> --- drivers/gpu/drm/i915/intel_ringbuffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)