From a42586a2b43d90e8cc13979ab267882ea24839d3 Mon Sep 17 00:00:00 2001 From: hjc Date: Fri, 10 Oct 2014 15:11:31 +0800 Subject: [PATCH] rk hdmi: update hdmi connect status --- drivers/video/rockchip/hdmi/rk_hdmi.h | 1 - drivers/video/rockchip/hdmi/rk_hdmi_task.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/hdmi/rk_hdmi.h b/drivers/video/rockchip/hdmi/rk_hdmi.h index d13bed5da637..c853654871a5 100755 --- a/drivers/video/rockchip/hdmi/rk_hdmi.h +++ b/drivers/video/rockchip/hdmi/rk_hdmi.h @@ -364,7 +364,6 @@ struct hdmi { int tmdsclk; /* TDMS Clock frequency */ int pixclock; /* Pixel Clcok frequency */ int uboot_logo; - int uboot_vic; struct list_head pwrlist_head; diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_task.c b/drivers/video/rockchip/hdmi/rk_hdmi_task.c index 174a19127af6..4311edf9c7a3 100755 --- a/drivers/video/rockchip/hdmi/rk_hdmi_task.c +++ b/drivers/video/rockchip/hdmi/rk_hdmi_task.c @@ -9,7 +9,7 @@ #define HDMI_MAX_ID 1 static char *envp[] = { "INTERFACE=HDMI", NULL }; -static int uboot_vic; +static int uboot_vic=-1; static void hdmi_sys_show_state(struct hdmi *hdmi) { switch (hdmi->state) { @@ -49,8 +49,7 @@ static void hdmi_sys_show_state(struct hdmi *hdmi) int hdmi_sys_init(struct hdmi *hdmi) { hdmi->uboot_logo = support_uboot_display(); - printk("%s,uboot-logo=%d,uboot_vic=%d\n",__func__,hdmi->uboot_logo,uboot_vic); - if (hdmi->uboot_logo) { + if ((uboot_vic > 0) && (hdmi->uboot_logo > 0)) { hdmi->hotplug = HDMI_HPD_ACTIVED; hdmi->state = PLAY_BACK; hdmi->enable = HDMI_ENABLE; @@ -62,7 +61,9 @@ int hdmi_sys_init(struct hdmi *hdmi) hdmi->enable = HDMI_ENABLE; hdmi->display = HDMI_DISABLE; hdmi->vic = HDMI_VIDEO_DEFAULT_MODE; + hdmi->uboot_logo = 0; } + hdmi_dbg(hdmi->dev, "uboot-logo=%d,uboot_vic=%d\n",hdmi->uboot_logo,uboot_vic); hdmi->autoconfig = HDMI_AUTO_CONFIGURE; hdmi->audio.channel = HDMI_AUDIO_DEFAULT_CHANNEL; hdmi->audio.rate = HDMI_AUDIO_DEFAULT_RATE; -- 2.34.1