xserver: Branch 'master'

[Adam Jackson]

 dri3/dri3_screen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c593d843f6305dd8bc5fa7762273d319a223abc4
Author: Daniel Stone <daniels at collabora.com>
Date:   Tue Apr 24 21:27:47 2018 +0100

    dri3: Don't call vfuncs on old DRI3 screens
    
    Only call the get_supported_modifiers vfunc if the DRI3 screen struct is
    sufficiently new.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c
index 23e33f401..a1d6f47dd 100644
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -171,7 +171,7 @@ cache_formats_and_modifiers(ScreenPtr screen)
     if (!info)
         return BadImplementation;
 
-    if (!info->get_formats || !info->get_modifiers) {
+    if (info->version < 2 || !info->get_formats || !info->get_modifiers) {
         ds->formats = NULL;
         ds->num_formats = 0;
         ds->formats_cached = TRUE;