]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915: treat src w & h as fixed point in sprite handling code
authorJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 20 Mar 2012 17:59:09 +0000 (10:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Apr 2012 16:13:53 +0000 (09:13 -0700)
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>
drivers/gpu/drm/i915/intel_sprite.c

index a0835040c86b8a803108e078662b73b5d87093b5..a82b097468e5a609e54646e62f98c013a0f92d1f 100644 (file)
@@ -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;