]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
drm/nouveau: Don't take dev->struct_mutex in ttm_fini
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 9 Jul 2015 21:32:45 +0000 (23:32 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 11 Aug 2015 10:04:15 +0000 (12:04 +0200)
This is only called in driver load/unload paths, no need to grab any
locks at all. Also, ttm takes care of itself anyway.

Cc: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/nouveau/nouveau_ttm.c

index 18f4497157885a897a9cbec14c390d397a02ca25..1f8ec0e2156cade9705e39a546ff719cdc0835ae 100644 (file)
@@ -424,10 +424,8 @@ nouveau_ttm_init(struct nouveau_drm *drm)
 void
 nouveau_ttm_fini(struct nouveau_drm *drm)
 {
-       mutex_lock(&drm->dev->struct_mutex);
        ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_VRAM);
        ttm_bo_clean_mm(&drm->ttm.bdev, TTM_PL_TT);
-       mutex_unlock(&drm->dev->struct_mutex);
 
        ttm_bo_device_release(&drm->ttm.bdev);