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

Merge "ODROID-N2: force to set default 1080p60hz with invalid vmode setting" into odroidn2-4.9.y

Browse Source
This commit is contained in:
Joy Cho
2019-01-09 17:24:16 +09:00
committed by Gerrit Code Review
parent 9f1f7d4607 c6e59eaa04
commit bdef050b1c
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,12 +270,19 @@ static int set_vout_init_mode(void)
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",
vout_mode_uboot);
snprintf(init_mode_str, VMODE_NAME_LEN_MAX, "%s", "1080p60hz");
vout_init_vmode = validate_vmode("1080p60hz");
#else
VOUTERR("no matched vout_init mode %s, force to invalid\n",
vout_mode_uboot);
nulldisp_index = 1;
vout_init_vmode = nulldisp_vinfo[nulldisp_index].mode;
snprintf(init_mode_str, VMODE_NAME_LEN_MAX, "%s",
nulldisp_vinfo[nulldisp_index].name);
#endif
}
last_vmode = vout_init_vmode;
@@ -872,12 +879,19 @@ static int refresh_tvout_mode(void)
snprintf(cur_mode_str, VMODE_NAME_LEN_MAX, "%s", cvbsmode);
}
if (cur_vmode >= VMODE_MAX) {
#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON)
VOUTERR("%s: no matched vmode: %s, force to set 1080p60hz\n",
__func__, cur_mode_str);
cur_vmode = validate_vmode("1080p60hz");
snprintf(cur_mode_str, VMODE_NAME_LEN_MAX, "%s", "1080p60hz");
#else
VOUTERR("%s: no matched cur_mode: %s, force to invalid\n",
__func__, cur_mode_str);
nulldisp_index = 1;
cur_vmode = nulldisp_vinfo[nulldisp_index].mode;
snprintf(cur_mode_str, VMODE_NAME_LEN_MAX, "%s",
nulldisp_vinfo[nulldisp_index].name);
#endif
}
/* not box platform */