From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue, 26 Jun 2012 20:10:11 +0000 (-0700)
Subject: drm/i915: mask tiled bit when updating IVB sprites
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e86fe0d31722090e3bb72a3e8aab70f07e2c6b77;p=~shefty%2Frdma-dev.git

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 9d7777bc154..64174c507dd 100644
--- 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: