UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Tomasz Stanislawski 2011-08-25 12:47:48 -03:00 committed by Mauro Carvalho Chehab
parent 17b27478cc
commit 0689133b7f
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/s5p-tv/hdmi_drv.c
View File

@ -440,6 +440,7 @@ static const struct hdmi_preset_conf hdmi_conf_480p = {
.height = 480, .height = 480,
.code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
.field = V4L2_FIELD_NONE, .field = V4L2_FIELD_NONE,
.colorspace = V4L2_COLORSPACE_SRGB,
}, },
}; };
@ -472,6 +473,7 @@ static const struct hdmi_preset_conf hdmi_conf_720p60 = {
.height = 720, .height = 720,
.code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
.field = V4L2_FIELD_NONE, .field = V4L2_FIELD_NONE,
.colorspace = V4L2_COLORSPACE_SRGB,
}, },
}; };
@ -504,6 +506,7 @@ static const struct hdmi_preset_conf hdmi_conf_1080p50 = {
.height = 1080, .height = 1080,
.code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
.field = V4L2_FIELD_NONE, .field = V4L2_FIELD_NONE,
.colorspace = V4L2_COLORSPACE_SRGB,
}, },
}; };
@ -536,6 +539,7 @@ static const struct hdmi_preset_conf hdmi_conf_1080p60 = {
.height = 1080, .height = 1080,
.code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */ .code = V4L2_MBUS_FMT_FIXED, /* means RGB888 */
.field = V4L2_FIELD_NONE, .field = V4L2_FIELD_NONE,
.colorspace = V4L2_COLORSPACE_SRGB,
}, },
}; };

11
drivers/media/video/s5p-tv/mixer_reg.c
View File

@ -90,7 +90,7 @@ void mxr_reg_reset(struct mxr_device *mdev)
mxr_vsync_set_update(mdev, MXR_DISABLE); mxr_vsync_set_update(mdev, MXR_DISABLE);
/* set output in RGB888 mode */ /* set output in RGB888 mode */
mxr_write(mdev, MXR_CFG, MXR_CFG_OUT_YUV444); mxr_write(mdev, MXR_CFG, MXR_CFG_OUT_RGB888);
/* 16 beat burst in DMA */ /* 16 beat burst in DMA */
mxr_write_mask(mdev, MXR_STATUS, MXR_STATUS_16_BURST, mxr_write_mask(mdev, MXR_STATUS, MXR_STATUS_16_BURST,
@ -376,6 +376,12 @@ void mxr_reg_set_mbus_fmt(struct mxr_device *mdev,
spin_lock_irqsave(&mdev->reg_slock, flags); spin_lock_irqsave(&mdev->reg_slock, flags);
mxr_vsync_set_update(mdev, MXR_DISABLE); mxr_vsync_set_update(mdev, MXR_DISABLE);
/* selecting colorspace accepted by output */
if (fmt->colorspace == V4L2_COLORSPACE_JPEG)
val |= MXR_CFG_OUT_YUV444;
else
val |= MXR_CFG_OUT_RGB888;
/* choosing between interlace and progressive mode */ /* choosing between interlace and progressive mode */
if (fmt->field == V4L2_FIELD_INTERLACED) if (fmt->field == V4L2_FIELD_INTERLACED)
val |= MXR_CFG_SCAN_INTERLACE; val |= MXR_CFG_SCAN_INTERLACE;
@ -394,7 +400,8 @@ void mxr_reg_set_mbus_fmt(struct mxr_device *mdev,
else else
WARN(1, "unrecognized mbus height %u!\n", fmt->height); WARN(1, "unrecognized mbus height %u!\n", fmt->height);
mxr_write_mask(mdev, MXR_CFG, val, MXR_CFG_SCAN_MASK); mxr_write_mask(mdev, MXR_CFG, val, MXR_CFG_SCAN_MASK |
MXR_CFG_OUT_MASK);
val = (fmt->field == V4L2_FIELD_INTERLACED) ? ~0 : 0; val = (fmt->field == V4L2_FIELD_INTERLACED) ? ~0 : 0;
vp_write_mask(mdev, VP_MODE, val, vp_write_mask(mdev, VP_MODE, val,

1
drivers/media/video/s5p-tv/regs-mixer.h
View File

@ -67,6 +67,7 @@
/* bits for MXR_CFG */ /* bits for MXR_CFG */
#define MXR_CFG_OUT_YUV444 (0 << 8) #define MXR_CFG_OUT_YUV444 (0 << 8)
#define MXR_CFG_OUT_RGB888 (1 << 8) #define MXR_CFG_OUT_RGB888 (1 << 8)
#define MXR_CFG_OUT_MASK (1 << 8)
#define MXR_CFG_DST_SDO (0 << 7) #define MXR_CFG_DST_SDO (0 << 7)
#define MXR_CFG_DST_HDMI (1 << 7) #define MXR_CFG_DST_HDMI (1 << 7)
#define MXR_CFG_DST_MASK (1 << 7) #define MXR_CFG_DST_MASK (1 << 7)

1
drivers/media/video/s5p-tv/sdo_drv.c
View File

@ -170,6 +170,7 @@ static int sdo_g_mbus_fmt(struct v4l2_subdev *sd,
fmt->height = sdev->fmt->height; fmt->height = sdev->fmt->height;
fmt->code = V4L2_MBUS_FMT_FIXED; fmt->code = V4L2_MBUS_FMT_FIXED;
fmt->field = V4L2_FIELD_INTERLACED; fmt->field = V4L2_FIELD_INTERLACED;
fmt->colorspace = V4L2_COLORSPACE_JPEG;
return 0; return 0;
} }