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

rk1000: Fix picture error when suspend and switch mode.

Browse Source 
Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
This commit is contained in:
Zheng Yang
2015-04-14 22:05:41 +08:00
parent da0c4bb9b0
commit 3db783a988
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/rockchip/tve/rk1000/rk1000_tve.c
View File

@@ -150,12 +150,12 @@ int rk1000_tv_standby(int type)
cvbs = rk1000_tve.cvbs->enable;
if (cvbs || ypbpr)
return 0;
val = 0x00;
/* val = 0x00;
ret = rk1000_control_write_block(0x03, &val, 1);
if (ret < 0) {
pr_err("rk1000_control_write_block err!\n");
return ret;
}
} */
val = 0x07;
ret = rk1000_tv_write_block(0x03, &val, 1);
if (ret < 0) {

8
drivers/video/rockchip/tve/rk1000/rk1000_tve_cvbs.c
View File

@@ -1,5 +1,6 @@
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/delay.h>
#include "rk1000_tve.h"
@@ -68,6 +69,8 @@ int rk1000_tv_pal_init(void)
static int rk1000_cvbs_set_enable(struct rk_display_device *device, int enable)
{
unsigned char val;
if (cvbs_monspecs.suspend)
return 0;
if ((cvbs_monspecs.enable != enable) ||
@@ -76,8 +79,13 @@ static int rk1000_cvbs_set_enable(struct rk_display_device *device, int enable)
cvbs_monspecs.enable = 0;
rk1000_tv_standby(RK1000_TVOUT_CVBS);
} else if (enable == 1) {
val = 0x07;
rk1000_tv_write_block(0x03, &val, 1);
rk1000_switch_fb(cvbs_monspecs.mode,
cvbs_monspecs.mode_set);
msleep(600);
val = 0x03;
rk1000_tv_write_block(0x03, &val, 1);
cvbs_monspecs.enable = 1;
}
}