From 83ddc159d076c7cb4948cf23194099befe45b316 Mon Sep 17 00:00:00 2001
From: Jeykumar Sankaran <jsanka@codeaurora.org>
Date: Mon, 4 Oct 2021 15:25:55 -0700
Subject: [PATCH] disp: msm: remove stale ION references

After adapting dma buf api's these references and
paths are unusable. Clean it up.

Change-Id: Id6fa76945132e312e8bacf6e430633b0db9e48a3
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
---
 msm/msm_gem.c       | 14 +-------------
 msm/msm_gem.h       |  3 +--
 msm/msm_gem_prime.c |  2 --
 msm/sde/sde_kms.h   |  1 -
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/msm/msm_gem.c b/msm/msm_gem.c
index dfc5223cd4..e43f1d0f75 100644
--- a/msm/msm_gem.c
+++ b/msm/msm_gem.c
@@ -21,7 +21,6 @@
 #include <linux/shmem_fs.h>
 #include <linux/dma-buf.h>
 #include <linux/pfn_t.h>
-#include <linux/ion.h>
 
 #include "msm_drv.h"
 #include "msm_gem.h"
@@ -1238,9 +1237,6 @@ int msm_gem_delayed_import(struct drm_gem_object *obj)
 	attach = obj->import_attach;
 	attach->dma_map_attrs |= DMA_ATTR_DELAYED_UNMAP;
 
-	if (msm_obj->flags & MSM_BO_SKIPSYNC)
-		attach->dma_map_attrs |= DMA_ATTR_SKIP_CPU_SYNC;
-
 	/*
 	 * dma_buf_map_attachment will call dma_map_sg for ion buffer
 	 * mapping, and iova will get mapped when the function returns.
@@ -1293,17 +1289,9 @@ struct drm_gem_object *msm_gem_import(struct drm_device *dev,
 	 */
 	msm_obj->flags |= MSM_BO_EXTBUF;
 
-	/*
-	 * For all uncached buffers, there is no need to perform cache
-	 * maintenance on dma map/unmap time.
-	 */
 	ret = dma_buf_get_flags(dmabuf, &flags);
-	if (ret) {
+	if (ret)
 		DRM_ERROR("dma_buf_get_flags failure, err=%d\n", ret);
-	} else if ((flags & ION_FLAG_CACHED) == 0) {
-		DRM_DEBUG("Buffer is uncached type\n");
-		msm_obj->flags |= MSM_BO_SKIPSYNC;
-	}
 
 	mutex_unlock(&msm_obj->lock);
 	return obj;
diff --git a/msm/msm_gem.h b/msm/msm_gem.h
index 2473d6a85a..d83119cefd 100644
--- a/msm/msm_gem.h
+++ b/msm/msm_gem.h
@@ -25,8 +25,7 @@
 /* Additional internal-use only BO flags: */
 #define MSM_BO_STOLEN        0x10000000    /* try to use stolen/splash memory */
 #define MSM_BO_KEEPATTRS     0x20000000    /* keep h/w bus attributes */
-#define MSM_BO_SKIPSYNC      0x40000000    /* skip dmabuf cpu sync */
-#define MSM_BO_EXTBUF        0x80000000    /* indicate BO is an import buffer */
+#define MSM_BO_EXTBUF        0x40000000    /* indicate BO is an import buffer */
 
 struct msm_gem_object;
 
diff --git a/msm/msm_gem_prime.c b/msm/msm_gem_prime.c
index 99d1e8b8e6..0c51b85032 100644
--- a/msm/msm_gem_prime.c
+++ b/msm/msm_gem_prime.c
@@ -25,8 +25,6 @@
 
 #include <linux/qcom-dma-mapping.h>
 #include <linux/dma-buf.h>
-#include <linux/ion.h>
-#include <linux/msm_ion.h>
 
 struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)
 {
diff --git a/msm/sde/sde_kms.h b/msm/sde/sde_kms.h
index c200f4b165..a95777be34 100644
--- a/msm/sde/sde_kms.h
+++ b/msm/sde/sde_kms.h
@@ -19,7 +19,6 @@
 #ifndef __SDE_KMS_H__
 #define __SDE_KMS_H__
 
-#include <linux/msm_ion.h>
 #include <linux/pm_domain.h>
 #include <linux/pm_qos.h>