Module: Mesa
Branch: master
Commit: f2509df95cd1d055e91b1558c5d9c5a935067d78
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2509df95cd1d055e91b1558c5d9c5a935067d78
Author: Marcin Slusarz <marcin.slus...@gmail.com>
Date: Fri Apr 13 21:55:56 2012 +0200
xorg/nouveau: switch to libdrm_nouveau-2.0
---
src/gallium/targets/xorg-nouveau/nouveau_xorg.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
index 43470a1..d0c1b83 100644
--- a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
+++ b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
@@ -29,7 +29,7 @@
*/
#include "../../state_trackers/xorg/xorg_winsys.h"
-#include <nouveau_drmif.h>
+#include <nouveau.h>
#include <xorg/dri.h>
#include <xf86drmMode.h>
@@ -139,7 +139,7 @@ nouveau_xorg_pci_probe(DriverPtr driver,
}
busid = DRICreatePCIBusID(device);
- ret = nouveau_device_open(&dev, busid);
+ ret = nouveau_device_open(busid, &dev);
if (ret) {
xf86DrvMsg(-1, X_ERROR, "[drm] failed to open device\n");
free(busid);
@@ -147,7 +147,7 @@ nouveau_xorg_pci_probe(DriverPtr driver,
}
chipset = dev->chipset;
- nouveau_device_close(&dev);
+ nouveau_device_del(&dev);
ret = drmCheckModesettingSupported(busid);
free(busid);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
