From: Wooyeon Kim Date: Wed, 24 Apr 2019 01:59:04 +0000 (+0900) Subject: [COMMON] fimc-is2: do not use fast AF trigger when Precapture trigger X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cbc53767fa9020f85bf9c89530bce260e9b539a2;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [COMMON] fimc-is2: do not use fast AF trigger when Precapture trigger PR JIRA ID: CPR-990 Change-Id: Idb6311be87729c3e2119199e4047124a6733e9b8 Signed-off-by: Wooyeon Kim --- 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 a3415f24be0a..7a7db2a9810e 100644 --- a/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c +++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-groupmgr.c @@ -2527,13 +2527,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;