diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-16 23:40:32 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:11:22 +0200 |
| commit | 20ea6adbf199097c4f5f591ffee088340630dae4 (patch) | |
| tree | d6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0593-overlays-vc4-kms-v3d-Change-composite-handling.patch | |
| parent | bca05bd072180dc38ef740b37ded9572a6db1981 (diff) | |
| download | upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2 upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip | |
bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0593-overlays-vc4-kms-v3d-Change-composite-handling.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0593-overlays-vc4-kms-v3d-Change-composite-handling.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0593-overlays-vc4-kms-v3d-Change-composite-handling.patch b/target/linux/bcm27xx/patches-5.15/950-0593-overlays-vc4-kms-v3d-Change-composite-handling.patch new file mode 100644 index 0000000000..fdaf141056 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0593-overlays-vc4-kms-v3d-Change-composite-handling.patch @@ -0,0 +1,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"; + }; + }; |