CHROMIUM: s5p-mfc: enable NV12M/NV21M decoder output.

These two formats work on hardware; there is no need to disable them.
Enable them so we can have linear multiplanar YUV output support.

Signed-off-by: John Sheu <sheu@google.com>
BUG=chromium-os:38376
BUG=chromium:167417
TEST=local build, run on snow
Change-Id: Ic4889ca26555b067e7faadf9027e789633622dee
Reviewed-on: https://gerrit.chromium.org/gerrit/42761
Reviewed-by: Pawel Osciak <posciak@chromium.org>
Tested-by: John Sheu <sheu@chromium.org>
Commit-Queue: John Sheu <sheu@chromium.org>

diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
index d1c014c..6e55b3b 100644 (file)
--- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c
@@ -408,7 +408,12 @@ static int vidioc_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
                        return -EINVAL;
                }
                if (IS_MFCV6(dev)) {
-                       if (fmt->fourcc == V4L2_PIX_FMT_NV12MT) {
+                       switch (fmt->fourcc) {
+                       case V4L2_PIX_FMT_NV12M:
+                       case V4L2_PIX_FMT_NV21M:
+                       case V4L2_PIX_FMT_NV12MT_16X16:
+                               break;
+                       default:
                                mfc_err("Not supported format.\n");
                                return -EINVAL;
                        }
@@ -454,7 +459,12 @@ static int vidioc_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
                                return -EINVAL;
                        }
                } else if (IS_MFCV6(dev)) {
-                       if (fmt->fourcc == V4L2_PIX_FMT_NV12MT) {
+                       switch (fmt->fourcc) {
+                       case V4L2_PIX_FMT_NV12M:
+                       case V4L2_PIX_FMT_NV21M:
+                       case V4L2_PIX_FMT_NV12MT_16X16:
+                               break;
+                       default:
                                mfc_err("Not supported format.\n");
                                return -EINVAL;
                        }