aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/s5p-tv/hdmi_drv.c
diff options
context:
space:
mode:
authorTomasz Stanislawski <t.stanislaws@samsung.com>2011-08-25 11:47:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-26 07:04:31 -0400
commit0689133b7fadd2e10f4bddca36c895223a541c6c (patch)
tree4479f1b53f668656675b9f4eeb1466fcb5f1a54e /drivers/media/video/s5p-tv/hdmi_drv.c
parent17b27478ccdb5b6883032031b83f5cd2ce5f8cf9 (diff)
[media] s5p-tv: fix mbus configuration
This patch fixes mbus configuration between Mixer, SDO and HDMI. The SDO accepts only YUV444 on input. The HDMI in DVI mode accepts only RGB888. Now Mixer is choosing proper output format depending on mbus format. Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-tv/hdmi_drv.c')
-rw-r--r--drivers/media/video/s5p-tv/hdmi_drv.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/s5p-tv/hdmi_drv.c b/drivers/media/video/s5p-tv/hdmi_drv.c
index e1b29b488f6c..0279e6e89feb 100644
--- a/drivers/media/video/s5p-tv/hdmi_drv.c
+++ b/drivers/media/video/s5p-tv/hdmi_drv.c
@@ -440,6 +440,7 @@ static const struct hdmi_preset_conf hdmi_conf_480p = {
440 .height = 480, 440 .height = 480,
441 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ 441 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
442 .field = V4L2_FIELD_NONE, 442 .field = V4L2_FIELD_NONE,
443 .colorspace = V4L2_COLORSPACE_SRGB,
443 }, 444 },
444}; 445};
445 446
@@ -472,6 +473,7 @@ static const struct hdmi_preset_conf hdmi_conf_720p60 = {
472 .height = 720, 473 .height = 720,
473 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ 474 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
474 .field = V4L2_FIELD_NONE, 475 .field = V4L2_FIELD_NONE,
476 .colorspace = V4L2_COLORSPACE_SRGB,
475 }, 477 },
476}; 478};
477 479
@@ -504,6 +506,7 @@ static const struct hdmi_preset_conf hdmi_conf_1080p50 = {
504 .height = 1080, 506 .height = 1080,
505 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ 507 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
506 .field = V4L2_FIELD_NONE, 508 .field = V4L2_FIELD_NONE,
509 .colorspace = V4L2_COLORSPACE_SRGB,
507 }, 510 },
508}; 511};
509 512
@@ -536,6 +539,7 @@ static const struct hdmi_preset_conf hdmi_conf_1080p60 = {
536 .height = 1080, 539 .height = 1080,
537 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ 540 .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
538 .field = V4L2_FIELD_NONE, 541 .field = V4L2_FIELD_NONE,
542 .colorspace = V4L2_COLORSPACE_SRGB,
539 }, 543 },
540}; 544};
541 545