vout: vout_serve: Set default vmode and initial state

Change-Id: I29d62c0cefcbd961605d4a63cf9fd47d2932a37e
This commit is contained in:
Joy Cho
2019-12-27 13:52:37 +09:00
committed by Chris KIM
parent 394a4550a4
commit e6ca16d999

View File

@@ -281,8 +281,17 @@ static int set_vout_init_mode(void)
char init_mode_str[VMODE_NAME_LEN_MAX];
int ret = 0;
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
strncpy(vout_mode_uboot,
(vout_get_hpd_state() || !cvbs_cable_connected()) ?
hdmimode : cvbsmode,
sizeof(vout_mode_uboot));
#endif
snprintf(init_mode_str, VMODE_NAME_LEN_MAX, "%s", vout_mode_uboot);
vout_init_vmode = validate_vmode(vout_mode_uboot);
if (vout_init_vmode >= VMODE_MAX) {
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
VOUTERR("no matched vout mode %s, force to set 1080p60hz\n",
@@ -300,9 +309,11 @@ static int set_vout_init_mode(void)
}
last_vmode = vout_init_vmode;
#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
if (uboot_display)
vmode = vout_init_vmode | VMODE_INIT_BIT_MASK;
else
#endif
vmode = vout_init_vmode;
memset(local_name, 0, sizeof(local_name));