drm/panfrost: Fix missing unlock on error in panfrost_mmu_map_fault_addr() (3efdf83c) · Commits · 戴 / test

Add the missing unlock before return from function panfrost_mmu_map_fault_addr() in the error handling case. Fixes: ("drm/panfrost: Add support for GPU heap allocations") Signed-off-by:

Wei Yongjun <weiyongjun1@huawei.com> Reviewed-by:

Steven Price <steven.price@arm.com> Signed-off-by:

Rob Herring <robh@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/20190814044814.102294-1-weiyongjun1@huawei.com

drivers/gpu/drm/panfrost/panfrost_mmu.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -327,14 +327,17 @@ int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr)
		if (!bo->base.pages) {
		bo->sgts = kvmalloc_array(bo->base.base.size / SZ_2M,
		sizeof(struct sg_table), GFP_KERNEL \| __GFP_ZERO);
		if (!bo->sgts)
		if (!bo->sgts) {
		mutex_unlock(&bo->base.pages_lock);
		return -ENOMEM;
		}

		pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
		sizeof(struct page *), GFP_KERNEL \| __GFP_ZERO);
		if (!pages) {
		kfree(bo->sgts);
		bo->sgts = NULL;
		mutex_unlock(&bo->base.pages_lock);
		return -ENOMEM;
		}
		bo->base.pages = pages;

Admin message