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

Revert "ODROID-COMMON: media/vout: no use of 'vout=' for display resolution"

Browse Source 
This reverts commit 0665994b208cce865e0fde3e7da201694e421320.

Change-Id: I6ffe41a6acbdc38a738b9658bebced31de5e45bb
This commit is contained in:
Chris KIM
2019-03-15 12:05:38 +09:00
parent fdbe8aafb4
commit 31b5cfb6d7
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/amlogic/media/vout/vout_serve/vout_serve.c
View File

@@ -62,9 +62,7 @@ static char vout_mode_uboot[VMODE_NAME_LEN_MAX] __nosavedata;
static char vout_mode[VMODE_NAME_LEN_MAX] __nosavedata;
static char local_name[VMODE_NAME_LEN_MAX] = {0};
static u32 vout_init_vmode = VMODE_INIT_NULL;
#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
static int uboot_display;
#endif
static unsigned int bist_mode;
static char vout_axis[64] __nosavedata;
@@ -269,13 +267,6 @@ 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) {
@@ -295,10 +286,10 @@ static int set_vout_init_mode(void)
}
last_vmode = vout_init_vmode;
vmode = vout_init_vmode;
#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
vmode |= VMODE_INIT_BIT_MASK;
#endif
if (uboot_display)
vmode = vout_init_vmode | VMODE_INIT_BIT_MASK;
else
vmode = vout_init_vmode;
memset(local_name, 0, sizeof(local_name));
snprintf(local_name, VMODE_NAME_LEN_MAX, "%s", init_mode_str);
@@ -865,19 +856,21 @@ static int refresh_tvout_mode(void)
{
enum vmode_e cur_vmode = VMODE_MAX;
char cur_mode_str[VMODE_NAME_LEN_MAX];
int hpd_state;
int hpd_state = 0;
if (tvout_monitor_flag == 0)
return 0;
hpd_state = vout_get_hpd_state();
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
/* Unless CVBS cable is not attached, we assumed that HDMI cable is attached */
if (!cvbs_cable_connected())
hpd_state = 1;
/*
* vout mode is treated as HDMI always initialized
* even though HDMI cable is detached.
* TODO : except cvbs cable is plugged in.
*/
hpd_state = 1;
#else
hpd_state = vout_get_hpd_state();
#endif
if (hpd_state) {
cur_vmode = validate_vmode(hdmimode);
snprintf(cur_mode_str, VMODE_NAME_LEN_MAX, "%s", hdmimode);
@@ -1093,7 +1086,6 @@ static __exit void vout_exit_module(void)
subsys_initcall(vout_init_module);
module_exit(vout_exit_module);
#if !defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
static int str2lower(char *str)
{
while (*str != '\0') {
@@ -1166,7 +1158,6 @@ static int __init get_vout_init_mode(char *str)
return 0;
}
__setup("vout=", get_vout_init_mode);
#endif
static int __init get_hdmi_mode(char *str)
{