xserver: Branch 'master'

[Michel Dänzer]

 glamor/glamor_copy.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ffda82ed04d28feae2e001dbd0c32d6c795d90b1
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Jun 6 18:42:06 2017 +0900

    glamor: Fix temporary pixmap coordinate offsets
    
    The previous values happened to work in basic cases, but not in general
    if the destination is a subwindow or has a border.
    
    Fixes crash with xli, which moves a large subwindow inside a smaller
    parent window for scrolling.
    
    No regressions with xterm, x11perf -copyplane or the xscreensaver
    phosphor hack.
    
    Bug: https://bugs.debian.org/857983
    Reviewed-by: Keith Packard <keithp at keithp.com>

diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
index ff8f44ef1..ed96b2b1e 100644
--- a/glamor/glamor_copy.c
+++ b/glamor/glamor_copy.c
@@ -230,8 +230,8 @@ glamor_copy_cpu_fbo(DrawablePtr src,
             goto bail;
         }
 
-        src_pix->drawable.x = -dst->x;
-        src_pix->drawable.y = -dst->y;
+        src_pix->drawable.x = dst_xoff;
+        src_pix->drawable.y = dst_yoff;
 
         fbGetDrawable(&src_pix->drawable, src_bits, src_stride, src_bpp, src_xoff,
                       src_yoff);