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

drm: fix fd closing ordering. 

If the master fd goes away before the aiglx fd, we try and get a lock
that actually doesn't exist.
main
Dave Airlie 2008-03-12 14:48:01 +10:00
parent cf1a2499ed
commit 981f515e2b
1 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
linux-core/drm_fops.c
View File

@ -402,59 +402,63 @@ int drm_release(struct inode *inode, struct file *filp)
current->pid, (long)old_encode_dev(file_priv->minor->device), current->pid, (long)old_encode_dev(file_priv->minor->device),
dev->open_count); dev->open_count);
if (dev->driver->reclaim_buffers_locked && file_priv->master->lock.hw_lock) { /* if the master has gone away we can't do anything with the lock */
if (drm_i_have_hw_lock(dev, file_priv)) { if (file_priv->minor->master) {
dev->driver->reclaim_buffers_locked(dev, file_priv); if (dev->driver->reclaim_buffers_locked && file_priv->master->lock.hw_lock) {
} else { if (drm_i_have_hw_lock(dev, file_priv)) {
unsigned long _end=jiffies + 3*DRM_HZ; dev->driver->reclaim_buffers_locked(dev, file_priv);
int locked = 0; } else {
unsigned long _end=jiffies + 3*DRM_HZ;
drm_idlelock_take(&file_priv->master->lock); int locked = 0;
/* drm_idlelock_take(&file_priv->master->lock);
* Wait for a while.
*/ /*
* Wait for a while.
do{ */
spin_lock(&file_priv->master->lock.spinlock);
locked = file_priv->master->lock.idle_has_lock; do{
spin_unlock(&file_priv->master->lock.spinlock); spin_lock(&file_priv->master->lock.spinlock);
if (locked) locked = file_priv->master->lock.idle_has_lock;
break; spin_unlock(&file_priv->master->lock.spinlock);
schedule(); if (locked)
} while (!time_after_eq(jiffies, _end)); break;
schedule();
if (!locked) { } while (!time_after_eq(jiffies, _end));
DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n"
"\tdriver to use reclaim_buffers_idlelocked() instead.\n" if (!locked) {
"\tI will go on reclaiming the buffers anyway.\n"); DRM_ERROR("reclaim_buffers_locked() deadlock. Please rework this\n"
"\tdriver to use reclaim_buffers_idlelocked() instead.\n"
"\tI will go on reclaiming the buffers anyway.\n");
}
dev->driver->reclaim_buffers_locked(dev, file_priv);
drm_idlelock_release(&file_priv->master->lock);
} }
dev->driver->reclaim_buffers_locked(dev, file_priv);
drm_idlelock_release(&file_priv->master->lock);
} }
}
if (dev->driver->reclaim_buffers_idlelocked && file_priv->master->lock.hw_lock) { if (dev->driver->reclaim_buffers_idlelocked && file_priv->master->lock.hw_lock) {
drm_idlelock_take(&file_priv->master->lock); drm_idlelock_take(&file_priv->master->lock);
dev->driver->reclaim_buffers_idlelocked(dev, file_priv); dev->driver->reclaim_buffers_idlelocked(dev, file_priv);
drm_idlelock_release(&file_priv->master->lock); drm_idlelock_release(&file_priv->master->lock);
} }
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));
drm_lock_free(&file_priv->master->lock,
_DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
}
if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) && if (drm_i_have_hw_lock(dev, file_priv)) {
!dev->driver->reclaim_buffers_locked) { DRM_DEBUG("File %p released, freeing lock for context %d\n",
dev->driver->reclaim_buffers(dev, file_priv); filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
drm_lock_free(&file_priv->master->lock,
_DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock));
}
if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
!dev->driver->reclaim_buffers_locked) {
dev->driver->reclaim_buffers(dev, file_priv);
}
} }
drm_fasync(-1, filp, 0); drm_fasync(-1, filp, 0);