Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-02 17:47:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

video: sunxi: de2: fix SimpleFB node creation when HDMI not initialized

Browse source 
When HDMI is not initialized (e.g. no monitor is plugged), the current
SimpleFB code will still create a broken SimpleFB node.

Detect whether HDMI is initialized when creating SimpleFB node.

Fixes: be5b96f0e4 ("sunxi: setup simplefb for Allwinner DE2")
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Reviewed-by: Jagan Teki <jagan@openedev.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Icenowy Zheng 2017-11-01 22:18:06 +08:00 • committed by Jagan Teki
parent 43ede0bca7
commit 460b15adc9
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/video/sunxi/sunxi_de2.c
View file

@ -346,13 +346,19 @@ int sunxi_simplefb_setup(void *blob)
"sunxi_dw_hdmi", &hdmi); "sunxi_dw_hdmi", &hdmi);
if (ret) { if (ret) {
debug("HDMI not present\n"); debug("HDMI not present\n");
return 0; } else if (device_active(hdmi)) {
if (mux == 0)
pipeline = "mixer0-lcd0-hdmi";
else
pipeline = "mixer1-lcd1-hdmi";
} else {
debug("HDMI present but not probed\n");
} }
if (mux == 0) if (!pipeline) {
pipeline = "mixer0-lcd0-hdmi"; debug("No active display present\n");
else return 0;
pipeline = "mixer1-lcd1-hdmi"; }
de2_priv = dev_get_uclass_priv(de2); de2_priv = dev_get_uclass_priv(de2);
de2_plat = dev_get_uclass_platdata(de2); de2_plat = dev_get_uclass_platdata(de2);