geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop struct_mutex while waiting in drm_client_lock_take 

struct_mutex cannot be held while blocking on DRM lock.
main
Keith Packard 2008-06-03 21:49:51 -07:00
parent 8a3b510405
commit 0903de0c8f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux-core/drm_lock.c
View File

@ -393,6 +393,7 @@ int drm_client_lock_take(struct drm_device *dev, struct drm_file *file_priv)
if (drm_i_have_hw_lock(dev, file_priv))
return 0;
mutex_unlock (&dev->struct_mutex);
/* Client doesn't hold the lock. Block taking the lock with the kernel
* context on behalf of the client, and return whether we were
* successful.
@ -407,15 +408,15 @@ int drm_client_lock_take(struct drm_device *dev, struct drm_file *file_priv)
dev->lock.user_waiters--;
if (ret != 0) {
spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
return ret;
} else {
dev->lock.file_priv = file_priv;
dev->lock.lock_time = jiffies;
dev->lock.kernel_held = 1;
file_priv->lock_count++;
spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
return 0;
}
mutex_lock (&dev->struct_mutex);
return ret;
}
EXPORT_SYMBOL(drm_client_lock_take);