summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-04-18 22:47:57 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-04-18 22:47:57 +0000
commit23def7e316846328db92365fc54e4860c06a87d0 (patch)
treeee831808ccba99250d40fea712e1a1ee818e9d22
parentc0aa62771cb697b366ef242730c2a07a5f586adc (diff)
don't call xf86LoadKernelModule() when used from client-side
-rw-r--r--libdrm/xf86drm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 2d7fba6fe..60708144a 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -217,6 +217,7 @@ static int drmOpenByName(const char *name)
group = xf86ConfigDRI.group ? xf86ConfigDRI.group : DRM_DEV_GID;
#endif
+#if defined(XFree86Server)
if (!drmAvailable()) {
/* try to load the kernel module now */
char filename[1000];
@@ -230,6 +231,10 @@ static int drmOpenByName(const char *name)
return -1;
}
}
+#else
+ if (!drmAvailable())
+ return -1;
+#endif
if (!geteuid()) {
dirmode = mode;