summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarcin Slusarz <[email protected]>2012-04-13 21:55:56 +0200
committerMarcin Slusarz <[email protected]>2012-04-13 21:55:56 +0200
commitf2509df95cd1d055e91b1558c5d9c5a935067d78 (patch)
treeeddb25005f54e3a8980922cdc18f953d5b361f58 /src
parent3dd12ccc069790872e95f3f51ddc39991a06242f (diff)
xorg/nouveau: switch to libdrm_nouveau-2.0
Diffstat (limited to 'src')
-rw-r--r--src/gallium/targets/xorg-nouveau/nouveau_xorg.c6
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 43470a1656b..d0c1b834f64 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);