From d575a28a5020ff083836d3d1cf50018a99f49c9f Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Sat, 8 Oct 2011 10:33:20 +0200 Subject: 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. --- src/nouveau_dri2.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c index 2081ce2..d14443f 100644 --- a/src/nouveau_dri2.c +++ b/src/nouveau_dri2.c @@ -428,11 +428,17 @@ nouveau_dri2_init(ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; NVPtr pNv = NVPTR(pScrn); DRI2InfoRec dri2 = { 0 }; + const char *drivernames[2][2] = { + { "nouveau", "nouveau" }, + { "nouveau_vieux", "nouveau_vieux" } + }; if (pNv->Architecture >= NV_ARCH_30) - dri2.driverName = "nouveau"; + dri2.driverNames = drivernames[0]; else - dri2.driverName = "nouveau_vieux"; + dri2.driverNames = drivernames[1]; + dri2.numDrivers = 2; + dri2.driverName = dri2.driverNames[0]; dri2.fd = nouveau_device(pNv->dev)->fd; dri2.deviceName = pNv->drm_device_name; -- cgit v1.2.1