From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon, 16 Jan 2012 19:57:54 +0000 (-0800)
Subject: drm/i915: properly mask and or watermark values for sprites
X-Git-Tag: v3.4-rc1~143^2~89^2~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47842649ef43ba4b81ac2486df8caa0934e01195;p=pandora-kernel.git

drm/i915: properly mask and or watermark values for sprites

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@virtuousgeek.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

Reading git-diff-tree failed