dri2: Use modesetting's master fd instead of opening our own non-master.

This fixes failure to auth DRI2 clients under KMS.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 7a95d027..f03be43c 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1691,7 +1691,17 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 	    pI830->PciInfo->dev,
 	    pI830->PciInfo->func);
 
-    info.fd = drmOpen("i915", buf);
+    info.fd = -1;
+
+#ifdef XF86DRM_MODE
+    /* Use the already opened (master) fd from modesetting */
+    if (pI830->use_drm_mode)
+	info.fd = pI830->drmSubFD;
+#endif
+
+    if (info.fd < 0)
+	info.fd = drmOpen("i915", buf);
+
     if (info.fd < 0) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Failed to open DRM device\n");
 	return FALSE;