Skip to content

Commit 0588216

Browse files
njhollinghurstpopcornmix
authored andcommitted
overlays: vc4-kms-v3d-pi5 parameter "composite" no longer disables HDMI
Previously, if an HDMI display was connected at boot time when composite was enabled, the firmware FB would get "stuck" and a login console would not appear on either HDMI or composite. With the change, a console will now appear, typically (invariably?) on HDMI (just as happens with HDMI + DPI). This may be helpful when booting to CLI when composite was enabled accidentally and cannot be viewed. The old behaviour can be reinstated by adding the "nohdmi" option. Signed-off-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
1 parent 4ca5346 commit 0588216

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

arch/arm/boot/dts/overlays/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5827,8 +5827,8 @@ Params: cma-512 CMA is 512MB
58275827
audio1 Enable or disable audio over HDMI1 (default
58285828
"on")
58295829
noaudio Disable all HDMI audio (default "off")
5830-
composite Enable the composite output (disables all other
5831-
outputs)
5830+
composite Enable the composite output (default "off")
5831+
N.B. Disables all other outputs on a Pi 4.
58325832
nohdmi Disable both HDMI 0 & 1 outputs
58335833
nohdmi0 Disable HDMI 0 output
58345834
nohdmi1 Disable HDMI 1 output

arch/arm/boot/dts/overlays/vc4-kms-v3d-pi5-overlay.dts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,7 @@
134134
audio = <0>,"!14";
135135
audio1 = <0>,"!15";
136136
noaudio = <0>,"=14", <0>,"=15";
137-
composite = <0>, "!3",
138-
<0>, "!4",
139-
<0>, "!5",
140-
<0>, "!6",
141-
<0>, "!10",
142-
<0>, "!11",
143-
<&frag13>, "status";
137+
composite = <&frag13>, "status";
144138
nohdmi0 = <0>, "-3-5-10";
145139
nohdmi1 = <0>, "-4-6-11";
146140
nohdmi = <0>, "-3-4-5-6-10-11";

0 commit comments

Comments
 (0)