Commit 92e89ccd authored Aug 06, 2020 by Puranam V G Tejaswi Committed by Deepak Kumar Aug 17, 2020

msm: kgsl: Correctly clean up dma buffer attachment in case of error



In kgsl_ioctl_gpuobj_import(), user memory of type KGSL_USER_MEM_TYPE_ADDR
can also lead to setting up a dma buffer. When attaching mem entry to
process fails, dma buffer attachment is cleaned up only in case of
KGSL_USER_MEM_TYPE_DMABUF. Similar situation can arise in case of
kgsl_ioctl_map_user_mem(). Fix this by obtaining user memory type from
the memdesc flags.

Change-Id: I502bd0ae19241802e8f835f20391b2ce67999418
Signed-off-by: Puranam V G Tejaswi <pvgtejas@codeaurora.org>
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>

parent 22abee51

drivers/gpu/msm/kgsl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2628,7 +2628,7 @@ long kgsl_ioctl_gpuobj_import(struct kgsl_device_private *dev_priv,
		return 0;

		unmap:
		if (param->type == KGSL_USER_MEM_TYPE_DMABUF) {
		if (kgsl_memdesc_usermem_type(&entry->memdesc) == KGSL_MEM_ENTRY_ION) {
		kgsl_destroy_ion(entry->priv_data);
		entry->memdesc.sgt = NULL;
		}
		@@ -2936,7 +2936,7 @@ long kgsl_ioctl_map_user_mem(struct kgsl_device_private *dev_priv,
		return result;

		error_attach:
		switch (memtype) {
		switch (kgsl_memdesc_usermem_type(&entry->memdesc)) {
		case KGSL_MEM_ENTRY_ION:
		kgsl_destroy_ion(entry->priv_data);
		entry->memdesc.sgt = NULL;