xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_dri2.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7c7b38e0b375b6e8853ad2d1092302ea83f6f570
Author: David Heidelberger <david.heidelberger at ixit.cz>
Date:   Sun Oct 12 16:34:21 2014 +0200

    radeon/vdpau: don't report VDPAU for < r300
    
    Signed-off-by: David Heidelberger <david.heidelberger at ixit.cz>

diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 9a9918b..64e541f 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -1608,7 +1608,12 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
         dri2_info.ScheduleWaitMSC = radeon_dri2_schedule_wait_msc;
         dri2_info.numDrivers = RADEON_ARRAY_SIZE(driverNames);
         dri2_info.driverNames = driverNames;
-        driverNames[0] = driverNames[1] = dri2_info.driverName;
+        driverNames[0] = dri2_info.driverName;
+
+        if (info->ChipFamily >= CHIP_FAMILY_R300)
+            driverNames[1] = driverNames[0];
+        else
+            driverNames[1] = NULL; /* no VDPAU support */
 
 	if (DRI2InfoCnt == 0) {
 #if HAS_DIXREGISTERPRIVATEKEY