V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

sunxi: display: change pipeline string for DE2 

DE2 do not have dedicated BE or FE.

Remove the "_be" suffix in the pipeline string of DE2.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
This commit is contained in:
Icenowy Zheng 2017-01-15 13:37:59 +08:00
parent 88cbcae366
commit d282076db0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/sunxi_display.c
View File

@ -1663,9 +1663,11 @@ int sunxi_simplefb_setup(void *blob)
const char *pipeline = NULL; const char *pipeline = NULL;
#ifdef CONFIG_MACH_SUN4I #ifdef CONFIG_MACH_SUN4I
#define PIPELINE_PREFIX "de_fe0-" #define PIPELINE_PREFIX "de_fe0-de_be0-"
#elif defined CONFIG_SUNXI_DE2
#define PIPELINE_PREFIX "de0-"
#else #else
#define PIPELINE_PREFIX #define PIPELINE_PREFIX "de_be0-"
#endif #endif
switch (sunxi_display.monitor) { switch (sunxi_display.monitor) {
@ -1673,16 +1675,16 @@ int sunxi_simplefb_setup(void *blob)
return 0; return 0;
case sunxi_monitor_dvi: case sunxi_monitor_dvi:
case sunxi_monitor_hdmi: case sunxi_monitor_hdmi:
pipeline = PIPELINE_PREFIX "de_be0-lcd0-hdmi"; pipeline = PIPELINE_PREFIX "lcd0-hdmi";
break; break;
case sunxi_monitor_lcd: case sunxi_monitor_lcd:
pipeline = PIPELINE_PREFIX "de_be0-lcd0"; pipeline = PIPELINE_PREFIX "lcd0";
break; break;
case sunxi_monitor_vga: case sunxi_monitor_vga:
#ifdef CONFIG_VIDEO_VGA #ifdef CONFIG_VIDEO_VGA
pipeline = PIPELINE_PREFIX "de_be0-lcd0-tve0"; pipeline = PIPELINE_PREFIX "lcd0-tve0";
#elif defined CONFIG_VIDEO_VGA_VIA_LCD #elif defined CONFIG_VIDEO_VGA_VIA_LCD
pipeline = PIPELINE_PREFIX "de_be0-lcd0"; pipeline = PIPELINE_PREFIX "lcd0";
#endif #endif
break; break;
case sunxi_monitor_composite_pal: case sunxi_monitor_composite_pal: