From 20bf25501e645635f46382fd8411fd9e1c8f30ed Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Wed, 20 Feb 2019 15:03:40 +0900 Subject: [PATCH] Revert "ODROID-N2: vout: fix default display init option" This reverts commit 6a632040eb30a493c078fbb75bf9abe48a1f0329. Change-Id: I7e2a668320c0bb86e4821921482ca5dab4e041f6 (cherry picked from commit b2cbc17de9930c06ad8cf02d646c786399363502) --- drivers/amlogic/media/vout/vout_serve/vout_serve.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/amlogic/media/vout/vout_serve/vout_serve.c b/drivers/amlogic/media/vout/vout_serve/vout_serve.c index 8ff517cefd07..b6a3792adb15 100644 --- a/drivers/amlogic/media/vout/vout_serve/vout_serve.c +++ b/drivers/amlogic/media/vout/vout_serve/vout_serve.c @@ -1103,10 +1103,6 @@ static void vout_init_mode_parse(char *str) return; } -#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) - /* always do initialization */ - uboot_display = 0; -#else /* detect uboot display */ if (strncmp(str, "en", 2) == 0) { /* enable */ uboot_display = 1; @@ -1118,7 +1114,7 @@ static void vout_init_mode_parse(char *str) VOUTPR("%s: %d\n", str, uboot_display); return; } -#endif + /* * just save the vmode_name, * convert to vmode when vout sever registered