1. In DVI mode, input color and output color should be RGB[0-255];
	   In HDMI mode, input color should be YCbCr;
	2. For MID, HDMI is default disabled.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-02-14 16:22:35 +08:00
parent faf8120fc8
commit bdb1122f09
4 changed files with 10 additions and 3 deletions

View File

@@ -80,6 +80,8 @@ static void hdmi_wq_set_video(struct hdmi *hdmi)
video.vic = hdmi->vic & HDMI_VIC_MASK;
if (hdmi->vic & HDMI_VIDEO_YUV420)
video.color_input = HDMI_COLOR_YCBCR420;
else if (hdmi->edid.sink_hdmi == 0)
video.color_input = HDMI_COLOR_RGB_0_255;
else
video.color_input = HDMI_COLOR_YCBCR444;
video.sink_hdmi = hdmi->edid.sink_hdmi;

View File

@@ -54,7 +54,10 @@ static int hdmi_set_info(struct rk_screen *screen, struct hdmi *hdmi)
/* screen type & face */
screen->type = SCREEN_HDMI;
screen->color_mode = COLOR_YCBCR;
if (hdmi->edid.sink_hdmi)
screen->color_mode = COLOR_YCBCR;
else
screen->color_mode = COLOR_RGB;
if (hdmi->vic & HDMI_VIDEO_YUV420)
screen->face = OUT_YUV_420;
else

View File

@@ -327,8 +327,9 @@ static int rockchip_hdmiv1_probe(struct platform_device *pdev)
fb_register_client(&rockchip_hdmiv1_fb_notifier);
rockchip_hdmiv1_initial(hdmi_dev->hdmi);
rk_display_device_enable(hdmi_dev->hdmi->ddev);
if (rk_fb_get_display_policy() == DISPLAY_POLICY_BOX) {
rk_display_device_enable(hdmi_dev->hdmi->ddev);
delay_work = hdmi_submit_work(hdmi_dev->hdmi,
HDMI_HPD_CHANGE, 0, NULL);
if (delay_work)

View File

@@ -442,7 +442,8 @@ static int rockchip_hdmiv2_probe(struct platform_device *pdev)
hdmi_dev->debugfs_dir,
hdmi_dev, &rockchip_hdmiv2_reg_fops);
#endif
rk_display_device_enable(hdmi_dev->hdmi->ddev);
if (rk_fb_get_display_policy() == DISPLAY_POLICY_BOX)
rk_display_device_enable(hdmi_dev->hdmi->ddev);
#ifndef HDMI_INT_USE_POLL
/* get and request the IRQ */