---

yaml --- r: 318761 b: refs/heads/master c: 7962652 h: refs/heads/master i: 318759: d8bf342 v: v3
git-mirror · Jul 20, 2012 · 24b091d · 24b091d
1 parent 6fefdc4
commit 24b091d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d71068835e2610576d369d6d4cbf90e0f802a71
+refs/heads/master: 796265235b47cb40ecfa906cb2c3206bd0d07431
diff --git a/trunk/drivers/gpu/drm/i915/intel_sprite.c b/trunk/drivers/gpu/drm/i915/intel_sprite.c
@@ -234,6 +234,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 	dvscntr &= ~DVS_PIXFORMAT_MASK;
 	dvscntr &= ~DVS_RGB_ORDER_XBGR;
 	dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK;
+	dvscntr &= ~DVS_TILED;
 
 	switch (fb->pixel_format) {
 	case DRM_FORMAT_XBGR8888: