[media] s5p-fimc: Move m2m node driver into separate file

Virtually no functional changes, just code reordering. This let us to
clearly separate all logical functions available in the driver: fimc
capture, mem-to-mem, and later fimc-lite capture, ISP features, etc.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

5 files changed, 894 insertions, 857 deletions

diff --git a/drivers/media/video/s5p-fimc/Makefile b/drivers/media/video/s5p-fimc/Makefile
index 33dec7f890e7..1da3c6ae7fa8 100644
--- a/drivers/media/video/s5p-fimc/Makefile
+++ b/drivers/media/video/s5p-fimc/Makefile
@@ -1,4 +1,4 @@
-s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-capture.o fimc-mdevice.o
+s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-m2m.o fimc-capture.o fimc-mdevice.o
 s5p-csis-objs := mipi-csis.o
 
 obj-$(CONFIG_VIDEO_S5P_MIPI_CSIS)       += s5p-csis.o
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index be5e4e237297..0051d8161c6c 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -139,7 +139,7 @@ static int fimc_stop_capture(struct fimc_dev *fimc, bool suspend)
  * spinlock held. It updates the camera pixel crop, rotation and
  * image flip in H/W.
  */
-int fimc_capture_config_update(struct fimc_ctx *ctx)
+static int fimc_capture_config_update(struct fimc_ctx *ctx)
 {
         struct fimc_dev *fimc = ctx->fimc_dev;
         int ret;
@@ -166,6 +166,70 @@ int fimc_capture_config_update(struct fimc_ctx *ctx)
         return ret;
 }
 
+void fimc_capture_irq_handler(struct fimc_dev *fimc, int deq_buf)
+{
+        struct fimc_vid_cap *cap = &fimc->vid_cap;
+        struct fimc_vid_buffer *v_buf;
+        struct timeval *tv;
+        struct timespec ts;
+
+        if (test_and_clear_bit(ST_CAPT_SHUT, &fimc->state)) {
+                wake_up(&fimc->irq_queue);
+                goto done;
+        }
+
+        if (!list_empty(&cap->active_buf_q) &&
+            test_bit(ST_CAPT_RUN, &fimc->state) && deq_buf) {
+                ktime_get_real_ts(&ts);
+
+                v_buf = fimc_active_queue_pop(cap);
+
+                tv = &v_buf->vb.v4l2_buf.timestamp;
+                tv->tv_sec = ts.tv_sec;
+                tv->tv_usec = ts.tv_nsec / NSEC_PER_USEC;
+                v_buf->vb.v4l2_buf.sequence = cap->frame_count++;
+
+                vb2_buffer_done(&v_buf->vb, VB2_BUF_STATE_DONE);
+        }
+
+        if (!list_empty(&cap->pending_buf_q)) {
+
+                v_buf = fimc_pending_queue_pop(cap);
+                fimc_hw_set_output_addr(fimc, &v_buf->paddr, cap->buf_index);
+                v_buf->index = cap->buf_index;
+
+                /* Move the buffer to the capture active queue */
+                fimc_active_queue_add(cap, v_buf);
+
+                dbg("next frame: %d, done frame: %d",
+                    fimc_hw_get_frame_index(fimc), v_buf->index);
+
+                if (++cap->buf_index >= FIMC_MAX_OUT_BUFS)
+                        cap->buf_index = 0;
+        }
+
+        if (cap->active_buf_cnt == 0) {
+                if (deq_buf)
+                        clear_bit(ST_CAPT_RUN, &fimc->state);
+
+                if (++cap->buf_index >= FIMC_MAX_OUT_BUFS)
+                        cap->buf_index = 0;
+        } else {
+                set_bit(ST_CAPT_RUN, &fimc->state);
+        }
+
+        fimc_capture_config_update(cap->ctx);
+done:
+        if (cap->active_buf_cnt == 1) {
+                fimc_deactivate_capture(fimc);
+                clear_bit(ST_CAPT_STREAM, &fimc->state);
+        }
+
+        dbg("frame: %d, active_buf_cnt: %d",
+            fimc_hw_get_frame_index(fimc), cap->active_buf_cnt);
+}
+
+
 static int start_streaming(struct vb2_queue *q, unsigned int count)
 {
         struct fimc_ctx *ctx = q->drv_priv;
@@ -1245,7 +1309,7 @@ void fimc_sensor_notify(struct v4l2_subdev *sd, unsigned int notification,
                                          struct fimc_vid_buffer, list);
                         vb2_set_plane_payload(&buf->vb, 0, *((u32 *)arg));
                 }
-                fimc_capture_irq_handler(fimc, true);
+                fimc_capture_irq_handler(fimc, 1);
                 fimc_deactivate_capture(fimc);
                 spin_unlock_irqrestore(&fimc->slock, irq_flags);
         }
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c
index f6b9060a0c0f..749db4deefcb 100644
--- a/drivers/media/video/s5p-fimc/fimc-core.c
+++ b/drivers/media/video/s5p-fimc/fimc-core.c
@@ -1,5 +1,5 @@
 /*
- * Samsung S5P/EXYNOS4 SoC series camera interface (video postprocessor) driver
+ * Samsung S5P/EXYNOS4 SoC series FIMC (CAMIF) driver
  *
  * Copyright (C) 2010-2011 Samsung Electronics Co., Ltd.
  * Contact: Sylwester Nawrocki, <s.nawrocki@samsung.com>
@@ -187,12 +187,12 @@ static struct fimc_fmt fimc_formats[] = {
         },
 };
 
-static unsigned int get_m2m_fmt_flags(unsigned int stream_type)
+struct fimc_fmt * fimc_get_format(unsigned int index)
 {
-        if (stream_type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-                return FMT_FLAGS_M2M_IN;
-        else
-                return FMT_FLAGS_M2M_OUT;
+        if (index >= ARRAY_SIZE(fimc_formats))
+                return NULL;
+
+        return &fimc_formats[index];
 }
 
 int fimc_check_scaler_ratio(struct fimc_ctx *ctx, int sw, int sh,
@@ -293,126 +293,9 @@ int fimc_set_scaler_info(struct fimc_ctx *ctx)
         return 0;
 }
 
-static void fimc_m2m_job_finish(struct fimc_ctx *ctx, int vb_state)
-{
-        struct vb2_buffer *src_vb, *dst_vb;
-
-        if (!ctx || !ctx->m2m_ctx)
-                return;
-
-        src_vb = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
-        dst_vb = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
-
-        if (src_vb && dst_vb) {
-                v4l2_m2m_buf_done(src_vb, vb_state);
-                v4l2_m2m_buf_done(dst_vb, vb_state);
-                v4l2_m2m_job_finish(ctx->fimc_dev->m2m.m2m_dev,
-                                    ctx->m2m_ctx);
-        }
-}
-
-/* Complete the transaction which has been scheduled for execution. */
-static int fimc_m2m_shutdown(struct fimc_ctx *ctx)
-{
-        struct fimc_dev *fimc = ctx->fimc_dev;
-        int ret;
-
-        if (!fimc_m2m_pending(fimc))
-                return 0;
-
-        fimc_ctx_state_set(FIMC_CTX_SHUT, ctx);
-
-        ret = wait_event_timeout(fimc->irq_queue,
-                           !fimc_ctx_state_is_set(FIMC_CTX_SHUT, ctx),
-                           FIMC_SHUTDOWN_TIMEOUT);
-