diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-03-23 13:28:33 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-03-23 13:28:33 +1100 |
| commit | 040ac32048d5efabd557c1e0a6ab8aec2c710c56 (patch) | |
| tree | ba714a33105695c7d57ff833dbd18875ddb82492 /drivers/char/drm/drm_irq.c | |
| parent | 4b560fde06aeb342f3ff0bce924627ab722d251a (diff) | |
| download | linux-040ac32048d5efabd557c1e0a6ab8aec2c710c56.tar.gz linux-040ac32048d5efabd557c1e0a6ab8aec2c710c56.tar.bz2 linux-040ac32048d5efabd557c1e0a6ab8aec2c710c56.zip | |
drm: fix driver deadlock with AIGLX and reclaim_buffers_locked
Bugzilla Bug #9457
Add refcounting of user waiters to the DRM hardware lock, so that we can use
DRM_LOCK_CONT flag more conservatively.
Also add a kernel waiter refcount that if nonzero transfers the lock for the
kernel context when it is released. This is useful when waiting for idle and can be used for very simple fence object driver implementations for the new memory manager
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_irq.c')
| -rw-r--r-- | drivers/char/drm/drm_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c index 9d00c51fe2c4..2e75331fd83e 100644 --- a/drivers/char/drm/drm_irq.c +++ b/drivers/char/drm/drm_irq.c @@ -424,7 +424,7 @@ static void drm_locked_tasklet_func(unsigned long data) spin_lock_irqsave(&dev->tasklet_lock, irqflags); if (!dev->locked_tasklet_func || - !drm_lock_take(&dev->lock.hw_lock->lock, + !drm_lock_take(&dev->lock, DRM_KERNEL_CONTEXT)) { spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); return; @@ -435,7 +435,7 @@ static void drm_locked_tasklet_func(unsigned long data) dev->locked_tasklet_func(dev); - drm_lock_free(dev, &dev->lock.hw_lock->lock, + drm_lock_free(&dev->lock, DRM_KERNEL_CONTEXT); dev->locked_tasklet_func = NULL; |