xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/common/xf86Config.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63c48de63becdee680e90cb2363984c2f8f77fd1
Author: Søren Sandmann <soren.sandmann at gmail.com>
Date:   Fri May 30 16:50:35 2014 -0400

    xfree86: Add "modesetting" to list of fallback drivers
    
    To make X -configure work properly, the output of fixup_video_driver_list()
    should be in order of preference. Otherwise, the config file may use
    the incorrect driver for some devices.
    
    In particular, the drivers that work for all (or many) devices need to be
    last in the list. Since the modesetting driver works for many devices,
    it needs to be considered a fallback driver.
    
    Signed-off-by: Søren Sandmann <ssp at redhat.com>
    Acked-by: Daniel Stone <daniels at collabora.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 2adef44..481674d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -519,7 +519,7 @@ xf86InputDriverlistFromConfig(void)
 static void
 fixup_video_driver_list(const char **drivers)
 {
-    static const char *fallback[4] = { "fbdev", "vesa", "wsfb", NULL };
+    static const char *fallback[5] = { "modesetting", "fbdev", "vesa", "wsfb", NULL };
     const char **end, **drv;
     const char *x;
     int i;