summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Clark <robdclark@gmail.com>2012-10-07 08:56:11 -0500
committerRob Clark <robdclark@gmail.com>2012-10-07 08:56:11 -0500
commit313b8ac299fd9a191b02d31a446536a5e44c8101 (patch)
tree2170e29d9565d20520e2c03c0970477e714c40c6
parentf77054c9b20b958dd26a33ceb71538d2f06d049f (diff)
driver: fix issue w/ lightdm
We might not be master yet, in which case drmSetInterfaceVersion() would fail. Don't be a crybaby about it.
-rw-r--r--src/msm-driver.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/msm-driver.c b/src/msm-driver.c
index 36d8282..d024d75 100644
--- a/src/msm-driver.c
+++ b/src/msm-driver.c
@@ -107,7 +107,6 @@ MSMInitDRM(ScrnInfoPtr pScrn)
MSMPtr pMsm = MSMPTR(pScrn); int i, fd;
drmVersionPtr version;
drmSetVersion sv;
- int ret;
/* Ugly, huh? */
@@ -148,13 +147,11 @@ MSMInitDRM(ScrnInfoPtr pScrn)
sv.drm_dd_major = -1;
sv.drm_dd_minor = -1;
- ret = drmSetInterfaceVersion(fd, &sv);
- if (ret != 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
- "Unable to set the DRM version: %d\n", ret);
- close(fd);
- return FALSE;
- }
+ /* this can fail if we are not master.. which we might not
+ * be at this point.. maybe we should call this again when
+ * we get master to be sure.
+ */
+ drmSetInterfaceVersion(fd, &sv);
pMsm->drmFD = fd;
return TRUE;