xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/drivers/modesetting/drmmode_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 757e0ee1884f2a34a287d632462e3bc689eccb3d
Author: Mario Kleiner <mario.kleiner.de at gmail.com>
Date:   Mon Mar 12 17:57:50 2018 +0100

    modesetting: Fix page flipping under DRI 3.2.
    
    The check for "no modifier specified" in drmmode_is_format_supported()
    should check for DRM_FORMAT_MOD_INVALID, not for zero, as zero actually
    means DRM_FORMAT_MOD_LINEAR.
    
    This allows page-flipping again when appropriate, as
    tested under nouveau and ati drivers.
    
    Fixes: 9d147305b404 ("modesetting: Check if buffer format is supported when flipping")
    Signed-off-by: Mario Kleiner <mario.kleiner.de at gmail.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index e0a982ac6..6f636ba7b 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -90,7 +90,7 @@ drmmode_is_format_supported(ScrnInfoPtr scrn, uint32_t format, uint64_t modifier
             if (iter->format != format)
                 continue;
 
-            if (modifier == 0) {
+            if (modifier == DRM_FORMAT_MOD_INVALID) {
                 found = TRUE;
                 break;
             }