dt-bindings: Document the dmas and dma-names properties for VC4 HDMI
Subsystems (6)
PATCH v2 1/3 dt-bindings: Document the dmas and dma-names properties for VC4 HDMI
From: Boris Brezillon <[email protected]>
These are optional, but necessary for HDMI audio support.
---
v2: no changes
Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt +3 -0
@@ -34,6 +34,9 @@ Optional properties for HDMI: - hpd-gpios: The GPIO pin for HDMI hotplug detect (if it doesn't appear as an interrupt/status bit in the HDMI controller itself). See bindings/pinctrl/brcm,bcm2835-gpio.txt +- dmas: Should contain one entry pointing to the DMA channel used to + transfer audio data +- dma-names: Should contain "audio-rx" Required properties for DPI: - compatible: Should be "brcm,bcm2835-dpi"
Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/3 drm/vc4: Add HDMI audio support
The HDMI encoder IP embeds all needed blocks to output audio, with a custom DAI called MAI moving audio between the two parts of the HDMI core. This driver now exposes a sound card to let users stream audio to their display.
Using the hdmi-codec driver has been considered here, but MAI meant having to significantly rework hdmi-codec, and it would have left little shared code with the I2S mode anyway.
The encoder requires that the audio be SPDIF-formatted frames only, which alsalib will format-convert for us.
This patch is the combined work of Eric Anholt (initial register setup with a separate dmaengine driver and using simple-audio-card) and Boris Brezillon (moving it all into HDMI, massive debug to get it actually working), and which Eric has the permission to release.
v2: Drop "-audio" from sound card name, since that's already implied
(suggestion by Boris)
--- drivers/gpu/drm/vc4/Kconfig | 4 + drivers/gpu/drm/vc4/vc4_hdmi.c | 494 ++++++++++++++++++++++++++++++++++++++++- drivers/gpu/drm/vc4/vc4_regs.h | 107 ++++++++- 3 files changed, 603 insertions(+), 2 deletions(-)
drivers/gpu/drm/vc4/Kconfig +4 -0
@@ -2,11 +2,15 @@ config DRM_VC4 tristate "Broadcom VC4 Graphics" depends on ARCH_BCM2835 || COMPILE_TEST depends on DRM + depends on SND && SND_SOC depends on COMMON_CLK select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER select DRM_GEM_CMA_HELPER select DRM_PANEL + select SND_PCM + select SND_PCM_ELD + select SND_SOC_GENERIC_DMAENGINE_PCM select DRM_MIPI_DSI help Choose this option if you have a system that has a Broadcom
drivers/gpu/drm/vc4/vc4_hdmi.c +493 -1
565 lines not on this page · raw message
drivers/gpu/drm/vc4/vc4_regs.h +106 -1
130 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 2/3] drm/vc4: Add HDMI audio support
Quoted 17 lines · On Mon, 27 Feb 2017 12:28:02 -0800 Eric Anholt <[email protected]> wrote:
The HDMI encoder IP embeds all needed blocks to output audio, with a custom DAI called MAI moving audio between the two parts of the HDMI core. This driver now exposes a sound card to let users stream audio to their display.
Using the hdmi-codec driver has been considered here, but MAI meant having to significantly rework hdmi-codec, and it would have left little shared code with the I2S mode anyway.
The encoder requires that the audio be SPDIF-formatted frames only, which alsalib will format-convert for us.
This patch is the combined work of Eric Anholt (initial register setup with a separate dmaengine driver and using simple-audio-card) and Boris Brezillon (moving it all into HDMI, massive debug to get it actually working), and which Eric has the permission to release.
Quoted 4 lines
v2: Drop "-audio" from sound card name, since that's already implied
(suggestion by Boris)Signed-off-by Eric Anholt <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 2/3] drm/vc4: Add HDMI audio support
In reply to Eric AnholtQuoted 12 lines · Eric Anholt
The HDMI encoder IP embeds all needed blocks to output audio, with a custom DAI called MAI moving audio between the two parts of the HDMI core. This driver now exposes a sound card to let users stream audio to their display.
Using the hdmi-codec driver has been considered here, but MAI meant having to significantly rework hdmi-codec, and it would have left little shared code with the I2S mode anyway.
The encoder requires that the audio be SPDIF-formatted frames only, which alsalib will format-convert for us.
Quoted 7 lines
This patch is the combined work of Eric Anholt (initial register setup with a separate dmaengine driver and using simple-audio-card) and Boris Brezillon (moving it all into HDMI, massive debug to get it actually working), and which Eric has the permission to release.
v2: Drop "-audio" from sound card name, since that's already implied
(suggestion by Boris)
On IRC, Mark Brown disclaimed responsibility for reviewing this code, so I've merged it to drm-misc-next.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/3 ARM: dts: bcm283x: Add HDMI audio related properties
In reply to Eric AnholtFrom: Boris Brezillon <[email protected]>
Add the dmas and dma-names properties to support HDMI audio.
---
v2: no changes
arch/arm/boot/dts/bcm283x.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/bcm283x.dtsi +2 -0
@@ -491,6 +491,8 @@ clocks = <&clocks BCM2835_PLLH_PIX>, <&clocks BCM2835_CLOCK_HSM>; clock-names = "pixel", "hdmi"; + dmas = <&dma 17>; + dma-names = "audio-rx"; status = "disabled"; };
Signature · 6 lines
2.11.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel