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

Merge "ODROID-N2: vout: fix default display init option" into odroidn2-4.9.y-android

Browse Source
This commit is contained in:
Joy Cho
2019-02-13 11:56:51 +09:00
committed by Gerrit Code Review
parent 12dc36630f 606759b7e9
commit 4c752a48bb
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1096,6 +1096,10 @@ 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;
@@ -1107,7 +1111,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