summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaarten Lankhorst <m.b.lankhorst@gmail.com>2011-10-18 14:30:39 +0200
committerMichel Dänzer <michel.daenzer@amd.com>2011-10-19 16:40:55 +0200
commitf6f1b4f7789cfef763c063e671b76b60be8bdd8e (patch)
treefa2100576cf2cb3e11cb0bb5f2818ade6de916f5
parenta6b2bd2d184f10d4c56c4ee17186aedb238a36ec (diff)
dri2: Add vdpau driver name entry
libvdpau has a driver loading mechanism that looks for a dri2 driver first before falling back to nvidia, so lets use that. Allows use of libvdpau_rx00 without having to set things up separately, similar to the patch to xf86-video-nouveau. Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com> Reviewed-by: Christian König <deathsimple@vodafone.de> Reviewed-by: Michel Dänzer <michel@daenzer.net> Tested-by: Michel Dänzer <michel@daenzer.net>
-rw-r--r--src/radeon_dri2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
index 46573a7c..88117a55 100644
--- a/src/radeon_dri2.c
+++ b/src/radeon_dri2.c
@@ -1299,7 +1299,7 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
DRI2InfoRec dri2_info = { 0 };
#ifdef USE_DRI2_SCHEDULING
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
- const char *driverNames[1];
+ const char *driverNames[2];
Bool scheduling_works = TRUE;
#endif
@@ -1364,9 +1364,9 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
dri2_info.ScheduleSwap = radeon_dri2_schedule_swap;
dri2_info.GetMSC = radeon_dri2_get_msc;
dri2_info.ScheduleWaitMSC = radeon_dri2_schedule_wait_msc;
- dri2_info.numDrivers = 1;
+ dri2_info.numDrivers = RADEON_ARRAY_SIZE(driverNames);
dri2_info.driverNames = driverNames;
- driverNames[0] = dri2_info.driverName;
+ driverNames[0] = driverNames[1] = dri2_info.driverName;
if (pRADEONEnt->dri2_info_cnt == 0) {
#if HAS_DIXREGISTERPRIVATEKEY