From: Ayoung Sim <a.sim@samsung.com>
Date: Wed, 8 May 2019 02:02:31 +0000 (+0900)
Subject: [COMMON] media: mfc: fix the g_crop fail
X-Git-Tag: MMI-QSAS30.62-33-3~880
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e693cb8ce8c7427f86708cc589dbac413a6de0d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[COMMON] media: mfc: fix the g_crop fail

During the special parsing also, g_crop is possible.

Change-Id: Ia9ed5c085ecb0ba2911b539c1314c414c0b0665f
Signed-off-by: Ayoung Sim <a.sim@samsung.com>
---

diff --git a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
index 87a5e7c1dc56..ee038b17240f 100644
--- a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
+++ b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
@@ -1159,7 +1159,7 @@ static int mfc_dec_g_crop(struct file *file, void *priv,
 	mfc_debug_enter();
 
 	if (!ready_to_get_crop(ctx)) {
-		mfc_debug(2, "ready to get crop failed\n");
+		mfc_err_ctx("ready to get crop failed\n");
 		return -EINVAL;
 	}
 
diff --git a/drivers/media/platform/exynos/mfc/mfc_sync.h b/drivers/media/platform/exynos/mfc/mfc_sync.h
index d18cc2eccac2..e7a00c85a6cb 100644
--- a/drivers/media/platform/exynos/mfc/mfc_sync.h
+++ b/drivers/media/platform/exynos/mfc/mfc_sync.h
@@ -32,9 +32,11 @@
 #define need_to_special_parsing_nal(ctx)	\
 	(ctx->state == MFCINST_RUNNING)
 #define ready_to_get_crop(ctx)			\
-	((ctx->state == MFCINST_HEAD_PARSED) || \
-	 (ctx->state == MFCINST_RUNNING) || \
-	 (ctx->state == MFCINST_FINISHING))
+	((ctx->state == MFCINST_HEAD_PARSED) ||		\
+	(ctx->state == MFCINST_RUNNING) ||		\
+	(ctx->state == MFCINST_SPECIAL_PARSING) ||	\
+	(ctx->state == MFCINST_SPECIAL_PARSING_NAL) ||	\
+	(ctx->state == MFCINST_FINISHING))
 
 int mfc_wait_for_done_dev(struct mfc_dev *dev, int command);
 int mfc_wait_for_done_ctx(struct mfc_ctx *ctx, int command);