| commit | 47842649ef43ba4b81ac2486df8caa0934e01195 | [log] [tgz] |
|---|---|---|
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | Mon Jan 16 11:57:54 2012 -0800 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Sat Jan 21 17:13:05 2012 +0100 |
| tree | dac8890f47c184c2b5441b9de1eec0d82a227037 | |
| parent | c6a32fcbbbc25d7d4e7178aa984e5ef186ee9589 [diff] |
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>