Merge "msm: kgsl: Do not release dma and anon buffers if unmap fails" (17bda50f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/msm/kgsl.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -300,6 +300,9 @@ static void kgsl_destroy_ion(struct kgsl_memdesc *memdesc)
		struct kgsl_mem_entry, memdesc);
		struct kgsl_dma_buf_meta *meta = entry->priv_data;

		if (memdesc->priv & KGSL_MEMDESC_MAPPED)
		return;

		if (meta != NULL) {
		remove_dmabuf_list(meta);
		dma_buf_unmap_attachment(meta->attach, meta->table,
		@@ -328,6 +331,9 @@ static void kgsl_destroy_anon(struct kgsl_memdesc *memdesc)
		struct scatterlist *sg;
		struct page *page;

		if (memdesc->priv & KGSL_MEMDESC_MAPPED)
		return;

		for_each_sg(memdesc->sgt->sgl, sg, memdesc->sgt->nents, i) {
		page = sg_page(sg);
		for (j = 0; j < (sg->length >> PAGE_SHIFT); j++) {