summaryrefslogtreecommitdiff
path: root/bsd/drm_bufs.h
diff options
context:
space:
mode:
Diffstat (limited to 'bsd/drm_bufs.h')
-rw-r--r--bsd/drm_bufs.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/bsd/drm_bufs.h b/bsd/drm_bufs.h
index 0dc923d7..0915da84 100644
--- a/bsd/drm_bufs.h
+++ b/bsd/drm_bufs.h
@@ -136,6 +136,16 @@ int DRM(addmap)( DRM_IOCTL_ARGS )
}
map->offset = (unsigned long)map->handle;
if ( map->flags & _DRM_CONTAINS_LOCK ) {
+ /* Prevent a 2nd X Server from creating a 2nd lock */
+ DRM_LOCK();
+ if (dev->lock.hw_lock != NULL) {
+ DRM_UNLOCK();
+ DRM(free)(map->handle, map->size,
+ DRM_MEM_SAREA);
+ DRM(free)(map, sizeof(*map), DRM_MEM_MAPS);
+ return DRM_ERR(EBUSY);
+ }
+ DRM_UNLOCK();
dev->lock.hw_lock = map->handle; /* Pointer to lock */
}
break;