From c9fbe6fa5198b8818a1a90535f4211294bc487ac Mon Sep 17 00:00:00 2001 From: hjc Date: Thu, 9 Oct 2014 16:42:36 +0800 Subject: [PATCH] rk hdmi: update screen info for display uboot logo --- drivers/video/rockchip/hdmi/rk_hdmi_task.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_task.c b/drivers/video/rockchip/hdmi/rk_hdmi_task.c index 2cfe9f2f31bd..174a19127af6 100755 --- a/drivers/video/rockchip/hdmi/rk_hdmi_task.c +++ b/drivers/video/rockchip/hdmi/rk_hdmi_task.c @@ -255,12 +255,10 @@ void hdmi_work(struct work_struct *work) #endif rockchip_set_system_status(SYS_STATUS_HDMI); } - if (hdmi->uboot_logo) { - hdmi->state = CONFIG_AUDIO; - } + break; case SYSTEM_CONFIG: - if (hdmi->remove) + if ((hdmi->remove) && !hdmi->uboot_logo) hdmi->remove(hdmi); if (hdmi->autoconfig) @@ -271,6 +269,9 @@ void hdmi_work(struct work_struct *work) rc = hdmi_switch_fb(hdmi, hdmi->vic); if (rc == HDMI_ERROR_SUCESS) hdmi->state = CONFIG_VIDEO; + if (hdmi->uboot_logo) { + hdmi->state = CONFIG_AUDIO; + } break; case CONFIG_VIDEO: hdmi->display = HDMI_DISABLE; -- 2.34.1