aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2012-03-20 10:59:09 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-13 09:13:53 -0700
commitab9da3326bda367eb661dc25cbb5e0b42aa2834b (patch)
tree6b3ffa369ba68c9fa28d534ee745459111e56dcd
parent40c47fc408d25e6700be1f15822f253caa53b36e (diff)
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>
-rw-r--r--drivers/gpu/drm/i915/intel_sprite.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index a0835040c86..a82b097468e 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;