summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2012-07-13 15:50:33 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-07-20 12:21:40 +0200
commit796265235b47cb40ecfa906cb2c3206bd0d07431 (patch)
tree861d9a4a95993bc522988329449eeed8d7739e6c /drivers/gpu
parent0d71068835e2610576d369d6d4cbf90e0f802a71 (diff)
downloadlinux-796265235b47cb40ecfa906cb2c3206bd0d07431.tar.gz
linux-796265235b47cb40ecfa906cb2c3206bd0d07431.tar.bz2
linux-796265235b47cb40ecfa906cb2c3206bd0d07431.zip
drm/i915: mask tiled bit when updating ILK sprites
Or going from tiled to untiled may break. Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 1a1483b924d0..cc8df4de2d92 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/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: