xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/dri2/dri2.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 62fcd364ac8c71a2db1db84b17b17cade6832492
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Sat Jan 3 21:12:25 2015 +0100

    dri2: Set vdpau driver name if ddx does not provide any driver name
    
    Currently when the ddx does not set any driver name we set DRI2 driver but
    not the VDPAU driver name. The result is that VDPAU drivers will not get found
    by libvdpau when the modesetting driver is being used.
    
    Just assume that the VDPAU driver matches the DRI2 driver name, this is true
    for nouveau, r300, r600 and radeonsi i.e all VDPAU drivers currently supported
    by mesa.
    
    Signed-off-by: Adel Gadllah <adel.gadllah at gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 0b43369..0c038b3 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -1576,15 +1576,15 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
 
     if (info->version == 3 || info->numDrivers == 0) {
         /* Driver too old: use the old-style driverName field */
-        ds->numDrivers = 1;
-        ds->driverNames = malloc(sizeof(*ds->driverNames));
+        ds->numDrivers = info->driverName ? 1 : 2;
+        ds->driverNames = malloc(ds->numDrivers * sizeof(*ds->driverNames));
         if (!ds->driverNames)
             goto err_out;
 
         if (info->driverName) {
             ds->driverNames[0] = info->driverName;
         } else {
-            ds->driverNames[0] = dri2_probe_driver_name(pScreen, info);
+            ds->driverNames[0] = ds->driverNames[1] = dri2_probe_driver_name(pScreen, info);
             if (!ds->driverNames[0])
                 return FALSE;
         }