1 From 382089f0bf8b49a6a560a778c54bfddc48cc0e5f Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Thu, 11 Nov 2021 13:33:25 +0000
4 Subject: [PATCH] overlays: vc4-kms-v3d: Change composite handling
6 On a Pi 4, enabling composite video disables the HDMI output. As a
7 consequence, the composite output is disabled by default. Change the
8 vc4-kms-v3d overlay used on older Pis to also disable composite by
9 default, replacing the "nocomposite" parameter with a "composite"
12 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
14 arch/arm/boot/dts/overlays/README | 4 ++--
15 arch/arm/boot/dts/overlays/upstream-overlay.dts | 2 +-
16 arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts | 4 ++--
17 3 files changed, 5 insertions(+), 5 deletions(-)
19 --- a/arch/arm/boot/dts/overlays/README
20 +++ b/arch/arm/boot/dts/overlays/README
21 @@ -3620,8 +3620,8 @@ Params: cma-512 CMA is 5
22 cma-default Use upstream's default value
23 audio Enable or disable audio over HDMI (default "on")
24 noaudio Disable all HDMI audio (default "off")
25 - nocomposite Disable the composite video output (default
27 + composite Enable the composite output (default "off")
28 + N.B. Disables all other outputs on a Pi 4.
32 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
33 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
35 -// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default dwc2-overlay.dts,dr_mode=otg
36 +// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default,composite dwc2-overlay.dts,dr_mode=otg
40 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
41 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
55 - nocomposite = <0>, "!11";
56 + composite = <0>, "=11";