From: Janghyuck Kim <janghyuck.kim@samsung.com>
Date: Thu, 15 Mar 2018 02:09:21 +0000 (+0900)
Subject: Revert "[COMMON] media: scaler: add debugging log for g2d power domain"
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f71ef89d47d96bd0183aa64671876779902ee68;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Revert "[COMMON] media: scaler: add debugging log for g2d power domain"

This reverts commit 5ea20f792414b4fb75c252f6accfe44e436c7233.

Change-Id: Idaa49e72fda38ee192fb86beacf02f8a6409b798
Signed-off-by: Janghyuck Kim <janghyuck.kim@samsung.com>
---

diff --git a/drivers/media/platform/exynos/scaler/scaler-core.c b/drivers/media/platform/exynos/scaler/scaler-core.c
index c43c7eb7d006..ac361f43f695 100644
--- a/drivers/media/platform/exynos/scaler/scaler-core.c
+++ b/drivers/media/platform/exynos/scaler/scaler-core.c
@@ -23,8 +23,6 @@
 #include <linux/smc.h>
 #include <linux/ion_exynos.h>
 
-#include <linux/sched/clock.h>
-
 #include <media/v4l2-ioctl.h>
 #include <media/m2m1shot.h>
 #include <media/m2m1shot-helper.h>
@@ -3589,16 +3587,6 @@ static int sc_runtime_resume(struct device *dev)
 static int sc_runtime_suspend(struct device *dev)
 {
 	struct sc_dev *sc = dev_get_drvdata(dev);
-	const int *ptr = sc->q_reg;
-	int i, idx;
-
-	idx = sc->dbg_idx % SC_DEBUG_MAX_NUM;
-	sc->qch_dbg[idx].time = sched_clock();
-	for (i = 0; i < G2D_QCH_NUM; i++)
-		sc->qch_dbg[idx].log[i] = ptr[i];
-
-	sc->dbg_idx++;
-
 	if (sc->qosreq_int_level > 0)
 		pm_qos_update_request(&sc->qosreq_int, 0);
 	return 0;
@@ -3767,19 +3755,6 @@ static int sc_probe(struct platform_device *pdev)
 		}
 	}
 
-	sc->q_reg = ioremap(0x13a07000, 0x100);
-	if (sc->q_reg == NULL) {
-		dev_err(&pdev->dev, "failed to ioremap address region\n");
-		ret = -ENOENT;
-		goto err_qch_reg;
-	}
-
-	sc->qch_dbg = kzalloc(sizeof(struct sc_qch_dbg) * SC_DEBUG_MAX_NUM, GFP_KERNEL);
-	if (sc->qch_dbg == NULL) {
-		ret = -ENOENT;
-		goto err_qch_dbg;
-	}
-
 	sc->version = SCALER_VERSION(2, 0, 0);
 
 	hwver = __raw_readl(sc->regs + SCALER_VER);
@@ -3812,11 +3787,6 @@ static int sc_probe(struct platform_device *pdev)
 
 	return 0;
 
-err_qch_dbg:
-	iounmap(sc->q_reg);
-err_qch_reg:
-	if (!IS_ERR(sc->aclk))
-		clk_disable_unprepare(sc->aclk);
 err_ver_aclk_get:
 	if (!IS_ERR(sc->pclk))
 		clk_disable_unprepare(sc->pclk);
@@ -3838,9 +3808,6 @@ static int sc_remove(struct platform_device *pdev)
 {
 	struct sc_dev *sc = platform_get_drvdata(pdev);
 
-	iounmap(sc->q_reg);
-	kfree(sc->qch_dbg);
-
 	iovmm_deactivate(sc->dev);
 
 	sc_clk_put(sc);
diff --git a/drivers/media/platform/exynos/scaler/scaler.h b/drivers/media/platform/exynos/scaler/scaler.h
index 818ae497a15b..a2ae230ec3f6 100644
--- a/drivers/media/platform/exynos/scaler/scaler.h
+++ b/drivers/media/platform/exynos/scaler/scaler.h
@@ -39,9 +39,6 @@ extern int sc_log_level;
 #define SC_TIMEOUT		(2 * HZ)	/* 2 seconds */
 #define SC_WDT_CNT		3
 #define SC_MAX_CTRL_NUM		11
-#define SC_QCH_SIZE		(sizeof(u32) * 21)
-#define SC_DEBUG_MAX_NUM	16
-#define G2D_QCH_NUM		21
 
 #define SC_MAX_PLANES		3
 /* Address index */
@@ -364,11 +361,6 @@ struct sc_dnoise_filter {
 	u32			h;
 };
 
-struct sc_qch_dbg {
-	unsigned long long time;
-	u32 log[G2D_QCH_NUM];
-};
-
 struct sc_qos_table {
 	unsigned int freq_mif;
 	unsigned int freq_int;
@@ -409,7 +401,6 @@ struct sc_dev {
 	struct clk			*clk_chld;
 	struct clk			*clk_parn;
 	void __iomem			*regs;
-	void __iomem			*q_reg;
 	struct resource			*regs_res;
 	struct workqueue_struct		*qosclr_int_wq;
 	wait_queue_head_t		wait;
@@ -427,8 +418,6 @@ struct sc_dev {
 	u32				version;
 	bool				pb_disable;
 	u32				cfw;
-	int				dbg_idx;
-	struct sc_qch_dbg		*qch_dbg;
 	struct sc_qos_table		*qos_table;
 	int qos_table_cnt;
 };