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

rk3288 hdmi: fix some tv have no display if switch resolution several times

Browse Source
This commit is contained in:
zwl
2014-06-26 11:33:24 +08:00
parent 39e5cf1b68
commit 6e577310c9
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
View File

@@ -63,7 +63,7 @@ static void rk3288_hdmi_set_pwr_mode(struct hdmi *hdmi_drv, int mode)
if (hdmi_drv->pwr_mode == mode)
return;
dev_printk(KERN_INFO, hdmi_drv->dev, "%s change pwr_mode %d --> %d\n",
hdmi_dbg(hdmi_drv->dev, "%s change pwr_mode %d --> %d\n",
__func__, hdmi_drv->pwr_mode, mode);
switch (mode) {
@@ -1045,8 +1045,6 @@ static int rk3288_hdmi_video_csc(struct hdmi *hdmi_drv,
int rk3288_hdmi_config_video(struct hdmi *hdmi_drv,
struct hdmi_video_para *vpara)
{
rk3288_hdmi_av_mute(hdmi_drv, 1);
if (rk3288_hdmi_video_forceOutput(hdmi_drv, 1) < 0)
return -1;
if (rk3288_hdmi_video_frameComposer(hdmi_drv, vpara) < 0)
@@ -1293,6 +1291,7 @@ void rk3288_hdmi_control_output(struct hdmi *hdmi_drv, int enable)
hdmi_dbg(hdmi_drv->dev, "[%s] %d\n", __func__, enable);
if (enable == 0) {
rk3288_hdmi_av_mute(hdmi_drv, 1);
rk3288_hdmi_set_pwr_mode(hdmi_drv, LOWER_PWR);
} else {
if (hdmi_drv->pwr_mode == LOWER_PWR)
rk3288_hdmi_set_pwr_mode(hdmi_drv, NORMAL);
@@ -1318,7 +1317,7 @@ int rk3288_hdmi_insert(struct hdmi *hdmi_drv)
int rk3288_hdmi_removed(struct hdmi *hdmi_drv)
{
rk3288_hdmi_set_pwr_mode(hdmi_drv, LOWER_PWR);
rk3288_hdmi_control_output(hdmi_drv, 0);
dev_printk(KERN_INFO, hdmi_drv->dev, "Removed.\n");
return 0;
}

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

@@ -235,9 +235,9 @@ void hdmi_work(struct work_struct *work)
}
break;
case SYSTEM_CONFIG:
#ifdef CONFIG_HDMI_RK616
hdmi->remove(hdmi);
#endif
if (hdmi->remove)
hdmi->remove(hdmi);
if (hdmi->autoconfig)
hdmi->vic = hdmi_find_best_mode(hdmi, 0);
else