summaryrefslogtreecommitdiff
path: root/linux/drm_fops.h
diff options
context:
space:
mode:
authorDavid Dawes <dawes@xfree86.org>2003-04-17 18:41:28 +0000
committerDavid Dawes <dawes@xfree86.org>2003-04-17 18:41:28 +0000
commitc2d7ff1bf98f92add98fb76b63d2bdb190f3cf2c (patch)
tree6afaad9978c0a555d27a441bd982eddbe197858d /linux/drm_fops.h
parentd1b7f551e6d582cd9c44d23883de1f6121907627 (diff)
Bring some drm module changes over from the XFree86 trunk:
- Reset 'bound' flag for an agp entry after undbind succeeded in drm_agpsupport.h (Egbert Eich). - Ignore hw_lock for drm device if lock was set by a different instance (ie Xserver) to prevent second server from spinning in driver release function (currently only relevant for i8xx drm drivers) (David Dawes). - Use the agpgart "key" for the unique handle for bindings rather than the memory address (the key is guaranteed to be unique) (David Dawes).
Diffstat (limited to 'linux/drm_fops.h')
-rw-r--r--linux/drm_fops.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drm_fops.h b/linux/drm_fops.h
index 10d1aed1..833409f0 100644
--- a/linux/drm_fops.h
+++ b/linux/drm_fops.h
@@ -57,6 +57,7 @@ int DRM(open_helper)(struct inode *inode, struct file *filp, drm_device_t *dev)
priv->dev = dev;
priv->ioctl_count = 0;
priv->authenticated = capable(CAP_SYS_ADMIN);
+ priv->lock_count = 0;
down(&dev->struct_sem);
if (!dev->file_last) {