Merge tag 'drm-next-2020-10-23' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / drivers / dma-buf / dma-resv.c

diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 434a331..1c8f258 100644 (file)
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -98,12 +98,14 @@ static int __init dma_resv_lockdep(void)
        struct mm_struct *mm = mm_alloc();
        struct ww_acquire_ctx ctx;
        struct dma_resv obj;
+       struct address_space mapping;
        int ret;
 
        if (!mm)
                return -ENOMEM;
 
        dma_resv_init(&obj);
+       address_space_init_once(&mapping);
 
        mmap_read_lock(mm);
        ww_acquire_init(&ctx, &reservation_ww_class);
@@ -111,6 +113,9 @@ static int __init dma_resv_lockdep(void)
        if (ret == -EDEADLK)
                dma_resv_lock_slow(&obj, &ctx);
        fs_reclaim_acquire(GFP_KERNEL);
+       /* for unmap_mapping_range on trylocked buffer objects in shrinkers */
+       i_mmap_lock_write(&mapping);
+       i_mmap_unlock_write(&mapping);
 #ifdef CONFIG_MMU_NOTIFIER
        lock_map_acquire(&__mmu_notifier_invalidate_range_start_map);
        __dma_fence_might_wait();