Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c91c7f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Remove OUTER_CACHE support"

parents a93c6cab d18f3468
Loading
Loading
Loading
Loading
+0 −37
Original line number Diff line number Diff line
@@ -297,39 +297,6 @@ kgsl_sharedmem_init_sysfs(void)
		drv_attr_list);
}

#ifdef CONFIG_OUTER_CACHE
static void _outer_cache_range_op(int op, unsigned long addr, size_t size)
{
	switch (op) {
	case KGSL_CACHE_OP_FLUSH:
		outer_flush_range(addr, addr + size);
		break;
	case KGSL_CACHE_OP_CLEAN:
		outer_clean_range(addr, addr + size);
		break;
	case KGSL_CACHE_OP_INV:
		outer_inv_range(addr, addr + size);
		break;
	}
}

static void outer_cache_range_op_sg(struct scatterlist *sg, int sglen, int op)
{
	struct scatterlist *s;
	int i;

	for_each_sg(sg, s, sglen, i) {
		unsigned int paddr = kgsl_get_sg_pa(s);
		_outer_cache_range_op(op, paddr, s->length);
	}
}

#else
static void outer_cache_range_op_sg(struct scatterlist *sg, int sglen, int op)
{
}
#endif

static int kgsl_page_alloc_vmfault(struct kgsl_memdesc *memdesc,
				struct vm_area_struct *vma,
				struct vm_fault *vmf)
@@ -569,7 +536,6 @@ int kgsl_cache_range_op(struct kgsl_memdesc *memdesc, size_t offset,
			break;
		}
	}
	outer_cache_range_op_sg(memdesc->sg, memdesc->sglen, op);

	return 0;
}
@@ -740,9 +706,6 @@ _kgsl_sharedmem_page_alloc(struct kgsl_memdesc *memdesc,
		}
	}

	outer_cache_range_op_sg(memdesc->sg, memdesc->sglen,
				KGSL_CACHE_OP_FLUSH);

done:
	KGSL_STATS_ADD(memdesc->size, kgsl_driver.stats.page_alloc,
		kgsl_driver.stats.page_alloc_max);