From 8c0344d3edd4b3bb426e1606f2223f949730d6af Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue, 20 Mar 2012 10:59:09 -0700
Subject: [PATCH] --- yaml --- r: 298531 b: refs/heads/master c:
 b4db1e35ac59c144965f517bc575a0d75b60b03f h: refs/heads/master i:   298529:
 24456de13bcd74ead1466d19037e21c6b4ae779b   298527:
 1b8de4a8de4499c03018e6fe5810d1d6113902a8 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/i915/intel_sprite.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b6f452a3791..e34bf98dffeb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97effadb65ed08809e1720c8d3ee80b73a93665c
+refs/heads/master: b4db1e35ac59c144965f517bc575a0d75b60b03f
diff --git a/trunk/drivers/gpu/drm/i915/intel_sprite.c b/trunk/drivers/gpu/drm/i915/intel_sprite.c
index 7aa0450399a1..a464771a7240 100644
--- a/trunk/drivers/gpu/drm/i915/intel_sprite.c
+++ b/trunk/drivers/gpu/drm/i915/intel_sprite.c
@@ -411,6 +411,9 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
 
 	old_obj = intel_plane->obj;
 
+	src_w = src_w >> 16;
+	src_h = src_h >> 16;
+
 	/* Pipe must be running... */
 	if (!(I915_READ(PIPECONF(pipe)) & PIPECONF_ENABLE))
 		return -EINVAL;