[Intel-gfx] [PATCH] drm/i915: properly mask and or watermark values for sprites

[Keith Packard]

On Mon, 16 Jan 2012 11:57:54 -0800, Jesse Barnes <jbarnes at virtuousgeek.org> wrote:

> Now that we're using the sprite WM fields, we need to take care not to
> clobber them in the main update_wm functions.  While we're at it, make
> sure we mask out the old sprite wm value before or'ing in the new one
> when the sprite wm is updated.

> 
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

Reviewed-by: Keith Packard <keithp at keithp.com>

<bikeshed>

Would avoid line wrapping with:

> +		val = I915_READ(WM0_PIPEA_ILK);
> +		val &= ~(WM0_PIPE_PLANE_MASK | WM0_PIPE_CURSOR_MASK);
> +		I915_WRITE(WM0_PIPEA_ILK, val |
> +			   ((plane_wm << WM0_PIPE_PLANE_SHIFT) | cursor_wm));

+		val = I915_READ(WM0_PIPEA_ILK);
+		val &= ~(WM0_PIPE_PLANE_MASK | WM0_PIPE_CURSOR_MASK);
+		val |= ((plane_wm << WM0_PIPE_PLANE_SHIFT) | cursor_wm);
+		I915_WRITE(WM0_PIPEA_ILK, val);

</bikeshed>

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20120119/c020056d/attachment.sig>