diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-25 23:51:24 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-12-22 19:54:43 +0100 |
| commit | 87499ffdcb1c70f66988cd8febc4ead0ba2f9118 (patch) | |
| tree | f4b3e1400ceafccf3b742c796a983882703a8dba /drivers/gpu/drm/i810/i810_dma.c | |
| parent | 7a6e0daaf4058d1b7dd515bc470ec904454a798c (diff) | |
| download | linux-stable-87499ffdcb1c70f66988cd8febc4ead0ba2f9118.tar.gz linux-stable-87499ffdcb1c70f66988cd8febc4ead0ba2f9118.tar.bz2 linux-stable-87499ffdcb1c70f66988cd8febc4ead0ba2f9118.zip | |
drm/i810: cleanup reclaim_buffers
My dear old i815 always hits the deadlocked on reclaim_buffers
warning. Switch over to the idlelock duct-tape on hope that
works better. I've fired up my i815 and now closing glxgears doesn't
take 5 seconds anymore. \o/
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i810/i810_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i810/i810_dma.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index 8f371e8d630f..6b73c3e57d63 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -888,7 +888,7 @@ static int i810_flush_queue(struct drm_device *dev) } /* Must be called with the lock held */ -static void i810_reclaim_buffers(struct drm_device *dev, +void i810_driver_reclaim_buffers(struct drm_device *dev, struct drm_file *file_priv) { struct drm_device_dma *dma = dev->dma; @@ -1225,12 +1225,17 @@ void i810_driver_preclose(struct drm_device *dev, struct drm_file *file_priv) if (dev_priv->page_flipping) i810_do_cleanup_pageflip(dev); } -} -void i810_driver_reclaim_buffers_locked(struct drm_device *dev, - struct drm_file *file_priv) -{ - i810_reclaim_buffers(dev, file_priv); + if (file_priv->master && file_priv->master->lock.hw_lock) { + drm_idlelock_take(&file_priv->master->lock); + i810_driver_reclaim_buffers(dev, file_priv); + drm_idlelock_release(&file_priv->master->lock); + } else { + /* master disappeared, clean up stuff anyway and hope nothing + * goes wrong */ + i810_driver_reclaim_buffers(dev, file_priv); + } + } int i810_driver_dma_quiescent(struct drm_device *dev) |