Merge branch 'staging/for_v3.7' into v4l_for_linus

Applied on the top of changeset 782cd9e, as some of those patches
depend on some fixes that went via -arm tree.

* staging/for_v3.7: (109 commits)
  [media] m5mols: Add missing #include <linux/sizes.h>
  [media] stk1160: Add support for S-Video input
  Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
  [media]  dvb: LNA implementation changes
  [media] v4l2-ioctl: fix W=1 warnings
  [media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
  [media] omap3isp: Fix compilation error in ispreg.h
  [media] rc-msi-digivox-ii: Add full scan keycodes
  [media] cx25821: testing the wrong variable
  [media] tda18271-common: hold the I2C adapter during write transfers
  [media] ds3000: add module parameter to force firmware upload
  [media] drivers/media: Remove unnecessary semicolon
  [media] winbond: remove space from driver name
  [media] iguanair: cannot send data from the stack
  [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
  [media] dvb-usb: print small buffers via %*ph
  [media] uvc: Add return code check at vb2_queue_init()
  [media] em28xx: Replace memcpy with struct assignment
  [media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
  [media] mem2mem_testdev: Use devm_kzalloc() in probe
  ...

1 files changed, 176 insertions, 82 deletions

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 6ee21bb71398..eb6a70b0f821 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -23,85 +23,114 @@
 #include <linux/workqueue.h>
 #include <media/v4l2-ctrls.h>
 #include <media/videobuf2-core.h>
-#include "regs-mfc.h"
 #include "s5p_mfc_common.h"
 #include "s5p_mfc_debug.h"
 #include "s5p_mfc_dec.h"
 #include "s5p_mfc_intr.h"
 #include "s5p_mfc_opr.h"
 #include "s5p_mfc_pm.h"
-#include "s5p_mfc_shm.h"
+
+#define DEF_SRC_FMT_DEC V4L2_PIX_FMT_H264
+#define DEF_DST_FMT_DEC V4L2_PIX_FMT_NV12MT_16X16
 
 static struct s5p_mfc_fmt formats[] = {
         {
+                .name           = "4:2:0 2 Planes 16x16 Tiles",
+                .fourcc         = V4L2_PIX_FMT_NV12MT_16X16,
+                .codec_mode     = S5P_MFC_CODEC_NONE,
+                .type           = MFC_FMT_RAW,
+                .num_planes     = 2,
+        },
+        {
                 .name           = "4:2:0 2 Planes 64x32 Tiles",
                 .fourcc         = V4L2_PIX_FMT_NV12MT,
-                .codec_mode     = S5P_FIMV_CODEC_NONE,
+                .codec_mode     = S5P_MFC_CODEC_NONE,
                 .type           = MFC_FMT_RAW,
                 .num_planes     = 2,
-         },
+        },
         {
-                .name = "4:2:0 2 Planes",
-                .fourcc = V4L2_PIX_FMT_NV12M,
-                .codec_mode = S5P_FIMV_CODEC_NONE,
-                .type = MFC_FMT_RAW,
-                .num_planes = 2,
+                .name           = "4:2:0 2 Planes Y/CbCr",
+                .fourcc         = V4L2_PIX_FMT_NV12M,
+                .codec_mode     = S5P_MFC_CODEC_NONE,
+                .type           = MFC_FMT_RAW,
+                .num_planes     = 2,
+        },
+        {
+                .name           = "4:2:0 2 Planes Y/CrCb",
+                .fourcc         = V4L2_PIX_FMT_NV21M,
+                .codec_mode     = S5P_MFC_CODEC_NONE,
+                .type           = MFC_FMT_RAW,
+                .num_planes     = 2,
         },
         {
-                .name = "H264 Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_H264,
-                .codec_mode = S5P_FIMV_CODEC_H264_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "H264 Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_H264,
+                .codec_mode     = S5P_MFC_CODEC_H264_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
         {
-                .name = "H263 Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_H263,
-                .codec_mode = S5P_FIMV_CODEC_H263_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "H264/MVC Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_H264_MVC,
+                .codec_mode     = S5P_MFC_CODEC_H264_MVC_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
         {
-                .name = "MPEG1 Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_MPEG1,
-                .codec_mode = S5P_FIMV_CODEC_MPEG2_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "H263 Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_H263,
+                .codec_mode     = S5P_MFC_CODEC_H263_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
         {
-                .name = "MPEG2 Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_MPEG2,
-                .codec_mode = S5P_FIMV_CODEC_MPEG2_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "MPEG1 Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_MPEG1,
+                .codec_mode     = S5P_MFC_CODEC_MPEG2_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
         {
-                .name = "MPEG4 Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_MPEG4,
-                .codec_mode = S5P_FIMV_CODEC_MPEG4_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "MPEG2 Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_MPEG2,
+                .codec_mode     = S5P_MFC_CODEC_MPEG2_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
         {
-                .name = "XviD Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_XVID,
-                .codec_mode = S5P_FIMV_CODEC_MPEG4_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "MPEG4 Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_MPEG4,
+                .codec_mode     = S5P_MFC_CODEC_MPEG4_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
         {
-                .name = "VC1 Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_VC1_ANNEX_G,
-                .codec_mode = S5P_FIMV_CODEC_VC1_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "XviD Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_XVID,
+                .codec_mode     = S5P_MFC_CODEC_MPEG4_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
         {
-                .name = "VC1 RCV Encoded Stream",
-                .fourcc = V4L2_PIX_FMT_VC1_ANNEX_L,
-                .codec_mode = S5P_FIMV_CODEC_VC1RCV_DEC,
-                .type = MFC_FMT_DEC,
-                .num_planes = 1,
+                .name           = "VC1 Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_VC1_ANNEX_G,
+                .codec_mode     = S5P_MFC_CODEC_VC1_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
+        },
+        {
+                .name           = "VC1 RCV Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_VC1_ANNEX_L,
+                .codec_mode     = S5P_MFC_CODEC_VC1RCV_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
+        },
+        {
+                .name           = "VP8 Encoded Stream",
+                .fourcc         = V4L2_PIX_FMT_VP8,
+                .codec_mode     = S5P_MFC_CODEC_VP8_DEC,
+                .type           = MFC_FMT_DEC,
+                .num_planes     = 1,
         },
 };
 
@@ -297,7 +326,7 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
                 /* If the MFC is parsing the header,
                  * so wait until it is finished */
                 s5p_mfc_clean_ctx_int_flags(ctx);
-                s5p_mfc_wait_for_done_ctx(ctx, S5P_FIMV_R2H_CMD_SEQ_DONE_RET,
+                s5p_mfc_wait_for_done_ctx(ctx, S5P_MFC_R2H_CMD_SEQ_DONE_RET,
                                                                         0);
         }
         if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
@@ -342,21 +371,36 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
 /* Try format */
 static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
 {
+        struct s5p_mfc_dev *dev = video_drvdata(file);
         struct s5p_mfc_fmt *fmt;
 
-        if (f->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
-                mfc_err("This node supports decoding only\n");
-                return -EINVAL;
-        }
-        fmt = find_format(f, MFC_FMT_DEC);
-        if (!fmt) {
-                mfc_err("Unsupported format\n");
-                return -EINVAL;
-        }
-        if (fmt->type != MFC_FMT_DEC) {
-                mfc_err("\n");
-                return -EINVAL;
+        mfc_debug(2, "Type is %d\n", f->type);
+        if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+                fmt = find_format(f, MFC_FMT_DEC);
+                if (!fmt) {
+                        mfc_err("Unsupported format for source.\n");
+                        return -EINVAL;
+                }
+                if (!IS_MFCV6(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {
+                        mfc_err("Not supported format.\n");
+                        return -EINVAL;
+                }
+        } else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
+                fmt = find_format(f, MFC_FMT_RAW);
+                if (!fmt) {
+                        mfc_err("Unsupported format for destination.\n");
+                        return -EINVAL;
+                }
+                if (IS_MFCV6(dev) && (fmt->fourcc == V4L2_PIX_FMT_NV12MT)) {
+                        mfc_err("Not supported format.\n");
+                        return -EINVAL;
+                } else if (!IS_MFCV6(dev) &&
+                                (fmt->fourcc != V4L2_PIX_FMT_NV12MT)) {
+                        mfc_err("Not supported format.\n");
+                        return -EINVAL;
+                }
         }
+
         return 0;
 }
 
@@ -379,8 +423,29 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
                 ret = -EBUSY;
                 goto out;
         }
+        if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
+                fmt = find_format(f, MFC_FMT_RAW);
+                if (!fmt) {
+                        mfc_err("Unsupported format for source.\n");
+                        return -EINVAL;
+                }
+                if (!IS_MFCV6(dev) && (fmt->fourcc != V4L2_PIX_FMT_NV12MT)) {
+                        mfc_err("Not supported format.\n");
+                        return -EINVAL;
+                } else if (IS_MFCV6(dev) &&
+                                (fmt->fourcc == V4L2_PIX_FMT_NV12MT)) {
+                        mfc_err("Not supported format.\n");
+                        return -EINVAL;
+                }
+                ctx->dst_fmt = fmt;
+                mfc_debug_leave();
+                return ret;
+        } else if (f->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+                mfc_err("Wrong type error for S_FMT : %d", f->type);
+                return -EINVAL;
+        }
         fmt = find_format(f, MFC_FMT_DEC);
-        if (!fmt || fmt->codec_mode == S5P_FIMV_CODEC_NONE) {
+        if (!fmt || fmt->codec_mode == S5P_MFC_CODEC_NONE) {
                 mfc_err("Unknown codec\n");
                 ret = -EINVAL;
                 goto out;
@@ -391,6 +456,10 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
                 ret = -EINVAL;
                 goto out;
         }
+        if (!IS_MFCV6(dev) && (fmt->fourcc == V4L2_PIX_FMT_VP8)) {
+                mfc_err("Not supported format.\n");
+                return -EINVAL;
+        }
         ctx->src_fmt = fmt;
         ctx->codec_mode = fmt->codec_mode;
         mfc_debug(2, "The codec number is: %d\n", ctx->codec_mode);
@@ -476,7 +545,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                         return -ENOMEM;
                 }
                 ctx->total_dpb_count = reqbufs->count;
-                ret = s5p_mfc_alloc_codec_buffers(ctx);
+                ret = s5p_mfc_hw_call(dev->mfc_ops, alloc_codec_buffers, ctx);
                 if (ret) {
                         mfc_err("Failed to allocate decoding buffers\n");
                         reqbufs->count = 0;
@@ -492,15 +561,16 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                         reqbufs->count = 0;
                         s5p_mfc_clock_on();
                         ret = vb2_reqbufs(&ctx->vq_dst, reqbufs);
-                        s5p_mfc_release_codec_buffers(ctx);
+                        s5p_mfc_hw_call(dev->mfc_ops, release_codec_buffers,
+                                        ctx);
                         s5p_mfc_clock_off();
                         return -ENOMEM;
                 }
                 if (s5p_mfc_ctx_ready(ctx))
                         set_work_bit_irqsave(ctx);
-                s5p_mfc_try_run(dev);
+                s5p_mfc_hw_call(dev->mfc_ops, try_run, dev);
                 s5p_mfc_wait_for_done_ctx(ctx,
-                                         S5P_FIMV_R2H_CMD_INIT_BUFFERS_RET, 0);
+                                        S5P_MFC_R2H_CMD_INIT_BUFFERS_RET, 0);
         }
         return ret;
 }
@@ -582,18 +652,22 @@ static int vidioc_streamon(struct file *file, void *priv,
                         ctx->src_bufs_cnt = 0;
                         ctx->capture_state = QUEUE_FREE;
                         ctx->output_state = QUEUE_FREE;
-                        s5p_mfc_alloc_instance_buffer(ctx);
-                        s5p_mfc_alloc_dec_temp_buffers(ctx);
+                        s5p_mfc_hw_call(dev->mfc_ops, alloc_instance_buffer,
+                                        ctx);
+                        s5p_mfc_hw_call(dev->mfc_ops, alloc_dec_temp_buffers,
+                                        ctx);
                         set_work_bit_irqsave(ctx);
                         s5p_mfc_clean_ctx_int_flags(ctx);
-                        s5p_mfc_try_run(dev);
+                        s5p_mfc_hw_call(dev->mfc_ops, try_run, dev);
 
                         if (s5p_mfc_wait_for_done_ctx(ctx,
-                                S5P_FIMV_R2H_CMD_OPEN_INSTANCE_RET, 0)) {
+                                S5P_MFC_R2H_CMD_OPEN_INSTANCE_RET, 0)) {
                                 /* Error or timeout */
                                 mfc_err("Error getting instance from hardware\n");
-                                s5p_mfc_release_instance_buffer(ctx);
-                                s5p_mfc_release_dec_desc_buffer(ctx);
+                                s5p_mfc_hw_call(dev->mfc_ops,
+                                                release_instance_buffer, ctx);
+                                s5p_mfc_hw_call(dev->mfc_ops,
+                                                release_dec_desc_buffer, ctx);
                                 return -EIO;
                         }
                         mfc_debug(2, "Got instance number: %d\n", ctx->inst_no);
@@ -662,7 +736,7 @@ static int s5p_mfc_dec_g_v_ctrl(struct v4l2_ctrl *ctrl)
                 /* Should wait for the header to be parsed */
                 s5p_mfc_clean_ctx_int_flags(ctx);
                 s5p_mfc_wait_for_done_ctx(ctx,
-                                S5P_FIMV_R2H_CMD_SEQ_DONE_RET, 0);
+                                S5P_MFC_R2H_CMD_SEQ_DONE_RET, 0);
                 if (ctx->state >= MFCINST_HEAD_PARSED &&
                     ctx->state < MFCINST_ABORT) {
                         ctrl->val = ctx->dpb_count;
@@ -686,6 +760,7 @@ static int vidioc_g_crop(struct file *file, void *priv,
                 struct v4l2_crop *cr)
 {
         struct s5p_mfc_ctx *ctx = fh_to_ctx(priv);
+        struct s5p_mfc_dev *dev = ctx->dev;
         u32 left, right, top, bottom;
 
         if (ctx->state != MFCINST_HEAD_PARSED &&
@@ -695,10 +770,10 @@ static int vidioc_g_crop(struct file *file, void *priv,
                         return -EINVAL;
                 }
         if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_H264) {
-                left = s5p_mfc_read_shm(ctx, CROP_INFO_H);
+                left = s5p_mfc_hw_call(dev->mfc_ops, get_crop_info_h, ctx);
                 right = left >> S5P_FIMV_SHARED_CROP_RIGHT_SHIFT;
                 left = left & S5P_FIMV_SHARED_CROP_LEFT_MASK;
-                top = s5p_mfc_read_shm(ctx, CROP_INFO_V);
+                top = s5p_mfc_hw_call(dev->mfc_ops, get_crop_info_v, ctx);
                 bottom = top >> S5P_FIMV_SHARED_CROP_BOTTOM_SHIFT;
                 top = top & S5P_FIMV_SHARED_CROP_TOP_MASK;
                 cr->c.left = left;
@@ -749,6 +824,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
                         void *allocators[])
 {
         struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
+        struct s5p_mfc_dev *dev = ctx->dev;
 
         /* Video output for decoding (source)
          * this can be set after getting an instance */
@@ -784,7 +860,13 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
             vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
                 psize[0] = ctx->luma_size;
                 psize[1] = ctx->chroma_size;
-                allocators[0] = ctx->dev->alloc_ctx[MFC_BANK2_ALLOC_CTX];
+
+                if (IS_MFCV6(dev))
+                        allocators[0] =
+                                ctx->dev->alloc_ctx[MFC_BANK1_ALLOC_CTX];
+                else
+                        allocators[0] =
+                                ctx->dev->alloc_ctx[MFC_BANK2_ALLOC_CTX];
                 allocators[1] = ctx->dev->alloc_ctx[MFC_BANK1_ALLOC_CTX];
         } else if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &&
                    ctx->state == MFCINST_INIT) {
@@ -876,7 +958,7 @@ static int s5p_mfc_start_streaming(struct vb2_queue *q, unsigned int count)
         /* If context is ready then dev = work->data;schedule it to run */
         if (s5p_mfc_ctx_ready(ctx))
                 set_work_bit_irqsave(ctx);
-        s5p_mfc_try_run(dev);
+        s5p_mfc_hw_call(dev->mfc_ops, try_run, dev);
         return 0;
 }
 
@@ -892,19 +974,21 @@ static int s5p_mfc_stop_streaming(struct vb2_queue *q)
                 dev->curr_ctx == ctx->num && dev->hw_lock) {
                 ctx->state = MFCINST_ABORT;
                 s5p_mfc_wait_for_done_ctx(ctx,
-                                        S5P_FIMV_R2H_CMD_FRAME_DONE_RET, 0);
+                                        S5P_MFC_R2H_CMD_FRAME_DONE_RET, 0);
                 aborted = 1;
         }
         spin_lock_irqsave(&dev->irqlock, flags);
         if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
-                s5p_mfc_cleanup_queue(&ctx->dst_queue, &ctx->vq_dst);
+                s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->dst_queue,
+                                &ctx->vq_dst);
                 INIT_LIST_HEAD(&ctx->dst_queue);
                 ctx->dst_queue_cnt = 0;
                 ctx->dpb_flush_flag = 1;
                 ctx->dec_dst_flag = 0;
         }
         if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
-                s5p_mfc_cleanup_queue(&ctx->src_queue, &ctx->vq_src);
+                s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->src_queue,
+                                &ctx->vq_src);
                 INIT_LIST_HEAD(&ctx->src_queue);
                 ctx->src_queue_cnt = 0;
         }
@@ -944,7 +1028,7 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
         }
         if (s5p_mfc_ctx_ready(ctx))
                 set_work_bit_irqsave(ctx);
-        s5p_mfc_try_run(dev);
+        s5p_mfc_hw_call(dev->mfc_ops, try_run, dev);
 }
 
 static struct vb2_ops s5p_mfc_dec_qops = {
@@ -1028,3 +1112,13 @@ void s5p_mfc_dec_ctrls_delete(struct s5p_mfc_ctx *ctx)
                 ctx->ctrls[i] = NULL;
 }
 
+void s5p_mfc_dec_init(struct s5p_mfc_ctx *ctx)
+{
+        struct v4l2_format f;
+        f.fmt.pix_mp.pixelformat = DEF_SRC_FMT_DEC;
+        ctx->src_fmt = find_format(&f, MFC_FMT_DEC);
+        f.fmt.pix_mp.pixelformat = DEF_DST_FMT_DEC;
+        ctx->dst_fmt = find_format(&f, MFC_FMT_RAW);
+        mfc_debug(2, "Default src_fmt is %x, dest_fmt is %x\n",
+                        (unsigned int)ctx->src_fmt, (unsigned int)ctx->dst_fmt);
+}