xserver: Branch 'master'

[Adam Jackson]

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

New commits:
commit 12a6b189fb17894d2c3851b70a396bbf41f444c6
Author: David Woodhouse <dwmw2 at infradead.org>
Date:   Tue Apr 17 22:22:21 2018 +0100

    glamor: fix glamor_xv_query_image_attributes() for odd-width images
    
    Images which are one pixel wider than a multiple of 8 are being handled
    incorrectly. Other drivers round up the width to a multiple of two
    before they start calculating. Do the same.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=795235
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>

diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c
index e0375d7cd..62fc4fff5 100644
--- a/glamor/glamor_xv.c
+++ b/glamor/glamor_xv.c
@@ -210,6 +210,7 @@ glamor_xv_query_image_attributes(int id,
     switch (id) {
     case FOURCC_YV12:
     case FOURCC_I420:
+        *w = ALIGN(*w, 2);
         *h = ALIGN(*h, 2);
         size = ALIGN(*w, 4);
         if (pitches)