diff options
| author | David Herrmann | 2014-07-23 09:01:12 +0200 |
|---|---|---|
| committer | David Herrmann | 2014-08-05 16:07:45 +0200 |
| commit | 9f8d21ea276177547725a60cefc1b6da742f14d3 (patch) | |
| tree | 1511b996ef09915f43246b7ecf145b2bd2ac349b /drivers/gpu/drm/drm_fops.c | |
| parent | drm/ttm: Pass GFP flags in order to avoid deadlock. (diff) | |
| download | kernel-qcow2-linux-9f8d21ea276177547725a60cefc1b6da742f14d3.tar.gz kernel-qcow2-linux-9f8d21ea276177547725a60cefc1b6da742f14d3.tar.xz kernel-qcow2-linux-9f8d21ea276177547725a60cefc1b6da742f14d3.zip | |
drm: extract legacy ctxbitmap flushing
The ctxbitmap code is only used by legacy drivers so lets try to keep it
as separated as possible. Furthermore, the locking is non-obvious and
kinda weird with ctxlist_mutex *and* struct_mutex. Keeping all ctxbitmap
access in one file is much easier to review and makes drm_release() more
readable.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/drm_fops.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fops.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index bc583fe51e45..55143f7747f3 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c @@ -457,25 +457,7 @@ int drm_release(struct inode *inode, struct file *filp) if (dev->driver->driver_features & DRIVER_GEM) drm_gem_release(dev, file_priv); - mutex_lock(&dev->ctxlist_mutex); - if (!list_empty(&dev->ctxlist)) { - struct drm_ctx_list *pos, *n; - - list_for_each_entry_safe(pos, n, &dev->ctxlist, head) { - if (pos->tag == file_priv && - pos->handle != DRM_KERNEL_CONTEXT) { - if (dev->driver->context_dtor) - dev->driver->context_dtor(dev, - pos->handle); - - drm_ctxbitmap_free(dev, pos->handle); - - list_del(&pos->head); - kfree(pos); - } - } - } - mutex_unlock(&dev->ctxlist_mutex); + drm_ctxbitmap_flush(dev, file_priv); mutex_lock(&dev->master_mutex); |