From a7ee2c4ce853694d4dc9bb2d561d1d6b3080f8be Mon Sep 17 00:00:00 2001 From: Joy Cho Date: Fri, 28 Dec 2018 12:25:22 +0900 Subject: [PATCH] ODROID-N2: force to set default 1080p60hz with invalid vmode setting Change-Id: I9702b0e778532bf0f6fb8dcf477ef7c6d222e93c --- drivers/amlogic/media/vout/vout_serve/vout_serve.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/amlogic/media/vout/vout_serve/vout_serve.c b/drivers/amlogic/media/vout/vout_serve/vout_serve.c index 47cae404f91c..1e1a755898df 100644 --- a/drivers/amlogic/media/vout/vout_serve/vout_serve.c +++ b/drivers/amlogic/media/vout/vout_serve/vout_serve.c @@ -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 */