From c2d7ff1bf98f92add98fb76b63d2bdb190f3cf2c Mon Sep 17 00:00:00 2001 From: David Dawes Date: Thu, 17 Apr 2003 18:41:28 +0000 Subject: 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). --- linux-core/drm_fops.c | 1 + 1 file changed, 1 insertion(+) (limited to 'linux-core/drm_fops.c') diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 10d1aed1..833409f0 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -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) { -- cgit v1.2.3