From f25101ca99c76471f49b7a06cc12b0ef3c4a0bb0 Mon Sep 17 00:00:00 2001 From: Gong Shuguang Date: Wed, 21 Dec 2011 03:57:39 +0800 Subject: [PATCH] [PORT FROM R2] atomisp: fix file_input issue in atomisp_isr BZ: 20531 This patch will bypass buffer monitor for file injection to avoid isp timeout Change-Id: I8d7dadbc2dcb8ad79bc5bd61a67b977c7166c967 Orig-Change-Id: Ieeeb98ab68d07f3ea36074650cee82fc2300978b Signed-off-by: Gong Shuguang Reviewed-on: http://android.intel.com:8080/29267 Reviewed-by: Von Oerthel, Jurgen Reviewed-by: Wang, Wen W Reviewed-by: Tao, Jing Reviewed-by: Hu, Gang A Reviewed-by: Koski, Anttu Reviewed-by: Kruger, Jozef Reviewed-by: Cohen, David A Tested-by: Koski, Anttu Reviewed-by: buildbot Tested-by: buildbot Reviewed-on: http://android.intel.com:8080/32446 Reviewed-by: Lampila, KalleX Tested-by: Lampila, KalleX --- drivers/media/video/atomisp/atomisp_cmd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/atomisp/atomisp_cmd.c b/drivers/media/video/atomisp/atomisp_cmd.c index fef295a..70d9ad7 100644 --- a/drivers/media/video/atomisp/atomisp_cmd.c +++ b/drivers/media/video/atomisp/atomisp_cmd.c @@ -297,10 +297,12 @@ irqreturn_t atomisp_isr(int irq, void *dev) * - Acceleration API * - Flash * - CSS needs to do memory (re)allocation + * - File injection */ if (signal_acceleration || isp->fr_status != ATOMISP_FRAME_STATUS_OK || - isp->params.num_flash_frames) + isp->params.num_flash_frames || + isp->sw_contex.file_input) goto no_frame_done; if (irq_infos & (SH_CSS_IRQ_INFO_START_NEXT_STAGE | -- 2.7.4