It's mostly gone and won't compile with CONFIG_ION, so
remove the remaining pieces.
Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 -------------------------
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ----
2 files changed, 29 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 605da85bb53f..fcb94f01d8ad 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -599,15 +599,6 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
return ret;
}
-#ifdef CONFIG_ION
-static void dpu_kms_set_gem_flags(struct msm_gem_object *msm_obj,
- uint32_t flags)
-{
- if (msm_obj)
- msm_obj->flags |= flags;
-}
-#endif
-
#ifdef CONFIG_DEBUG_FS
static int dpu_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)
{
@@ -657,13 +648,6 @@ static void _dpu_kms_hw_destroy(struct dpu_kms *dpu_kms)
_dpu_debugfs_destroy(dpu_kms);
_dpu_kms_mmu_destroy(dpu_kms);
-#ifdef CONFIG_ION
- if (dpu_kms->iclient) {
- ion_client_destroy(dpu_kms->iclient);
- dpu_kms->iclient = NULL;
- }
-#endif
-
if (dpu_kms->catalog) {
for (i = 0; i < dpu_kms->catalog->vbif_count; i++) {
u32 vbif_idx = dpu_kms->catalog->vbif[i].id;
@@ -1131,15 +1115,6 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
}
}
-#ifdef CONFIG_ION
- dpu_kms->iclient = msm_ion_client_create(dev->unique);
- if (IS_ERR(dpu_kms->iclient)) {
- rc = PTR_ERR(dpu_kms->iclient);
- DPU_DEBUG("msm_ion_client not available: %d\n", rc);
- dpu_kms->iclient = NULL;
- }
-#endif
-
rc = dpu_core_perf_init(&dpu_kms->perf, dev, dpu_kms->catalog,
&dpu_kms->phandle,
_dpu_kms_get_clk(dpu_kms, "core_clk"));
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index f7a3915b2907..407c1ed27fe6 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@ -19,9 +19,6 @@
#ifndef __DPU_KMS_H__
#define __DPU_KMS_H__
-#ifdef CONFIG_CHROME_MSM_ION
-#include <linux/msm_ion.h>
-#endif
#include "msm_drv.h"
#include "msm_kms.h"
#include "msm_mmu.h"
@@ -118,7 +115,6 @@ struct dpu_kms {
struct dpu_power_handle phandle;
struct dpu_power_client *core_client;
- struct ion_client *iclient;
struct dpu_power_event *power_event;
/* directory entry for debugfs */
--
Sean Paul, Software Engineer, Google / Chromium OS
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
