raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

overlays: vc4-kms-v3d-pi5 parameter "composite" no longer disables HDMI

Browse Source 
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>
This commit is contained in:
Nick Hollinghurst
2025-11-19 17:51:59 +00:00
committed by Phil Elwell
parent 515f4d9372
commit 5f21287ef3
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/overlays/README
View File

@@ -5827,8 +5827,8 @@ Params: cma-512 CMA is 512MB
audio1 Enable or disable audio over HDMI1 (default
"on")
noaudio Disable all HDMI audio (default "off")
composite Enable the composite output (disables all other
outputs)
composite Enable the composite output (default "off")
N.B. Disables all other outputs on a Pi 4.
nohdmi Disable both HDMI 0 & 1 outputs
nohdmi0 Disable HDMI 0 output
nohdmi1 Disable HDMI 1 output

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

@@ -134,13 +134,7 @@
audio = <0>,"!14";
audio1 = <0>,"!15";
noaudio = <0>,"=14", <0>,"=15";
composite = <0>, "!3",
<0>, "!4",
<0>, "!5",
<0>, "!6",
<0>, "!10",
<0>, "!11",
<&frag13>, "status";
composite = <&frag13>, "status";
nohdmi0 = <0>, "-3-5-10";
nohdmi1 = <0>, "-4-6-11";
nohdmi = <0>, "-3-4-5-6-10-11";