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 <[email protected]>

Author: njhollinghurst

arch/arm/boot/dts/overlays/README

@@ -5821,8 +5821,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

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

@@ -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";