Merge "msm: kgsl: Use vma_area_struct with proper locks" (f58fae55) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/msm/kgsl.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -2110,21 +2110,23 @@ static int kgsl_setup_dmabuf_useraddr(struct kgsl_device *device,
		if (fd != 0)
		dmabuf = dma_buf_get(fd - 1);
		}
		up_read(&current->mm->mmap_sem);

		if (IS_ERR_OR_NULL(dmabuf))
		if (IS_ERR_OR_NULL(dmabuf)) {
		up_read(&current->mm->mmap_sem);
		return dmabuf ? PTR_ERR(dmabuf) : -ENODEV;
		}

		ret = kgsl_setup_dma_buf(device, pagetable, entry, dmabuf);
		if (ret) {
		dma_buf_put(dmabuf);
		up_read(&current->mm->mmap_sem);
		return ret;
		}

		/* Setup the user addr/cache mode for cache operations */
		entry->memdesc.useraddr = hostptr;
		_setup_cache_mode(entry, vma);

		up_read(&current->mm->mmap_sem);
		return 0;
		}
		#else