From: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue, 19 Jan 2010 17:14:19 +0000 (+0000)
Subject: st/xorg: Pass kernel driver name to drmOpen
X-Git-Tag: mesa-7.8~1360^2~76
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65354a7e3d8fd094837b7a999e8975dcfbd9d9c9;p=platform%2Fupstream%2Fmesa.git

st/xorg: Pass kernel driver name to drmOpen
---

diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c
index b02fe68..ed185d3 100644
--- a/src/gallium/state_trackers/xorg/xorg_driver.c
+++ b/src/gallium/state_trackers/xorg/xorg_driver.c
@@ -206,10 +206,19 @@ drv_init_drm(ScrnInfoPtr pScrn)
 		ms->PciInfo->dev, ms->PciInfo->func
 	    );
 
-	ms->fd = drmOpen(NULL, BusID);
 
-	if (ms->fd < 0)
-	    return FALSE;
+	ms->api = drm_api_create();
+	ms->fd = drmOpen(ms->api ? ms->api->driver_name : NULL, BusID);
+
+	if (ms->fd >= 0)
+	    return TRUE;
+
+	if (ms->api->destroy)
+	    ms->api->destroy(ms->api);
+
+	ms->api = NULL;
+
+	return FALSE;
     }
 
     return TRUE;
@@ -229,7 +238,6 @@ drv_init_resource_management(ScrnInfoPtr pScrn)
     if (ms->screen || ms->kms)
 	return TRUE;
 
-    ms->api = drm_api_create();
     if (ms->api) {
 	ms->screen = ms->api->create_screen(ms->api, ms->fd, NULL);