From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue, 26 Jun 2012 20:10:12 +0000 (-0700)
Subject: drm/i915: correct IVB default sprite format
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=f4d71056482f0c3306aa752fd626883f60deed96;p=linux-edison.git

drm/i915: correct IVB default sprite format

We shouldn't hit this path anyway, but make it use the IVB sprite format
definition to avoid confusion.

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 64174c507dd..b04109789f2 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -85,7 +85,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb,
 		break;
 	default:
 		DRM_DEBUG_DRIVER("bad pixel format, assuming RGBX888\n");
-		sprctl |= DVS_FORMAT_RGBX888;
+		sprctl |= SPRITE_FORMAT_RGBX888;
 		pixel_size = 4;
 		break;
 	}