shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk3036/rk312x hdmi:

Browse Source 
We need to check hdmi connect status in probe hdmi. If hdmi is
        enable in uboot, and is removed before kernel, we will power
        down hdmi, and set it as disconnected.
This commit is contained in:
Zheng Yang
2014-10-16 17:42:09 +08:00
parent 07740a40aa
commit 8999042cef
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/rockchip/hdmi/chips/rk3036/rk3036_hdmi_hw.c
View File

@@ -857,6 +857,14 @@ int rk3036_hdmi_initial(struct hdmi *hdmi_drv)
if (!hdmi_drv->uboot_logo) {
rk3036_hdmi_reset_pclk();
rk3036_hdmi_reset(hdmi_drv);
} else {
hdmi_drv->hotplug = rk3036_hdmi_detect_hotplug(hdmi_drv);
if (hdmi_drv->hotplug == HDMI_HPD_REMOVED) {
rk3036_hdmi_removed(hdmi_drv);
hdmi_drv->state = HDMI_SLEEP;
hdmi_drv->lcdc->uboot_logo = 0;
hdmi_drv->uboot_logo = 0;
}
}
if (hdmi_drv->hdcp_power_on_cb)
rc = hdmi_drv->hdcp_power_on_cb();

4
drivers/video/rockchip/hdmi/rk_hdmi_task.c
View File

@@ -48,8 +48,8 @@ static void hdmi_sys_show_state(struct hdmi *hdmi)
int hdmi_sys_init(struct hdmi *hdmi)
{
hdmi->uboot_logo = support_uboot_display();
if ((uboot_vic > 0) && (hdmi->uboot_logo > 0)) {
if (uboot_vic > 0) {
hdmi->uboot_logo = support_uboot_display();
hdmi->hotplug = HDMI_HPD_ACTIVED;
hdmi->state = PLAY_BACK;
hdmi->enable = HDMI_ENABLE;