From: Jaehyoung Choi <jkkkkk.choi@samsung.com>
Date: Mon, 30 Jul 2018 05:45:38 +0000 (+0900)
Subject: Revert "[HACK][COMMON] fimc-is2: featured size check between per-frame and s_fmt... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2431e2263131b0189475a6fc9016503cf1aee29f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Revert "[HACK][COMMON] fimc-is2: featured size check between per-frame and s_fmt size"

This reverts commit 3f6dd326a2c22bc461a987b0d05c44ca40bb9b9a.

Change-Id: Iaa9f81d4cc252d3e697dd7293325ce68feac435a
---

diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
index b381b77bfb0e..81cf6ed61eb8 100644
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
@@ -171,7 +171,6 @@ static int fimc_is_gframe_check(struct fimc_is_group *gprev,
 
 	device = group->device;
 
-#ifndef DISABLE_CHECK_PERFRAME_FMT_SIZE
 	/*
 	 * perframe check
 	 * 1. perframe size can't exceed s_format size
@@ -186,7 +185,6 @@ static int fimc_is_gframe_check(struct fimc_is_group *gprev,
 		frame->shot_ext->node_group.leader.input.cropRegion[2] = incrop->w;
 		frame->shot_ext->node_group.leader.input.cropRegion[3] = incrop->h;
 	}
-#endif
 
 	for (capture_id = 0; capture_id < CAPTURE_NODE_MAX; ++capture_id) {
 		node = &gframe->group_cfg[group->slot].capture[capture_id];
@@ -203,7 +201,6 @@ static int fimc_is_gframe_check(struct fimc_is_group *gprev,
 			goto p_err;
 		}
 
-#ifndef DISABLE_CHECK_PERFRAME_FMT_SIZE
 		if ((otcrop->w * otcrop->h) > (subdev->output.width * subdev->output.height)) {
 			mrwarn("[V%d][req:%d] the output size is invalid(perframe:%dx%d > subdev:%dx%d)", group, gframe,
 				node->vid, node->request,
@@ -213,7 +210,7 @@ static int fimc_is_gframe_check(struct fimc_is_group *gprev,
 			frame->shot_ext->node_group.capture[capture_id].output.cropRegion[2] = otcrop->w;
 			frame->shot_ext->node_group.capture[capture_id].output.cropRegion[3] = otcrop->h;
 		}
-#endif
+
 		subdev->cid = capture_id;
 	}