From: Janghyuck Kim <janghyuck.kim@samsung.com>
Date: Fri, 27 Apr 2018 10:03:58 +0000 (+0900)
Subject: [COMMON] media: scaler: add framerate interface for m2m1shot
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=23b6151200821d2fe1f4e9f4df607b80ebd5b3f1;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[COMMON] media: scaler: add framerate interface for m2m1shot

framerate interface for m2m1shot is added and common setting code is
separated as common function.

Change-Id: I84a77a2e97dba857d2da8d45a43a5cf390a7c7f8
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 becfd6dca56b..e9e5cf457413 100644
--- a/drivers/media/platform/exynos/scaler/scaler-core.c
+++ b/drivers/media/platform/exynos/scaler/scaler-core.c
@@ -1982,6 +1982,22 @@ static bool sc_configure_rotation_degree(struct sc_ctx *ctx, int degree)
 	return true;
 }
 
+static void sc_set_framerate(struct sc_ctx *ctx, int framerate)
+{
+	if (!ctx->sc_dev->qos_table)
+		return;
+
+	if (framerate == 0) {
+		sc_remove_devfreq(&ctx->pm_qos, ctx->sc_dev->qos_table);
+		ctx->framerate = 0;
+	} else if (framerate != ctx->framerate) {
+		ctx->framerate = framerate;
+		if (sc_get_pm_qos_level(ctx, ctx->framerate))
+			sc_request_devfreq(&ctx->pm_qos,
+					ctx->sc_dev->qos_table, ctx->pm_qos_lv);
+	}
+}
+
 static int sc_s_ctrl(struct v4l2_ctrl *ctrl)
 {
 	struct sc_ctx *ctx;
@@ -2038,18 +2054,7 @@ static int sc_s_ctrl(struct v4l2_ctrl *ctrl)
 		ctx->dnoise_ft.strength = ctrl->val;
 		break;
 	case SC_CID_FRAMERATE:
-		if (!ctx->sc_dev->qos_table)
-			break;
-
-		if (ctrl->val == 0) {
-			sc_remove_devfreq(&ctx->pm_qos, ctx->sc_dev->qos_table);
-			ctx->framerate = 0;
-		} else if (ctrl->val != ctx->framerate) {
-			ctx->framerate = ctrl->val;
-			if (sc_get_pm_qos_level(ctx, ctx->framerate))
-				sc_request_devfreq(&ctx->pm_qos,
-					ctx->sc_dev->qos_table, ctx->pm_qos_lv);
-		}
+		sc_set_framerate(ctx, ctrl->val);
 		break;
 	}
 
@@ -2307,6 +2312,8 @@ static int sc_open(struct file *file)
 		goto err_ctx;
 	}
 
+	ctx->pm_qos_lv = -1;
+
 	return 0;
 
 err_ctx:
@@ -3143,6 +3150,7 @@ static int sc_m2m1shot_init_context(struct m2m1shot_context *m21ctx)
 
 	m21ctx->priv = ctx;
 	ctx->m21_ctx = m21ctx;
+	ctx->pm_qos_lv = -1;
 
 	return 0;
 err_aclk:
@@ -3164,6 +3172,11 @@ static int sc_m2m1shot_free_context(struct m2m1shot_context *m21ctx)
 		clk_unprepare(ctx->sc_dev->pclk);
 	BUG_ON(!list_empty(&ctx->node));
 	destroy_intermediate_frame(ctx);
+	if (ctx->framerate) {
+		sc_remove_devfreq(&ctx->pm_qos, ctx->sc_dev->qos_table);
+		ctx->framerate = 0;
+	}
+
 	kfree(ctx);
 	return 0;
 }
@@ -3244,13 +3257,16 @@ static int sc_m2m1shot_prepare_format(struct m2m1shot_context *m21ctx,
 			bytes_used[i] *= frame->sc_fmt->bitperpixel[i];
 			bytes_used[i] /= 8;
 		}
+		frame->bytesused[i] = bytes_used[i];
 	}
 
 	if (ctx->sc_dev->variant->extra_buf && dir == DMA_TO_DEVICE) {
 		ext_size = sc_ext_buf_size(fmt->width);
 
-		for (i = 0; i < frame->sc_fmt->num_planes; i++)
+		for (i = 0; i < frame->sc_fmt->num_planes; i++) {
 			bytes_used[i] += (i == 0) ? ext_size : ext_size/2;
+			frame->bytesused[i] = bytes_used[i];
+		}
 	}
 
 	frame->width = fmt->width;
@@ -3445,6 +3461,9 @@ static int sc_m2m1shot_device_run(struct m2m1shot_context *m21ctx,
 	s_frame = &ctx->s_frame;
 	d_frame = &ctx->d_frame;
 
+	if (task->task.reserved[0])
+		sc_set_framerate(ctx, (int)task->task.reserved[0]);
+
 	sc_m2m1shot_get_bufaddr(sc, &task->dma_buf_out, s_frame);
 	sc_m2m1shot_get_bufaddr(sc, &task->dma_buf_cap, d_frame);