From: Jeonghee Kim <jhhhh.kim@samsung.com>
Date: Fri, 18 May 2018 10:04:24 +0000 (+0900)
Subject: [COMMON] media: mfc: parse dts for checking qos control
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=544213474d441184f1a6888f38d6f717dce507f2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[COMMON] media: mfc: parse dts for checking qos control

Change-Id: Ia65d9546fc2c1beba40ddae9bfd463fce549bdbc
Signed-off-by: Jeonghee Kim <jhhhh.kim@samsung.com>
---

diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc.c b/drivers/media/platform/exynos/mfc/s5p_mfc.c
index b7aae8e2571c..fbf17f60704a 100644
--- a/drivers/media/platform/exynos/mfc/s5p_mfc.c
+++ b/drivers/media/platform/exynos/mfc/s5p_mfc.c
@@ -949,6 +949,9 @@ static void mfc_parse_dt(struct device_node *np, struct s5p_mfc_dev *mfc)
 	of_property_read_u32(np, "num_qos_steps", &pdata->num_qos_steps);
 	of_property_read_u32(np, "max_qos_steps", &pdata->max_qos_steps);
 	of_property_read_u32(np, "max_mb", &pdata->max_mb);
+	of_property_read_u32(np, "mfc_freq_control", &pdata->mfc_freq_control);
+	of_property_read_u32(np, "mo_control", &pdata->mo_control);
+	of_property_read_u32(np, "bw_control", &pdata->bw_control);
 
 	pdata->qos_table = devm_kzalloc(mfc->device,
 			sizeof(struct s5p_mfc_qos) * pdata->max_qos_steps, GFP_KERNEL);
@@ -1294,6 +1297,8 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 #ifdef CONFIG_MFC_USE_BUS_DEVFREQ
 	atomic_set(&dev->qos_req_cur, 0);
 
+	mfc_info_dev("QoS control: mfc_freq(%d), mo(%d), bw(%d)\n",
+			dev->pdata->mfc_freq_control, dev->pdata->mo_control, dev->pdata->bw_control);
 	for (i = 0; i < dev->pdata->num_qos_steps; i++) {
 		mfc_info_dev("QoS table[%d] mfc: %d, int : %d, mif : %d\n",
 				i,
diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_data_struct.h b/drivers/media/platform/exynos/mfc/s5p_mfc_data_struct.h
index 1d738dbbc4a5..6ebc3089a319 100644
--- a/drivers/media/platform/exynos/mfc/s5p_mfc_data_struct.h
+++ b/drivers/media/platform/exynos/mfc/s5p_mfc_data_struct.h
@@ -377,6 +377,9 @@ struct s5p_mfc_platdata {
 	int num_qos_steps;
 	int max_qos_steps;
 	int max_mb;
+	int mfc_freq_control;
+	int mo_control;
+	int bw_control;
 	struct s5p_mfc_qos *qos_table;
 #endif
 };
diff --git a/drivers/media/platform/exynos/mfc/s5p_mfc_qos.c b/drivers/media/platform/exynos/mfc/s5p_mfc_qos.c
index 9afcecd6858f..66e907118568 100644
--- a/drivers/media/platform/exynos/mfc/s5p_mfc_qos.c
+++ b/drivers/media/platform/exynos/mfc/s5p_mfc_qos.c
@@ -33,13 +33,10 @@ static void mfc_qos_operate(struct s5p_mfc_ctx *ctx, int opr_type, int idx)
 
 	switch (opr_type) {
 	case MFC_QOS_ADD:
-		MFC_TRACE_CTX("++ QOS add[%d] (mfc: %d, int:%d, mif:%d)\n",
-			idx, qos_table[idx].freq_mfc,
-			qos_table[idx].freq_int, qos_table[idx].freq_mif);
-
-		pm_qos_add_request(&dev->qos_req_mfc,
-				PM_QOS_MFC_THROUGHPUT,
-				qos_table[idx].freq_mfc);
+		if (pdata->mfc_freq_control)
+			pm_qos_add_request(&dev->qos_req_mfc,
+					PM_QOS_MFC_THROUGHPUT,
+					qos_table[idx].freq_mfc);
 		pm_qos_add_request(&dev->qos_req_int,
 				PM_QOS_DEVICE_THROUGHPUT,
 				qos_table[idx].freq_int);
@@ -57,28 +54,31 @@ static void mfc_qos_operate(struct s5p_mfc_ctx *ctx, int opr_type, int idx)
 #endif
 
 #ifdef CONFIG_EXYNOS_BTS
-		bts_update_scen(BS_MFC_UHD_ENC60, qos_table[idx].mo_uhd_enc60_value);
-		bts_update_scen(BS_MFC_UHD_10BIT, qos_table[idx].mo_10bit_value);
-		bts_update_scen(BS_MFC_UHD, qos_table[idx].mo_value);
+		if (pdata->mo_control) {
+			bts_update_scen(BS_MFC_UHD_ENC60, qos_table[idx].mo_uhd_enc60_value);
+			bts_update_scen(BS_MFC_UHD_10BIT, qos_table[idx].mo_10bit_value);
+			bts_update_scen(BS_MFC_UHD, qos_table[idx].mo_value);
+			MFC_TRACE_CTX("BTS(MO) update - uhd:%d, uhd_10bit:%d, uhd_enc60:%d\n",
+					qos_table[idx].mo_value, qos_table[idx].mo_10bit_value,
+					qos_table[idx].mo_uhd_enc60_value);
+			mfc_debug(2, "[QoS] BTS(MO) update - uhd:%d, uhd_10bit:%d, uhd_enc60:%d\n",
+					qos_table[idx].mo_value, qos_table[idx].mo_10bit_value,
+					qos_table[idx].mo_uhd_enc60_value);
+		}
 #endif
 
 		atomic_set(&dev->qos_req_cur, idx + 1);
-		MFC_TRACE_CTX("-- QOS add[%d] (mfc: %d, int:%d, mif:%d, mo:%d, mo10:%d, moenc:%d)\n",
-				idx, qos_table[idx].freq_mfc, qos_table[idx].freq_int,
-				qos_table[idx].freq_mif, qos_table[idx].mo_value,
-				qos_table[idx].mo_10bit_value, qos_table[idx].mo_uhd_enc60_value);
-		mfc_debug(2, "QOS add[%d] (mfc: %d, int:%d, mif:%d, mo:%d, mo10:%d, moenc:%d)\n",
-				idx, qos_table[idx].freq_mfc, qos_table[idx].freq_int,
-				qos_table[idx].freq_mif, qos_table[idx].mo_value,
-				qos_table[idx].mo_10bit_value, qos_table[idx].mo_uhd_enc60_value);
+		MFC_TRACE_CTX("QoS add[%d] - mfc:%d(%s), int:%d, mif:%d\n",
+				idx, qos_table[idx].freq_mfc, pdata->mfc_freq_control ? "used" : "un-used",
+				qos_table[idx].freq_int, qos_table[idx].freq_mif);
+		mfc_debug(2, "[QoS] QoS add[%d] - mfc:%d(%s), int:%d, mif:%d\n",
+				idx, qos_table[idx].freq_mfc, pdata->mfc_freq_control ? "used" : "un-used",
+				 qos_table[idx].freq_int, qos_table[idx].freq_mif);
 		break;
 	case MFC_QOS_UPDATE:
-		MFC_TRACE_CTX("++ QOS update[%d] (mfc: %d, int:%d, mif:%d)\n",
-				idx, qos_table[idx].freq_mfc,
-				qos_table[idx].freq_int, qos_table[idx].freq_mif);
-
-		pm_qos_update_request(&dev->qos_req_mfc,
-				qos_table[idx].freq_mfc);
+		if (pdata->mfc_freq_control)
+			pm_qos_update_request(&dev->qos_req_mfc,
+					qos_table[idx].freq_mfc);
 		pm_qos_update_request(&dev->qos_req_int,
 				qos_table[idx].freq_int);
 		pm_qos_update_request(&dev->qos_req_mif,
@@ -92,25 +92,30 @@ static void mfc_qos_operate(struct s5p_mfc_ctx *ctx, int opr_type, int idx)
 #endif
 
 #ifdef CONFIG_EXYNOS_BTS
-		bts_update_scen(BS_MFC_UHD_ENC60, qos_table[idx].mo_uhd_enc60_value);
-		bts_update_scen(BS_MFC_UHD_10BIT, qos_table[idx].mo_10bit_value);
-		bts_update_scen(BS_MFC_UHD, qos_table[idx].mo_value);
+		if (pdata->mo_control) {
+			bts_update_scen(BS_MFC_UHD_ENC60, qos_table[idx].mo_uhd_enc60_value);
+			bts_update_scen(BS_MFC_UHD_10BIT, qos_table[idx].mo_10bit_value);
+			bts_update_scen(BS_MFC_UHD, qos_table[idx].mo_value);
+			MFC_TRACE_CTX("BTS(MO) update - uhd:%d, uhd_10bit:%d, uhd_enc60:%d\n",
+					qos_table[idx].mo_value, qos_table[idx].mo_10bit_value,
+					qos_table[idx].mo_uhd_enc60_value);
+			mfc_debug(2, "[QoS] BTS(MO) update - uhd:%d, uhd_10bit:%d, uhd_enc60:%d\n",
+					qos_table[idx].mo_value, qos_table[idx].mo_10bit_value,
+					qos_table[idx].mo_uhd_enc60_value);
+		}
 #endif
 
 		atomic_set(&dev->qos_req_cur, idx + 1);
-		MFC_TRACE_CTX("-- QOS update[%d] (mfc: %d, int:%d, mif:%d, mo:%d, mo10:%d, moenc:%d)\n",
-				idx, qos_table[idx].freq_mfc, qos_table[idx].freq_int,
-				qos_table[idx].freq_mif, qos_table[idx].mo_value,
-				qos_table[idx].mo_10bit_value, qos_table[idx].mo_uhd_enc60_value);
-		mfc_debug(2, "QOS update[%d] (mfc: %d, int:%d, mif:%d, mo:%d, mo10:%d, moenc:%d)\n",
-				idx, qos_table[idx].freq_mfc, qos_table[idx].freq_int,
-				qos_table[idx].freq_mif, qos_table[idx].mo_value,
-				qos_table[idx].mo_10bit_value, qos_table[idx].mo_uhd_enc60_value);
+		MFC_TRACE_CTX("QoS update[%d] - mfc:%d(%s), int:%d, mif:%d\n",
+				idx, qos_table[idx].freq_mfc, pdata->mfc_freq_control ? "used" : "un-used",
+				qos_table[idx].freq_int, qos_table[idx].freq_mif);
+		mfc_debug(2, "[QoS] QoS update[%d] - mfc:%d(%s), int:%d, mif:%d\n",
+				idx, qos_table[idx].freq_mfc, pdata->mfc_freq_control ? "used" : "un-used",
+				qos_table[idx].freq_int, qos_table[idx].freq_mif);
 		break;
 	case MFC_QOS_REMOVE:
-		MFC_TRACE_CTX("++ QOS remove\n");
-
-		pm_qos_remove_request(&dev->qos_req_mfc);
+		if (pdata->mfc_freq_control)
+			pm_qos_remove_request(&dev->qos_req_mfc);
 		pm_qos_remove_request(&dev->qos_req_int);
 		pm_qos_remove_request(&dev->qos_req_mif);
 
@@ -120,31 +125,33 @@ static void mfc_qos_operate(struct s5p_mfc_ctx *ctx, int opr_type, int idx)
 #endif
 
 #ifdef CONFIG_EXYNOS_BTS
-		bts_update_scen(BS_MFC_UHD_ENC60, 0);
-		bts_update_scen(BS_MFC_UHD_10BIT, 0);
-		bts_update_scen(BS_MFC_UHD, 0);
-
-		dev->mfc_bw.peak = 0;
-		dev->mfc_bw.read = 0;
-		dev->mfc_bw.write = 0;
-		bts_update_bw(BTS_BW_MFC, dev->mfc_bw);
+		if (pdata->mo_control) {
+			bts_update_scen(BS_MFC_UHD_ENC60, 0);
+			bts_update_scen(BS_MFC_UHD_10BIT, 0);
+			bts_update_scen(BS_MFC_UHD, 0);
+		}
+
+		if (pdata->bw_control) {
+			dev->mfc_bw.peak = 0;
+			dev->mfc_bw.read = 0;
+			dev->mfc_bw.write = 0;
+			bts_update_bw(BTS_BW_MFC, dev->mfc_bw);
+		}
 #endif
 
 		atomic_set(&dev->qos_req_cur, 0);
-		MFC_TRACE_CTX("-- QOS remove\n");
-		mfc_debug(2, "QoS remove\n");
+		MFC_TRACE_CTX("QoS remove\n");
+		mfc_debug(2, "[QoS] QoS remove\n");
 		break;
 	case MFC_QOS_BW:
 #ifdef CONFIG_EXYNOS_BTS
-		MFC_TRACE_CTX("++ QOS BW (peak: %d, read: %d, write: %d)\n",
-				dev->mfc_bw.peak, dev->mfc_bw.read, dev->mfc_bw.write);
-
-		bts_update_bw(BTS_BW_MFC, dev->mfc_bw);
-
-		MFC_TRACE_CTX("-- QOS BW (peak: %d, read: %d, write: %d)\n",
-				dev->mfc_bw.peak, dev->mfc_bw.read, dev->mfc_bw.write);
-		mfc_debug(2, "QoS BW, (peak: %d, read: %d, write: %d)\n",
-				dev->mfc_bw.peak, dev->mfc_bw.read, dev->mfc_bw.write);
+		if (pdata->bw_control) {
+			bts_update_bw(BTS_BW_MFC, dev->mfc_bw);
+			MFC_TRACE_CTX("BTS(BW) update (peak: %d, read: %d, write: %d)\n",
+					dev->mfc_bw.peak, dev->mfc_bw.read, dev->mfc_bw.write);
+			mfc_debug(2, "[QoS] BTS(BW) update (peak: %d, read: %d, write: %d)\n",
+					dev->mfc_bw.peak, dev->mfc_bw.read, dev->mfc_bw.write);
+		}
 #endif
 		break;
 	default:
@@ -158,7 +165,6 @@ static void mfc_qos_set(struct s5p_mfc_ctx *ctx, struct bts_bw *mfc_bw, int i)
 #else
 static void mfc_qos_set(struct s5p_mfc_ctx *ctx, int i)
 #endif
-
 {
 	struct s5p_mfc_dev *dev = ctx->dev;
 	struct s5p_mfc_platdata *pdata = dev->pdata;