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/via_drv.c | |
| parent | 4b560fde06aeb342f3ff0bce924627ab722d251a (diff) | |
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/via_drv.c')
| -rw-r--r-- | drivers/char/drm/via_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/drm/via_drv.c b/drivers/char/drm/via_drv.c index bb9dde8b191..2d4957ab256 100644 --- a/drivers/char/drm/via_drv.c +++ b/drivers/char/drm/via_drv.c @@ -52,7 +52,8 @@ static struct drm_driver driver = { .dma_quiescent = via_driver_dma_quiescent, .dri_library_name = dri_library_name, .reclaim_buffers = drm_core_reclaim_buffers, - .reclaim_buffers_locked = via_reclaim_buffers_locked, + .reclaim_buffers_locked = NULL, + .reclaim_buffers_idlelocked = via_reclaim_buffers_locked, .lastclose = via_lastclose, .get_map_ofs = drm_core_get_map_ofs, .get_reg_ofs = drm_core_get_reg_ofs, |