From: Cho KyongHo <pullip.cho@samsung.com>
Date: Mon, 18 Feb 2019 02:24:59 +0000 (+0900)
Subject: [RAMEN9610-12270] g2d: add missing IOMMU_CACHE to iommu mapping
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=531fa4edb15549415d004289e15eb3ec557d8691;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[RAMEN9610-12270] g2d: add missing IOMMU_CACHE to iommu mapping

IOMMU_CACHE should be specified to iovmm_map() if G2D supports IO Cache
Coherency but it was missing because ION and IOMMU drivers adds
IOMMU_CACHE if their clients has DMA attributes of IO cache coherency.
But it is not correct to delegate configuration to IOMMU_CACHE to ION
and IOMMU drivers because G2D driver does not have any room to change
such configurations.

Change-Id: I6c20727c913af52781230669621bf8cf12faafdc
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
---

diff --git a/drivers/gpu/exynos/g2d/g2d_regs.c b/drivers/gpu/exynos/g2d/g2d_regs.c
index fd3ae69d0a72..ba20f8f9e462 100644
--- a/drivers/gpu/exynos/g2d/g2d_regs.c
+++ b/drivers/gpu/exynos/g2d/g2d_regs.c
@@ -15,6 +15,7 @@
 
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/property.h>
 
 #include <asm/cacheflush.h>
 
@@ -83,6 +84,10 @@ void g2d_hw_push_task(struct g2d_device *g2d_dev, struct g2d_task *task)
 			       G2D_JOBn_LAYER_SECURE_REG(task->sec.job_id));
 	}
 
+	if (device_get_dma_attr(g2d_dev->dev) != DEV_DMA_COHERENT)
+		__flush_dcache_area(page_address(task->cmd_page),
+				    G2D_CMD_LIST_SIZE);
+
 	writel_relaxed(G2D_JOB_HEADER_DATA(task->sec.priority,
 					   task->sec.job_id),
 			g2d_dev->reg + G2D_JOB_HEADER_REG);
diff --git a/drivers/gpu/exynos/g2d/g2d_task.c b/drivers/gpu/exynos/g2d/g2d_task.c
index 83dfe6cd9d7e..5ce39bc027ea 100644
--- a/drivers/gpu/exynos/g2d/g2d_task.c
+++ b/drivers/gpu/exynos/g2d/g2d_task.c
@@ -43,16 +43,19 @@ static int g2d_map_cmd_data(struct g2d_task *task)
 {
 	bool self_prot = task->g2d_dev->caps & G2D_DEVICE_CAPS_SELF_PROTECTION;
 	struct scatterlist sgl;
+	int prot = IOMMU_READ;
 
 	if (!self_prot && IS_ENABLED(CONFIG_EXYNOS_CONTENT_PATH_PROTECTION))
 		return 0;
 
+	if (device_get_dma_attr(task->g2d_dev->dev) == DEV_DMA_COHERENT)
+		prot |= IOMMU_CACHE;
+
 	/* mapping the command data */
 	sg_init_table(&sgl, 1);
 	sg_set_page(&sgl, task->cmd_page, G2D_CMD_LIST_SIZE, 0);
 	task->cmd_addr = iovmm_map(task->g2d_dev->dev, &sgl, 0,
-				   G2D_CMD_LIST_SIZE, DMA_TO_DEVICE,
-				   IOMMU_READ | IOMMU_CACHE);
+				   G2D_CMD_LIST_SIZE, DMA_TO_DEVICE, prot);
 
 	if (IS_ERR_VALUE(task->cmd_addr)) {
 		dev_err(task->g2d_dev->dev,
diff --git a/drivers/gpu/exynos/g2d/g2d_uapi_process.c b/drivers/gpu/exynos/g2d/g2d_uapi_process.c
index 3e49fa321314..e853533d2d8f 100644
--- a/drivers/gpu/exynos/g2d/g2d_uapi_process.c
+++ b/drivers/gpu/exynos/g2d/g2d_uapi_process.c
@@ -227,9 +227,6 @@ static int g2d_get_dmabuf(struct g2d_task *task,
 		goto err;
 	}
 
-	if (dir != DMA_TO_DEVICE)
-		prot |= IOMMU_WRITE;
-
 	if (ion_cached_dmabuf(dmabuf)) {
 		task->total_cached_len += buffer->payload;
 
@@ -252,6 +249,12 @@ static int g2d_get_dmabuf(struct g2d_task *task,
 		goto err_map;
 	}
 
+	if (dir != DMA_TO_DEVICE)
+		prot |= IOMMU_WRITE;
+
+	if (device_get_dma_attr(dev) == DEV_DMA_COHERENT)
+		prot |= IOMMU_CACHE;
+
 	dma_addr = ion_iovmm_map(attachment, 0, buffer->payload, dir, prot);
 	if (IS_ERR_VALUE(dma_addr)) {
 		ret = (int)dma_addr;
@@ -374,6 +377,9 @@ static int g2d_get_userptr(struct g2d_task *task,
 			vma->vm_ops->open(vma);
 	}
 
+	if (device_get_dma_attr(dev) == DEV_DMA_COHERENT)
+		prot |= IOMMU_CACHE;
+
 	buffer->dma_addr = exynos_iovmm_map_userptr(dev, data->userptr,
 						    data->length, prot);
 	if (IS_ERR_VALUE(buffer->dma_addr)) {