From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Tue, 20 Mar 2012 17:59:09 +0000 (-0700)
Subject: drm/i915: treat src w & h as fixed point in sprite handling code
X-Git-Tag: v3.3.2~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab9da3326bda367eb661dc25cbb5e0b42aa2834b;p=thirdparty%2Fkernel%2Fstable.git

drm/i915: treat src w & h as fixed point in sprite handling code

commit b4db1e35ac59c144965f517bc575a0d75b60b03f upstream.

This was missed when we converted the source values to 16.16 fixed point.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index a0835040c86b8..a82b097468e5a 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/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;