summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2012-06-26 13:10:11 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-06-27 17:03:23 +0200
commite86fe0d31722090e3bb72a3e8aab70f07e2c6b77 (patch)
treec37b30968006c8dac76dd8f06a917db1a9c05f45
parent25c0af768c679e44587f4cf66934d00b84d70061 (diff)
downloadop-kernel-dev-e86fe0d31722090e3bb72a3e8aab70f07e2c6b77.zip
op-kernel-dev-e86fe0d31722090e3bb72a3e8aab70f07e2c6b77.tar.gz
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>
-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 9d7777b..64174c5 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:
OpenPOWER on IntegriCloud