drm/i915: mask tiled bit when updating IVB sprites

Or going from tiled to untiled may break.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 9d7777bc15459abff49fc037c70f254db63a995b..64174c507dd9b65d90c3e61d58a9b246378b2f49 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -56,6 +56,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
        sprctl &= ~SPRITE_PIXFORMAT_MASK;
        sprctl &= ~SPRITE_RGB_ORDER_RGBX;
        sprctl &= ~SPRITE_YUV_BYTE_ORDER_MASK;
+       sprctl &= ~SPRITE_TILED;
 
        switch (fb->pixel_format) {
        case DRM_FORMAT_XBGR8888: