diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2014-12-24 19:47:14 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2015-01-14 14:56:39 +0100 |
| commit | b98d04803099c6e5eb4b73d80a17b1d2d8b7b9a9 (patch) | |
| tree | 8dc1d4dd35b0e20069c57e50f2c5f1e4f6a5d113 | |
| parent | 7398fd58e6370c8ab739e418eaad778d144516fb (diff) | |
| download | u-boot-imx-b98d04803099c6e5eb4b73d80a17b1d2d8b7b9a9.zip u-boot-imx-b98d04803099c6e5eb4b73d80a17b1d2d8b7b9a9.tar.gz u-boot-imx-b98d04803099c6e5eb4b73d80a17b1d2d8b7b9a9.tar.bz2 | |
sunxi: video: Remove sunxi_display.enabled variable
Having both a sunxi_display.enabled variable and
sunxi_display.monitor == sunxi_monitor_none duplicates state, use
sunxi_display.monitor = sunxi_monitor_none when ever we do not have a display.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
| -rw-r--r-- | drivers/video/sunxi_display.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index e01c8f5..0ce695c 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -34,7 +34,6 @@ enum sunxi_monitor { struct sunxi_display { GraphicDevice graphic_device; - bool enabled; enum sunxi_monitor monitor; unsigned int depth; } sunxi_display; @@ -838,6 +837,7 @@ void *video_hw_init(void) case sunxi_monitor_hdmi: #ifndef CONFIG_VIDEO_HDMI printf("HDMI/DVI not supported on this board\n"); + sunxi_display.monitor = sunxi_monitor_none; return NULL; #else /* Always call hdp_detect, as it also enables clocks, etc. */ @@ -853,8 +853,10 @@ void *video_hw_init(void) sunxi_hdmi_shutdown(); - if (lcd_mode[0] == 0) + if (lcd_mode[0] == 0) { + sunxi_display.monitor = sunxi_monitor_none; return NULL; /* No LCD, bail */ + } /* Fall back / through to LCD */ sunxi_display.monitor = sunxi_monitor_lcd; @@ -866,6 +868,7 @@ void *video_hw_init(void) break; } printf("LCD not supported on this board\n"); + sunxi_display.monitor = sunxi_monitor_none; return NULL; case sunxi_monitor_vga: #ifdef CONFIG_VIDEO_VGA_VIA_LCD @@ -873,6 +876,7 @@ void *video_hw_init(void) break; #else printf("VGA not supported on this board\n"); + sunxi_display.monitor = sunxi_monitor_none; return NULL; #endif } @@ -885,7 +889,6 @@ void *video_hw_init(void) mode->yres, sunxi_get_mon_desc(sunxi_display.monitor)); } - sunxi_display.enabled = true; sunxi_engines_init(); sunxi_mode_set(mode, gd->fb_base - CONFIG_SYS_SDRAM_BASE); @@ -913,9 +916,6 @@ int sunxi_simplefb_setup(void *blob) int offset, ret; const char *pipeline = NULL; - if (!sunxi_display.enabled) - return 0; - switch (sunxi_display.monitor) { case sunxi_monitor_none: return 0; |