1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From 382089f0bf8b49a6a560a778c54bfddc48cc0e5f Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Thu, 11 Nov 2021 13:33:25 +0000
Subject: [PATCH] overlays: vc4-kms-v3d: Change composite handling
On a Pi 4, enabling composite video disables the HDMI output. As a
consequence, the composite output is disabled by default. Change the
vc4-kms-v3d overlay used on older Pis to also disable composite by
default, replacing the "nocomposite" parameter with a "composite"
parameter.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
arch/arm/boot/dts/overlays/README | 4 ++--
arch/arm/boot/dts/overlays/upstream-overlay.dts | 2 +-
arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
--- a/arch/arm/boot/dts/overlays/README
+++ b/arch/arm/boot/dts/overlays/README
@@ -3620,8 +3620,8 @@ Params: cma-512 CMA is 5
cma-default Use upstream's default value
audio Enable or disable audio over HDMI (default "on")
noaudio Disable all HDMI audio (default "off")
- nocomposite Disable the composite video output (default
- "off")
+ composite Enable the composite output (default "off")
+ N.B. Disables all other outputs on a Pi 4.
Name: vc4-kms-v3d-pi4
--- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
+++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
@@ -1,4 +1,4 @@
-// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default dwc2-overlay.dts,dr_mode=otg
+// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-default,composite dwc2-overlay.dts,dr_mode=otg
/dts-v1/;
/plugin/;
--- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
+++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
@@ -89,7 +89,7 @@
fragment@11 {
target = <&vec>;
- __overlay__ {
+ __dormant__ {
status = "okay";
};
};
@@ -118,6 +118,6 @@
__overrides__ {
audio = <0>,"!13";
noaudio = <0>,"=13";
- nocomposite = <0>, "!11";
+ composite = <0>, "=11";
};
};
|
