xserver: Branch 'master'

[Adam Jackson]

 fb/fbimage.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b6a068d21997ca812e665ed058e72eb4626c129
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Oct 3 15:37:03 2016 -0700

    fb: XYPixmap format PutImage includes all planes in depth
    
    Unlike GetImage, for which the provided planemask restricts the data
    delivered, for PutImage in XYPixmap format, all of the planes in the
    drawable depth are sent and those outside the plane mask are simply
    ignored.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/fb/fbimage.c b/fb/fbimage.c
index 59daa21..bac5de6 100644
--- a/fb/fbimage.c
+++ b/fb/fbimage.c
@@ -63,8 +63,8 @@ fbPutImage(DrawablePtr pDrawable,
                              fbReplicatePixel(i, pDrawable->bitsPerPixel),
                              pGC->alu,
                              TRUE, x, y, w, h, src, srcStride, leftPad);
-                src += srcStride * h;
             }
+            src += srcStride * h;
         }
         break;
     case ZPixmap: