[COMMON] fimc-is2: Don't update sensor and af meta when ndone

PR JIRA ID: CPR-91

Change-Id: Ia47e6a9ba66186eac2caa3f167cf96e7b9d5108e
Signed-off-by: dan huh <dan.huh@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c
index ee09c3601aed9f388ddabc650e2c8ac0c62d5ca0..2cdc93b22c4dac826191348096a6cf102c8eada4 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c
@@ -618,7 +618,6 @@ static int fimc_is_hw_3aa_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_i
        int wq_id_3xc, wq_id_3xp, wq_id_3xf, wq_id_3xg;
        int output_id;
        int ret = 0;
-       bool flag_get_meta = true;
 
        FIMC_BUG(!hw_ip);
        FIMC_BUG(!frame);
@@ -645,43 +644,37 @@ static int fimc_is_hw_3aa_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_i
        output_id = ENTRY_3AC;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id_3xc,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = ENTRY_3AP;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id_3xp,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = ENTRY_3AF;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id_3xf,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = ENTRY_3AG;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id_3xg,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = ENTRY_MEXC;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, WORK_ME0C_FDONE,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = FIMC_IS_HW_CORE_END;
        if (test_bit(hw_ip->id, &frame->core_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, -1,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        return ret;

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c
index 103eca6f9b62aeb49a0939d841e02b52ad79c641..47d0ea3e928ba0c3ccffb0e6bd4762b5c94c94c9 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-dcp.c
@@ -569,54 +569,46 @@ int fimc_is_hw_dcp_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_is_frame
        u32 instance, enum ShotErrorType done_type)
 {
        int ret = 0;
-       bool flag_get_meta = true;
 
        FIMC_BUG(!hw_ip);
        FIMC_BUG(!frame);
 
        if (test_bit(ENTRY_DC1S, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame,
-                       WORK_DC1S_FDONE, ENTRY_DC1S, done_type, flag_get_meta);
-               flag_get_meta = false;
+                       WORK_DC1S_FDONE, ENTRY_DC1S, done_type, false);
        }
 
 
        if (test_bit(ENTRY_DC0C, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame,
-                       WORK_DC0C_FDONE, ENTRY_DC0C, done_type, flag_get_meta);
-               flag_get_meta = false;
+                       WORK_DC0C_FDONE, ENTRY_DC0C, done_type, false);
        }
 
 
        if (test_bit(ENTRY_DC1C, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame,
-                       WORK_DC1C_FDONE, ENTRY_DC1C, done_type, flag_get_meta);
-               flag_get_meta = false;
+                       WORK_DC1C_FDONE, ENTRY_DC1C, done_type, false);
        }
 
 
        if (test_bit(ENTRY_DC2C, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame,
-                       WORK_DC2C_FDONE, ENTRY_DC2C, done_type, flag_get_meta);
-               flag_get_meta = false;
+                       WORK_DC2C_FDONE, ENTRY_DC2C, done_type, false);
        }
 
        if (test_bit(ENTRY_DC3C, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame,
-                       WORK_DC3C_FDONE, ENTRY_DC3C, done_type, flag_get_meta);
-               flag_get_meta = false;
+                       WORK_DC3C_FDONE, ENTRY_DC3C, done_type, false);
        }
 
        if (test_bit(ENTRY_DC4C, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame,
-                       WORK_DC4C_FDONE, ENTRY_DC4C, done_type, flag_get_meta);
-               flag_get_meta = false;
+                       WORK_DC4C_FDONE, ENTRY_DC4C, done_type, false);
        }
 
        if (test_bit(hw_ip->id, &frame->core_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame,
-                       -1, FIMC_IS_HW_CORE_END, done_type, flag_get_meta);
-               flag_get_meta = false;
+                       -1, FIMC_IS_HW_CORE_END, done_type, false);
        }
 
        return ret;

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c
index 68c1fc15db47391a6bc3a5ed68baa1c7e2356f18..bc9dcb44c6ca82bec4ddd8d98065b50d636d406e 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c
@@ -534,7 +534,6 @@ static int fimc_is_hw_isp_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_i
 {
        int ret = 0;
        int wq_id_ixc, wq_id_ixp, output_id;
-       bool flag_get_meta = true;
 
        FIMC_BUG(!hw_ip);
        FIMC_BUG(!frame);
@@ -557,29 +556,25 @@ static int fimc_is_hw_isp_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_i
        output_id = ENTRY_IXC;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id_ixc,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = ENTRY_IXP;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id_ixp,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = ENTRY_MEXC;
        if (test_bit(output_id, &frame->out_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, WORK_ME0C_FDONE,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        output_id = FIMC_IS_HW_CORE_END;
        if (test_bit(hw_ip->id, &frame->core_flag)) {
                ret = fimc_is_hardware_frame_done(hw_ip, frame, -1,
-                               output_id, done_type, flag_get_meta);
-               flag_get_meta = false;
+                               output_id, done_type, false);
        }
 
        return ret;

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c
index f12941d8fe7f2d0af4a20022f25c2d6ca5f1f921..3f78944458afc3740deff4dd522a405ec10e6558 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-mcscaler-v2.c
@@ -1366,7 +1366,7 @@ static int fimc_is_hw_mcsc_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_
 
        if (test_bit_variables(hw_ip->id, &frame->core_flag))
                ret = fimc_is_hardware_frame_done(hw_ip, frame, -1, FIMC_IS_HW_CORE_END,
-                               done_type, true);
+                               done_type, false);
 
        return ret;
 }

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c
index 8059f99c7b158a84a98f4ee9c353b21c57dc2c15..fb94ebb8d73b1ebaa077bd2d338da1bd27308174 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-scp.c
@@ -473,13 +473,13 @@ static int fimc_is_hw_scp_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_i
        output_id = ENTRY_SCP;
        if (test_bit(output_id, &frame->out_flag))
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id, output_id,
-                               done_type);
+                               false);
 
        wq_id     = -1;
        output_id = FIMC_IS_HW_CORE_END;
        if (test_bit(hw_ip->id, &frame->core_flag))
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id, output_id,
-                               done_type);
+                               false);
 
        return ret;
 }

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c
index 956af5f93c08d48b571c52ae9d6aa1507cd27b35..3f7eade70d491abe1d6b3da6d785ff0a5e862832 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-tpu.c
@@ -481,7 +481,7 @@ static int fimc_is_hw_tpu_frame_ndone(struct fimc_is_hw_ip *hw_ip, struct fimc_i
        output_id = FIMC_IS_HW_CORE_END;
        if (test_bit(hw_ip->id, &frame->core_flag))
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id,
-                               output_id, done_type, true);
+                               output_id, done_type, false);
 
        return ret;
 }

diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c
index 83033ea57d3a5a9878c8a9d19b2724c053be4545..375af116e6a5bc911cbf0b066ca87fee5cc2eb31 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c
+++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c
@@ -789,7 +789,7 @@ static int fimc_is_hw_vra_frame_ndone(struct fimc_is_hw_ip *hw_ip,
        output_id = FIMC_IS_HW_CORE_END;
        if (test_bit_variables(hw_ip->id, &frame->core_flag))
                ret = fimc_is_hardware_frame_done(hw_ip, frame, wq_id, output_id,
-                               done_type, true);
+                               done_type, false);
 
        return ret;
 }