xserver: Branch 'master'

[Adam Jackson]

 glamor/glamor_xv.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 947e94a341fa153258e9e86060b83af95934672b
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Feb 10 16:40:43 2016 +0100

    glamor: Fix XvPutImage when src_y != 0
    
    We already take src_y into account when uploading the src data by
    starting at the top line of the src data when uploading.
    
    Adjust src_y accordingly when rendering.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index 9ac60af..3bcf909 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -495,7 +495,7 @@ glamor_xv_put_image(glamor_port_private *port_priv,
     RegionCopy(&port_priv->clip, clipBoxes);
 
     port_priv->src_x = src_x;
-    port_priv->src_y = src_y;
+    port_priv->src_y = src_y - top;
     port_priv->src_w = src_w;
     port_priv->src_h = src_h;
     port_priv->dst_w = drw_w;