diff options
Diffstat (limited to 'linux-core/drm_fops.c')
| -rw-r--r-- | linux-core/drm_fops.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 1f3c0398..40dd7b27 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -414,7 +414,6 @@ int drm_release(struct inode *inode, struct file *filp) } - if (drm_i_have_hw_lock(dev, file_priv)) { DRM_DEBUG("File %p released, freeing lock for context %d\n", filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); @@ -463,6 +462,7 @@ int drm_release(struct inode *inode, struct file *filp) mutex_lock(&dev->struct_mutex); if (file_priv->is_master) { + struct drm_master *master = file_priv->master; struct drm_file *temp; list_for_each_entry(temp, &dev->filelist, lhead) { if ((temp->master == file_priv->master) && @@ -470,6 +470,19 @@ int drm_release(struct inode *inode, struct file *filp) temp->authenticated = 0; } + /* + * Since the master is disappearing, so is the + * possibility to lock. + */ + + if (master->lock.hw_lock) { + if (dev->sigdata.lock == master->lock.hw_lock) + dev->sigdata.lock = NULL; + master->lock.hw_lock = NULL; + master->lock.file_priv = NULL; + wake_up_interruptible_all(&master->lock.lock_queue); + } + if (file_priv->minor->master == file_priv->master) { /* drop the reference held my the minor */ drm_master_put(&file_priv->minor->master); |