Displaying 2 results from an estimated 2 matches for "drimasterfd".
2012 May 23
1
[PATCH (nouveau)] Add xwayland support
...rm_fd(pNv->xwl_screen);
+ else {
+#endif
/* Load the kernel module, and open the DRM */
bus_id = DRICreatePCIBusID(pNv->PciInfo);
ret = DRIOpenDRMMaster(pScrn, SAREA_MAX, bus_id, "nouveau");
@@ -582,8 +696,13 @@ NVPreInitDRM(ScrnInfoPtr pScrn)
return FALSE;
}
+ drm_fd = DRIMasterFD(pScrn);
+#ifdef XORG_WAYLAND
+ }
+#endif
+
/* Initialise libdrm_nouveau */
- ret = nouveau_device_wrap(DRIMasterFD(pScrn), 1, &pNv->dev);
+ ret = nouveau_device_wrap(drm_fd, 1, &pNv->dev);
if (ret) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[drm] error creating dev...
2012 Jul 04
0
[PATCH] Add xwayland support (v2)
...the DRM */
+ bus_id = DRICreatePCIBusID(pNv->PciInfo);
+ ret = DRIOpenDRMMaster(pScrn, SAREA_MAX, bus_id, "nouveau");
+ free(bus_id);
+ if (!ret) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "[drm] error opening the drm\n");
+ return FALSE;
+ }
+
+ drm_fd = DRIMasterFD(pScrn);
}
/* Initialise libdrm_nouveau */
- ret = nouveau_device_wrap(DRIMasterFD(pScrn), 1, &pNv->dev);
+ ret = nouveau_device_wrap(drm_fd, 1, &pNv->dev);
if (ret) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[drm] error creating device\n");
@@ -586,7 +681,...