[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 <shuguang.gong@intel.com>
Reviewed-on: http://android.intel.com:8080/29267
Reviewed-by: Von Oerthel, Jurgen <jurgen.von.oerthel@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Tao, Jing <jing.tao@intel.com>
Reviewed-by: Hu, Gang A <gang.a.hu@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/32446
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>

diff --git a/drivers/media/video/atomisp/atomisp_cmd.c b/drivers/media/video/atomisp/atomisp_cmd.c
index fef295a..70d9ad7 100644 (file)
--- 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 |