[COMMON] fimc-is2: do not use fast AF trigger when Precapture trigger

 PR JIRA ID: CPR-990

CRs-fixed: (CR)

Change-Id: Idb6311be87729c3e2119199e4047124a6733e9b8
Signed-off-by: Wooyeon Kim <wooy88.kim@samsung.com>
Reviewed-on: https://gerrit.mot.com/1342458
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Dawei Wang <wangdw10@motorola.com>
Reviewed-by: Biming Li <libm1@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Submit-Approved: Jira Key

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 419ec5036b1367f38e0cce2c227a71a3c5423aed..1b4e7b4d450b22e6db32c7da1f10b8c5a9bba529 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
+++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c
@@ -2555,13 +2555,15 @@ int fimc_is_group_buffer_queue(struct fimc_is_groupmgr *groupmgr,
                 * it need to copy "afMode & afTrigger" in queued frame
                 * at only AF mode == CONTINUOUS_PICTURE or CONTINUOUS_VIDEO
                 *         AF trigger == START
+                *         PreCaptureTrigger != START
                 */
                if (test_bit(FIMC_IS_GROUP_OTF_INPUT, &group->state)) {
                        struct fimc_is_frame *prev;
 
-                       if ((frame->shot->ctl.aa.afMode == AA_AFMODE_CONTINUOUS_VIDEO ||
-                               frame->shot->ctl.aa.afMode == AA_AFMODE_CONTINUOUS_PICTURE)
-                               && frame->shot->ctl.aa.afTrigger == AA_AF_TRIGGER_START) {
+                       if (((frame->shot->ctl.aa.afMode == AA_AFMODE_CONTINUOUS_VIDEO ||
+                               frame->shot->ctl.aa.afMode == AA_AFMODE_CONTINUOUS_PICTURE) &&
+                               frame->shot->ctl.aa.afTrigger == AA_AF_TRIGGER_START) &&
+                               frame->shot->ctl.aa.aePrecaptureTrigger != AA_AE_PRECAPTURE_TRIGGER_START) {
 
                                list_for_each_entry_reverse(prev, &framemgr->queued_list[FS_REQUEST], list) {
                                        prev->shot->ctl.aa.afMode = frame->shot->ctl.aa.afMode;