diff options
| author | Rob Herring <robh@kernel.org> | 2019-08-19 06:33:12 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2019-08-19 06:36:44 -0500 |
| commit | 1b44e1861523abce05e190cf312ec8da6ee8fb32 (patch) | |
| tree | f4373760f86899d8f1a7be0b77cf88f6eae85e91 | |
| parent | b096555ff0fc8159e61ce35d7eb188463b96e50d (diff) | |
drm/panfrost: Use drm_gem_shmem_purge()panfrost-locking-fixes
This fixes 2 lockdep problems. First, it uses mutex_trylock for the
pages_lock. Second, it drops the call to panfrost_mmu_unmap which takes
several locks due to runtime PM. The call is not necessary because the
unmapping will get done in GEM close instead.
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c b/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c index d191632b6197..cc15005dc68f 100644 --- a/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c +++ b/drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c @@ -36,17 +36,6 @@ panfrost_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc return count; } -static void panfrost_gem_purge(struct drm_gem_object *obj) -{ - struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj); - mutex_lock(&shmem->pages_lock); - - panfrost_mmu_unmap(to_panfrost_bo(obj)); - drm_gem_shmem_purge_locked(obj); - - mutex_unlock(&shmem->pages_lock); -} - static unsigned long panfrost_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) { @@ -61,8 +50,8 @@ panfrost_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc) list_for_each_entry_safe(shmem, tmp, &pfdev->shrinker_list, madv_list) { if (freed >= sc->nr_to_scan) break; - if (drm_gem_shmem_is_purgeable(shmem)) { - panfrost_gem_purge(&shmem->base); + if (drm_gem_shmem_is_purgeable(shmem) && + drm_gem_shmem_purge(&shmem->base)) { freed += shmem->base.size >> PAGE_SHIFT; list_del_init(&shmem->madv_list); } |