Skip to content

Commit

Permalink
ARM: dts: vc4-kms-v3d: Always disable firmware HDMI
Browse files Browse the repository at this point in the history
BugLink: https://bugs.launchpad.net/bugs/1958146

Both the firmware audio driver and the vc4-kms-v3d driver are capable
of providing HDMI audio, but only one should be active at any time.
The vc4-kms-v3d overlays disable the firmware audio driver, but they
also have a noaudio parameter that as well as disabling the ARM-side
HDMI audio also re-enables the firmware HDMI audio. This is not
guaranteed to work and has been seen to break the display completely.

Modify the noaudio parameters so that the firmware HDMI audio support
remains disabled.

See: raspberrypi/linux#4651

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

(cherry picked from commit ffd529521113069a432cd5bd1b36b62ff814432f rpi-5.15.y)
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
  • Loading branch information
pelwell authored and juergh committed Jun 24, 2022
1 parent 2172eec commit 93db56d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
};

__overrides__ {
audio = <0>,"!13", <0>,"=14";
noaudio = <0>,"=13", <0>,"!14";
audio = <0>,"!13";
noaudio = <0>,"=13";
nocomposite = <0>, "!11";
};
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
__overrides__ {
audio = <0>,"!17";
audio1 = <0>,"!18";
noaudio = <0>,"=17", <0>,"=18", <0>,"!19";
noaudio = <0>,"=17", <0>,"=18";
composite = <0>, "!1",
<0>, "!2",
<0>, "!3",
Expand Down

0 comments on commit 93db56d

Please sign in to comment.