V4L/DVB (9239): Add support for rgb555 pixel formats to vivi

This patch adds RGB555 pixel format support to the vivi driver. Both
little endian and big endian versions are added. The driver follows
the RGB pixel format described in Table 2-2 of the V4L2 API spec,
_not_ the older BGR interpretation described in Table 2-1.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 40 insertions, 0 deletions

diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 2fddba6d5b39..7d7e51def461 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -149,6 +149,16 @@ static struct vivi_fmt formats[] = {
                 .fourcc   = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
                 .depth    = 16,
         },
+        {
+                .name     = "RGB555 (LE)",
+                .fourcc   = V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
+                .depth    = 16,
+        },
+        {
+                .name     = "RGB555 (BE)",
+                .fourcc   = V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
+                .depth    = 16,
+        },
 };
 
 static struct vivi_fmt *get_format(struct v4l2_format *f)
@@ -335,6 +345,30 @@ static void gen_twopix(struct vivi_fh *fh, unsigned char *buf, int colorpos)
                                 break;
                         }
                         break;
+                case V4L2_PIX_FMT_RGB555:
+                        switch (color) {
+                        case 0:
+                        case 2:
+                                *p = (g_u << 5) | b_v;
+                                break;
+                        case 1:
+                        case 3:
+                                *p = (r_y << 2) | (g_u >> 3);
+                                break;
+                        }
+                        break;
+                case V4L2_PIX_FMT_RGB555X:
+                        switch (color) {
+                        case 0:
+                        case 2:
+                                *p = (r_y << 2) | (g_u >> 3);
+                                break;
+                        case 1:
+                        case 3:
+                                *p = (g_u << 5) | b_v;
+                                break;
+                        }
+                        break;
                 }
         }
 }
@@ -818,6 +852,12 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                         g >>= 2;
                         b >>= 3;
                         break;
+                case V4L2_PIX_FMT_RGB555:
+                case V4L2_PIX_FMT_RGB555X:
+                        r >>= 3;
+                        g >>= 3;
+                        b >>= 3;
+                        break;
                 }
 
                 if (is_yuv) {