* [PATCH v4 0/3] drm: xlnx: zynqmp: Add DP audio support
@ 2024-10-23 11:52 Tomi Valkeinen
2024-10-23 11:52 ` [PATCH v4 1/3] dt-bindings: display/xlnx/zynqmp-dpsub: Add audio DMAs Tomi Valkeinen
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Tomi Valkeinen @ 2024-10-23 11:52 UTC (permalink / raw)
To: Lars-Peter Clausen, Jaroslav Kysela, Takashi Iwai, Liam Girdwood,
Mark Brown, Laurent Pinchart, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Michal Simek, Krzysztof Kozlowski, Simona Vetter
Cc: linux-sound, linux-kernel, dri-devel, devicetree,
linux-arm-kernel, Vishal Sagar, Anatoliy Klymenko,
Péter Ujfalusi, Markus Elfring, Tomi Valkeinen,
Rob Herring (Arm)
Add DisplayPort audio support for Xilinx ZynqMP platforms.
The current DT is, for some reason, missing the DMA channels for the
audio. This series adds that to the bindings and the dts file, but to
support older dtb files without the audio DMA, the driver will not fail
if the audio DMA is missing, but will just mark the audio support as
disabled.
To: Lars-Peter Clausen <lars@metafoo.de>
To: Jaroslav Kysela <perex@perex.cz>
To: Takashi Iwai <tiwai@suse.com>
To: Liam Girdwood <lgirdwood@gmail.com>
To: Mark Brown <broonie@kernel.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Maxime Ripard <mripard@kernel.org>
To: Thomas Zimmermann <tzimmermann@suse.de>
To: David Airlie <airlied@gmail.com>
To: Daniel Vetter <daniel@ffwll.ch>
To: Rob Herring <robh+dt@kernel.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
To: Conor Dooley <conor+dt@kernel.org>
To: Michal Simek <michal.simek@amd.com>
To: Krzysztof Kozlowski <krzk+dt@kernel.org>
Cc: linux-sound@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Vishal Sagar <vishal.sagar@amd.com>
Cc: Anatoliy Klymenko <anatoliy.klymenko@amd.com>
Cc: Péter Ujfalusi <peter.ujfalusi@gmail.com>
Cc: Markus Elfring <Markus.Elfring@web.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Changes in v4:
- Update copyright year
- Use guard(mutex) in the zynqmp_dp_audio.c
- Add Rb and Ab tags
- Link to v3: https://lore.kernel.org/r/20240910-xilinx-dp-audio-v3-0-75560793f4d0@ideasonboard.com
Changes in v3:
- Expand the description in "dt-bindings: display/xlnx/zynqmp-dpsub: Add
audio DMAs" to be more clear about the DT binding change.
- Rebased on top of current upstream
- Link to v2: https://lore.kernel.org/r/20240319-xilinx-dp-audio-v2-0-92d6d3a7ca7e@ideasonboard.com
Changes in v2:
- Fix a missing double-quote in the DT binding
- Link to v1: https://lore.kernel.org/r/20240312-xilinx-dp-audio-v1-0-696c79facbb9@ideasonboard.com
---
Tomi Valkeinen (3):
dt-bindings: display/xlnx/zynqmp-dpsub: Add audio DMAs
arm64: dts: zynqmp: Add DMA for DP audio
drm: xlnx: zynqmp_dpsub: Add DP audio support
.../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 10 +-
arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 7 +-
drivers/gpu/drm/xlnx/Kconfig | 9 +
drivers/gpu/drm/xlnx/Makefile | 1 +
drivers/gpu/drm/xlnx/zynqmp_disp.c | 48 ---
drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 7 +-
drivers/gpu/drm/xlnx/zynqmp_dp.c | 54 ++-
drivers/gpu/drm/xlnx/zynqmp_dp.h | 7 +
drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 447 +++++++++++++++++++++
drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 39 +-
drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 15 +-
11 files changed, 539 insertions(+), 105 deletions(-)
---
base-commit: 42f7652d3eb527d03665b09edac47f85fb600924
change-id: 20240312-xilinx-dp-audio-468ad12f9f64
Best regards,
--
Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v4 1/3] dt-bindings: display/xlnx/zynqmp-dpsub: Add audio DMAs 2024-10-23 11:52 [PATCH v4 0/3] drm: xlnx: zynqmp: Add DP audio support Tomi Valkeinen @ 2024-10-23 11:52 ` Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 2/3] arm64: dts: zynqmp: Add DMA for DP audio Tomi Valkeinen ` (2 subsequent siblings) 3 siblings, 0 replies; 6+ messages in thread From: Tomi Valkeinen @ 2024-10-23 11:52 UTC (permalink / raw) To: Lars-Peter Clausen, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Laurent Pinchart, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Michal Simek, Krzysztof Kozlowski, Simona Vetter Cc: linux-sound, linux-kernel, dri-devel, devicetree, linux-arm-kernel, Vishal Sagar, Anatoliy Klymenko, Péter Ujfalusi, Markus Elfring, Tomi Valkeinen, Rob Herring (Arm) The DP subsystem for ZynqMP supports audio via two channels, and the DP DMA has dma-engines for those channels. For some reason the DT binding has not specified those channels, even if the picture included in xlnx,zynqmp-dpsub.yaml shows "2 x aud" DMAs. This hasn't caused any issues as the drivers have not supported audio, and has thus gone unnoticed. To make it possible to add the audio support to the driver, add the two audio DMAs to the binding. While strictly speaking this is an ABI break, there should be no regressions caused by this as we're adding new entries at the end of the dmas list, and, after the audio support has been added in "arm64: dts: zynqmp: Add DMA for DP audio", the driver will treat the audio DMAs as optional to also support the old bindings. Reviewed-by: Rob Herring (Arm) <robh@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> --- .../devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml index 554f9d5809d4..6b754d4f260e 100644 --- a/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml +++ b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml @@ -100,12 +100,16 @@ properties: - description: Video layer, plane 1 (U/V or U) - description: Video layer, plane 2 (V) - description: Graphics layer + - description: Audio channel 0 + - description: Audio channel 1 dma-names: items: - const: vid0 - const: vid1 - const: vid2 - const: gfx0 + - const: aud0 + - const: aud1 phys: description: PHYs for the DP data lanes @@ -194,11 +198,13 @@ examples: power-domains = <&pd_dp>; resets = <&reset ZYNQMP_RESET_DP>; - dma-names = "vid0", "vid1", "vid2", "gfx0"; + dma-names = "vid0", "vid1", "vid2", "gfx0", "aud0", "aud1"; dmas = <&xlnx_dpdma 0>, <&xlnx_dpdma 1>, <&xlnx_dpdma 2>, - <&xlnx_dpdma 3>; + <&xlnx_dpdma 3>, + <&xlnx_dpdma 4>, + <&xlnx_dpdma 5>; phys = <&psgtr 1 PHY_TYPE_DP 0 3>, <&psgtr 0 PHY_TYPE_DP 1 3>; -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 2/3] arm64: dts: zynqmp: Add DMA for DP audio 2024-10-23 11:52 [PATCH v4 0/3] drm: xlnx: zynqmp: Add DP audio support Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 1/3] dt-bindings: display/xlnx/zynqmp-dpsub: Add audio DMAs Tomi Valkeinen @ 2024-10-23 11:52 ` Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 3/3] drm: xlnx: zynqmp_dpsub: Add DP audio support Tomi Valkeinen 2024-12-19 6:58 ` [PATCH v4 0/3] drm: xlnx: zynqmp: " Tomi Valkeinen 3 siblings, 0 replies; 6+ messages in thread From: Tomi Valkeinen @ 2024-10-23 11:52 UTC (permalink / raw) To: Lars-Peter Clausen, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Laurent Pinchart, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Michal Simek, Krzysztof Kozlowski, Simona Vetter Cc: linux-sound, linux-kernel, dri-devel, devicetree, linux-arm-kernel, Vishal Sagar, Anatoliy Klymenko, Péter Ujfalusi, Markus Elfring, Tomi Valkeinen Add the two DMA channels used for the DisplayPort audio to the zynqmp_dpsub node. Acked-by: Michal Simek <michal.simek@amd.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index b1b31dcf6291..673ca8422e6b 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -1207,11 +1207,14 @@ zynqmp_dpsub: display@fd4a0000 { "dp_vtc_pixel_clk_in"; power-domains = <&zynqmp_firmware PD_DP>; resets = <&zynqmp_reset ZYNQMP_RESET_DP>; - dma-names = "vid0", "vid1", "vid2", "gfx0"; + dma-names = "vid0", "vid1", "vid2", "gfx0", + "aud0", "aud1"; dmas = <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO0>, <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO1>, <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO2>, - <&zynqmp_dpdma ZYNQMP_DPDMA_GRAPHICS>; + <&zynqmp_dpdma ZYNQMP_DPDMA_GRAPHICS>, + <&zynqmp_dpdma ZYNQMP_DPDMA_AUDIO0>, + <&zynqmp_dpdma ZYNQMP_DPDMA_AUDIO1>; ports { #address-cells = <1>; -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v4 3/3] drm: xlnx: zynqmp_dpsub: Add DP audio support 2024-10-23 11:52 [PATCH v4 0/3] drm: xlnx: zynqmp: Add DP audio support Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 1/3] dt-bindings: display/xlnx/zynqmp-dpsub: Add audio DMAs Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 2/3] arm64: dts: zynqmp: Add DMA for DP audio Tomi Valkeinen @ 2024-10-23 11:52 ` Tomi Valkeinen 2024-12-18 15:57 ` Sagar, Vishal 2024-12-19 6:58 ` [PATCH v4 0/3] drm: xlnx: zynqmp: " Tomi Valkeinen 3 siblings, 1 reply; 6+ messages in thread From: Tomi Valkeinen @ 2024-10-23 11:52 UTC (permalink / raw) To: Lars-Peter Clausen, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Laurent Pinchart, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Michal Simek, Krzysztof Kozlowski, Simona Vetter Cc: linux-sound, linux-kernel, dri-devel, devicetree, linux-arm-kernel, Vishal Sagar, Anatoliy Klymenko, Péter Ujfalusi, Markus Elfring, Tomi Valkeinen Add basic DisplayPort audio support. Support non-live audio playback from two PCMs (DMA channels), and the volume control in the audio mixer. As older dtb files may not have the audio DMA channels defined, the driver will just mark the audio support as disabled if the audio DMA is missing, and will continue with only display support. Note: Reset doesn't seem to work (ZYNQMP_DISP_AUD_SOFT_RESET). If we do a reset, audio playback won't start again even if, afaics, we do set up all the necessary registers. So, at the moment, resetting the audio block in dp_dai_hw_free() is commented out. Tested-by: Anatoliy Klymenko <anatoliy.klymenko@amd.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> --- drivers/gpu/drm/xlnx/Kconfig | 9 + drivers/gpu/drm/xlnx/Makefile | 1 + drivers/gpu/drm/xlnx/zynqmp_disp.c | 48 ---- drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 7 +- drivers/gpu/drm/xlnx/zynqmp_dp.c | 54 ++-- drivers/gpu/drm/xlnx/zynqmp_dp.h | 7 + drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 447 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 39 +-- drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 15 +- 9 files changed, 526 insertions(+), 101 deletions(-) diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig index 626e5ac4c33d..ecd7be347300 100644 --- a/drivers/gpu/drm/xlnx/Kconfig +++ b/drivers/gpu/drm/xlnx/Kconfig @@ -16,3 +16,12 @@ config DRM_ZYNQMP_DPSUB This is a DRM/KMS driver for ZynqMP DisplayPort controller. Choose this option if you have a Xilinx ZynqMP SoC with DisplayPort subsystem. + +config DRM_ZYNQMP_DPSUB_AUDIO + bool "ZynqMP DisplayPort Audio Support" + depends on DRM_ZYNQMP_DPSUB + depends on SND && SND_SOC + select SND_SOC_GENERIC_DMAENGINE_PCM + help + Choose this option to enable DisplayPort audio support in the ZynqMP + DisplayPort driver. diff --git a/drivers/gpu/drm/xlnx/Makefile b/drivers/gpu/drm/xlnx/Makefile index ea1422a39502..ab6e2ffd7e8d 100644 --- a/drivers/gpu/drm/xlnx/Makefile +++ b/drivers/gpu/drm/xlnx/Makefile @@ -1,2 +1,3 @@ zynqmp-dpsub-y := zynqmp_disp.o zynqmp_dpsub.o zynqmp_dp.o zynqmp_kms.o +zynqmp-dpsub-$(CONFIG_DRM_ZYNQMP_DPSUB_AUDIO) += zynqmp_dp_audio.o obj-$(CONFIG_DRM_ZYNQMP_DPSUB) += zynqmp-dpsub.o diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index 9368acf56eaf..77dc485c0887 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -143,7 +143,6 @@ struct zynqmp_disp_layer { * @dpsub: Display subsystem * @blend: Register I/O base address for the blender * @avbuf: Register I/O base address for the audio/video buffer manager - * @audio: Registers I/O base address for the audio mixer * @layers: Layers (planes) */ struct zynqmp_disp { @@ -152,7 +151,6 @@ struct zynqmp_disp { void __iomem *blend; void __iomem *avbuf; - void __iomem *audio; struct zynqmp_disp_layer layers[ZYNQMP_DPSUB_NUM_LAYERS]; }; @@ -865,42 +863,6 @@ static void zynqmp_disp_blend_layer_disable(struct zynqmp_disp *disp, csc_zero_offsets); } -/* ----------------------------------------------------------------------------- - * Audio Mixer - */ - -static void zynqmp_disp_audio_write(struct zynqmp_disp *disp, int reg, u32 val) -{ - writel(val, disp->audio + reg); -} - -/** - * zynqmp_disp_audio_enable - Enable the audio mixer - * @disp: Display controller - * - * Enable the audio mixer by de-asserting the soft reset. The audio state is set to - * default values by the reset, set the default mixer volume explicitly. - */ -static void zynqmp_disp_audio_enable(struct zynqmp_disp *disp) -{ - /* Clear the audio soft reset register as it's an non-reset flop. */ - zynqmp_disp_audio_write(disp, ZYNQMP_DISP_AUD_SOFT_RESET, 0); - zynqmp_disp_audio_write(disp, ZYNQMP_DISP_AUD_MIXER_VOLUME, - ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE); -} - -/** - * zynqmp_disp_audio_disable - Disable the audio mixer - * @disp: Display controller - * - * Disable the audio mixer by asserting its soft reset. - */ -static void zynqmp_disp_audio_disable(struct zynqmp_disp *disp) -{ - zynqmp_disp_audio_write(disp, ZYNQMP_DISP_AUD_SOFT_RESET, - ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST); -} - /* ----------------------------------------------------------------------------- * ZynqMP Display Layer & DRM Plane */ @@ -1338,8 +1300,6 @@ void zynqmp_disp_enable(struct zynqmp_disp *disp) disp->dpsub->vid_clk_from_ps); zynqmp_disp_avbuf_enable_channels(disp); zynqmp_disp_avbuf_enable_audio(disp); - - zynqmp_disp_audio_enable(disp); } /** @@ -1348,8 +1308,6 @@ void zynqmp_disp_enable(struct zynqmp_disp *disp) */ void zynqmp_disp_disable(struct zynqmp_disp *disp) { - zynqmp_disp_audio_disable(disp); - zynqmp_disp_avbuf_disable_audio(disp); zynqmp_disp_avbuf_disable_channels(disp); zynqmp_disp_avbuf_disable(disp); @@ -1418,12 +1376,6 @@ int zynqmp_disp_probe(struct zynqmp_dpsub *dpsub) goto error; } - disp->audio = devm_platform_ioremap_resource_byname(pdev, "aud"); - if (IS_ERR(disp->audio)) { - ret = PTR_ERR(disp->audio); - goto error; - } - ret = zynqmp_disp_create_layers(disp); if (ret) goto error; diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h index fa3935384834..9a4ff094e276 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h +++ b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h @@ -177,12 +177,7 @@ #define ZYNQMP_DISP_AUD_MIXER_VOLUME 0x0 #define ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE 0x20002000 #define ZYNQMP_DISP_AUD_MIXER_META_DATA 0x4 -#define ZYNQMP_DISP_AUD_CH_STATUS0 0x8 -#define ZYNQMP_DISP_AUD_CH_STATUS1 0xc -#define ZYNQMP_DISP_AUD_CH_STATUS2 0x10 -#define ZYNQMP_DISP_AUD_CH_STATUS3 0x14 -#define ZYNQMP_DISP_AUD_CH_STATUS4 0x18 -#define ZYNQMP_DISP_AUD_CH_STATUS5 0x1c +#define ZYNQMP_DISP_AUD_CH_STATUS(x) (0x8 + ((x) * 4)) #define ZYNQMP_DISP_AUD_CH_A_DATA0 0x20 #define ZYNQMP_DISP_AUD_CH_A_DATA1 0x24 #define ZYNQMP_DISP_AUD_CH_A_DATA2 0x28 diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c index 129beac4c073..af1b4b104067 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -1221,7 +1221,6 @@ static void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, { u8 lane_cnt = dp->mode.lane_cnt; u32 reg, wpl; - unsigned int rate; zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_HTOTAL, mode->htotal); zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_VTOTAL, mode->vtotal); @@ -1246,18 +1245,8 @@ static void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, reg = drm_dp_bw_code_to_link_rate(dp->mode.bw_code); zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_N_VID, reg); zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_M_VID, mode->clock); - rate = zynqmp_dpsub_get_audio_clk_rate(dp->dpsub); - if (rate) { - dev_dbg(dp->dev, "Audio rate: %d\n", rate / 512); - zynqmp_dp_write(dp, ZYNQMP_DP_TX_N_AUD, reg); - zynqmp_dp_write(dp, ZYNQMP_DP_TX_M_AUD, rate / 1000); - } } - /* Only 2 channel audio is supported now */ - if (zynqmp_dpsub_audio_enabled(dp->dpsub)) - zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CHANNELS, 1); - zynqmp_dp_write(dp, ZYNQMP_DP_USER_PIX_WIDTH, 1); /* Translate to the native 16 bit datapath based on IP core spec */ @@ -1266,6 +1255,44 @@ static void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, zynqmp_dp_write(dp, ZYNQMP_DP_USER_DATA_COUNT_PER_LANE, reg); } +/* ----------------------------------------------------------------------------- + * Audio + */ + +void zynqmp_dp_audio_set_channels(struct zynqmp_dp *dp, + unsigned int num_channels) +{ + zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CHANNELS, num_channels - 1); +} + +void zynqmp_dp_audio_enable(struct zynqmp_dp *dp) +{ + zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 1); +} + +void zynqmp_dp_audio_disable(struct zynqmp_dp *dp) +{ + zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 0); +} + +void zynqmp_dp_audio_write_n_m(struct zynqmp_dp *dp) +{ + unsigned int rate; + u32 link_rate; + + if (!(dp->config.misc0 & ZYNQMP_DP_MAIN_STREAM_MISC0_SYNC_LOCK)) + return; + + link_rate = drm_dp_bw_code_to_link_rate(dp->mode.bw_code); + + rate = clk_get_rate(dp->dpsub->aud_clk); + + dev_dbg(dp->dev, "Audio rate: %d\n", rate / 512); + + zynqmp_dp_write(dp, ZYNQMP_DP_TX_N_AUD, link_rate); + zynqmp_dp_write(dp, ZYNQMP_DP_TX_M_AUD, rate / 1000); +} + /* ----------------------------------------------------------------------------- * DISP Configuration */ @@ -1453,8 +1480,7 @@ static void zynqmp_dp_bridge_atomic_enable(struct drm_bridge *bridge, /* Enable the encoder */ dp->enabled = true; zynqmp_dp_update_misc(dp); - if (zynqmp_dpsub_audio_enabled(dp->dpsub)) - zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 1); + zynqmp_dp_write(dp, ZYNQMP_DP_TX_PHY_POWER_DOWN, 0); if (dp->status == connector_status_connected) { for (i = 0; i < 3; i++) { @@ -1487,8 +1513,6 @@ static void zynqmp_dp_bridge_atomic_disable(struct drm_bridge *bridge, drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, DP_SET_POWER_D3); zynqmp_dp_write(dp, ZYNQMP_DP_TX_PHY_POWER_DOWN, ZYNQMP_DP_TX_PHY_POWER_DOWN_ALL); - if (zynqmp_dpsub_audio_enabled(dp->dpsub)) - zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 0); zynqmp_dp_disp_disable(dp, old_bridge_state); diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.h b/drivers/gpu/drm/xlnx/zynqmp_dp.h index f077d7fbd0ad..a3257793e23a 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dp.h +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.h @@ -22,4 +22,11 @@ void zynqmp_dp_disable_vblank(struct zynqmp_dp *dp); int zynqmp_dp_probe(struct zynqmp_dpsub *dpsub); void zynqmp_dp_remove(struct zynqmp_dpsub *dpsub); +void zynqmp_dp_audio_set_channels(struct zynqmp_dp *dp, + unsigned int num_channels); +void zynqmp_dp_audio_enable(struct zynqmp_dp *dp); +void zynqmp_dp_audio_disable(struct zynqmp_dp *dp); + +void zynqmp_dp_audio_write_n_m(struct zynqmp_dp *dp); + #endif /* _ZYNQMP_DP_H_ */ diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c new file mode 100644 index 000000000000..fa5f0ace6084 --- /dev/null +++ b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c @@ -0,0 +1,447 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ZynqMP DisplayPort Subsystem Driver - Audio support + * + * Copyright (C) 2015 - 2024 Xilinx, Inc. + * + * Authors: + * - Hyun Woo Kwon <hyun.kwon@xilinx.com> + * - Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> + */ + +#include <linux/clk.h> +#include <linux/device.h> +#include <linux/mutex.h> +#include <linux/pm_runtime.h> + +#include <sound/asoundef.h> +#include <sound/core.h> +#include <sound/dmaengine_pcm.h> +#include <sound/initval.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/tlv.h> + +#include "zynqmp_disp_regs.h" +#include "zynqmp_dp.h" +#include "zynqmp_dpsub.h" + +#define ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK 512 +#define ZYNQMP_NUM_PCMS 2 + +struct zynqmp_dpsub_audio { + void __iomem *base; + + struct snd_soc_card card; + + const char *dai_name; + const char *link_names[ZYNQMP_NUM_PCMS]; + const char *pcm_names[ZYNQMP_NUM_PCMS]; + + struct snd_soc_dai_driver dai_driver; + struct snd_dmaengine_pcm_config pcm_configs[2]; + + struct snd_soc_dai_link links[ZYNQMP_NUM_PCMS]; + + struct { + struct snd_soc_dai_link_component cpu; + struct snd_soc_dai_link_component codec; + struct snd_soc_dai_link_component platform; + } components[ZYNQMP_NUM_PCMS]; + + /* + * Protects: + * - enabled_streams + * - volumes + * - current_rate + */ + struct mutex enable_lock; + + u32 enabled_streams; + u32 current_rate; + + u16 volumes[2]; +}; + +static const struct snd_pcm_hardware zynqmp_dp_pcm_hw = { + .info = SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_PAUSE | + SNDRV_PCM_INFO_RESUME | + SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, + + .buffer_bytes_max = 128 * 1024, + .period_bytes_min = 256, + .period_bytes_max = 1024 * 1024, + .periods_min = 2, + .periods_max = 256, +}; + +static int zynqmp_dp_startup(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, + 256); + + return 0; +} + +static const struct snd_soc_ops zynqmp_dp_ops = { + .startup = zynqmp_dp_startup, +}; + +static void zynqmp_dp_audio_write(struct zynqmp_dpsub_audio *audio, int reg, + u32 val) +{ + writel(val, audio->base + reg); +} + +static int dp_dai_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *socdai) +{ + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct zynqmp_dpsub *dpsub = + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); + struct zynqmp_dpsub_audio *audio = dpsub->audio; + int ret; + u32 sample_rate; + struct snd_aes_iec958 iec = { 0 }; + unsigned long rate; + + sample_rate = params_rate(params); + + if (sample_rate != 48000 && sample_rate != 44100) + return -EINVAL; + + guard(mutex)(&audio->enable_lock); + + if (audio->enabled_streams && audio->current_rate != sample_rate) { + dev_err(dpsub->dev, + "Can't change rate while playback enabled\n"); + return -EINVAL; + } + + if (audio->enabled_streams > 0) { + /* Nothing to do */ + audio->enabled_streams++; + return 0; + } + + audio->current_rate = sample_rate; + + /* Note: clock rate can only be changed if the clock is disabled */ + ret = clk_set_rate(dpsub->aud_clk, + sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK); + if (ret) { + dev_err(dpsub->dev, "can't set aud_clk to %u err:%d\n", + sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK, ret); + return ret; + } + + clk_prepare_enable(dpsub->aud_clk); + + rate = clk_get_rate(dpsub->aud_clk); + + /* Ignore some offset +- 10 */ + if (abs(sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK - rate) > 10) { + dev_err(dpsub->dev, "aud_clk offset is higher: %ld\n", + sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK - rate); + clk_disable_unprepare(dpsub->aud_clk); + return -EINVAL; + } + + pm_runtime_get_sync(dpsub->dev); + + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_MIXER_VOLUME, + audio->volumes[0] | (audio->volumes[1] << 16)); + + /* Clear the audio soft reset register as it's an non-reset flop. */ + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_SOFT_RESET, 0); + + /* Only 2 channel audio is supported now */ + zynqmp_dp_audio_set_channels(dpsub->dp, 2); + + zynqmp_dp_audio_write_n_m(dpsub->dp); + + /* Channel status */ + + if (sample_rate == 48000) + iec.status[3] = IEC958_AES3_CON_FS_48000; + else + iec.status[3] = IEC958_AES3_CON_FS_44100; + + for (unsigned int i = 0; i < AES_IEC958_STATUS_SIZE / 4; ++i) { + u32 v; + + v = (iec.status[(i * 4) + 0] << 0) | + (iec.status[(i * 4) + 1] << 8) | + (iec.status[(i * 4) + 2] << 16) | + (iec.status[(i * 4) + 3] << 24); + + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_CH_STATUS(i), v); + } + + zynqmp_dp_audio_enable(dpsub->dp); + + audio->enabled_streams++; + + return 0; +} + +static int dp_dai_hw_free(struct snd_pcm_substream *substream, + struct snd_soc_dai *socdai) +{ + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct zynqmp_dpsub *dpsub = + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); + struct zynqmp_dpsub_audio *audio = dpsub->audio; + + guard(mutex)(&audio->enable_lock); + + /* Nothing to do */ + if (audio->enabled_streams > 1) { + audio->enabled_streams--; + return 0; + } + + pm_runtime_put(dpsub->dev); + + zynqmp_dp_audio_disable(dpsub->dp); + + /* + * Reset doesn't work. If we assert reset between audio stop and start, + * the audio won't start anymore. Probably we are missing writing + * some audio related registers. A/B buf? + */ + /* + zynqmp_disp_audio_write(audio, ZYNQMP_DISP_AUD_SOFT_RESET, + ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST); + */ + + clk_disable_unprepare(dpsub->aud_clk); + + audio->current_rate = 0; + audio->enabled_streams--; + + return 0; +} + +static const struct snd_soc_dai_ops zynqmp_dp_dai_ops = { + .hw_params = dp_dai_hw_params, + .hw_free = dp_dai_hw_free, +}; + +/* + * Min = 10 * log10(0x1 / 0x2000) = -39.13 + * Max = 10 * log10(0xffffff / 0x2000) = 9.03 + */ +static const DECLARE_TLV_DB_RANGE(zynqmp_dp_tlv, + 0x0, 0x0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, -3913, 1), + 0x1, 0x2000, TLV_DB_LINEAR_ITEM(-3913, 0), + 0x2000, 0xffff, TLV_DB_LINEAR_ITEM(0, 903), +); + +static const struct snd_kcontrol_new zynqmp_dp_snd_controls[] = { + SOC_SINGLE_TLV("Input0 Playback Volume", 0, + 0, 0xffff, 0, zynqmp_dp_tlv), + SOC_SINGLE_TLV("Input1 Playback Volume", 1, + 0, 0xffff, 0, zynqmp_dp_tlv), +}; + +/* + * Note: these read & write functions only support two "registers", 0 and 1, + * for volume 0 and 1. In other words, these are not real register read/write + * functions. + * + * This is done to support caching the volume value for the case where the + * hardware is not enabled, and also to support locking as volumes 0 and 1 + * are in the same register. + */ +static unsigned int zynqmp_dp_dai_read(struct snd_soc_component *component, + unsigned int reg) +{ + struct zynqmp_dpsub *dpsub = dev_get_drvdata(component->dev); + struct zynqmp_dpsub_audio *audio = dpsub->audio; + + return audio->volumes[reg]; +} + +static int zynqmp_dp_dai_write(struct snd_soc_component *component, + unsigned int reg, unsigned int val) +{ + struct zynqmp_dpsub *dpsub = dev_get_drvdata(component->dev); + struct zynqmp_dpsub_audio *audio = dpsub->audio; + + guard(mutex)(&audio->enable_lock); + + audio->volumes[reg] = val; + + if (audio->enabled_streams) + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_MIXER_VOLUME, + audio->volumes[0] | + (audio->volumes[1] << 16)); + + return 0; +} + +static const struct snd_soc_component_driver zynqmp_dp_component_driver = { + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .controls = zynqmp_dp_snd_controls, + .num_controls = ARRAY_SIZE(zynqmp_dp_snd_controls), + .read = zynqmp_dp_dai_read, + .write = zynqmp_dp_dai_write, +}; + +int zynqmp_audio_init(struct zynqmp_dpsub *dpsub) +{ + struct platform_device *pdev = to_platform_device(dpsub->dev); + struct device *dev = dpsub->dev; + struct zynqmp_dpsub_audio *audio; + struct snd_soc_card *card; + void *dev_data; + int ret; + + if (!dpsub->aud_clk) + return 0; + + audio = devm_kzalloc(dev, sizeof(*audio), GFP_KERNEL); + if (!audio) + return -ENOMEM; + + dpsub->audio = audio; + + mutex_init(&audio->enable_lock); + + /* 0x2000 is the zero level, no change */ + audio->volumes[0] = 0x2000; + audio->volumes[1] = 0x2000; + + audio->dai_name = devm_kasprintf(dev, GFP_KERNEL, + "%s-dai", dev_name(dev)); + + for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) { + audio->link_names[i] = devm_kasprintf(dev, GFP_KERNEL, + "%s-dp-%u", dev_name(dev), i); + audio->pcm_names[i] = devm_kasprintf(dev, GFP_KERNEL, + "%s-pcm-%u", dev_name(dev), i); + } + + audio->base = devm_platform_ioremap_resource_byname(pdev, "aud"); + if (IS_ERR(audio->base)) + return PTR_ERR(audio->base); + + /* Create CPU DAI */ + + audio->dai_driver = (struct snd_soc_dai_driver) { + .name = audio->dai_name, + .ops = &zynqmp_dp_dai_ops, + .playback = { + .channels_min = 2, + .channels_max = 2, + .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + }, + }; + + ret = devm_snd_soc_register_component(dev, &zynqmp_dp_component_driver, + &audio->dai_driver, 1); + if (ret) { + dev_err(dev, "Failed to register CPU DAI\n"); + return ret; + } + + /* Create PCMs */ + + for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) { + struct snd_dmaengine_pcm_config *pcm_config = + &audio->pcm_configs[i]; + + *pcm_config = (struct snd_dmaengine_pcm_config){ + .name = audio->pcm_names[i], + .pcm_hardware = &zynqmp_dp_pcm_hw, + .prealloc_buffer_size = 64 * 1024, + .chan_names[SNDRV_PCM_STREAM_PLAYBACK] = + i == 0 ? "aud0" : "aud1", + }; + + ret = devm_snd_dmaengine_pcm_register(dev, pcm_config, 0); + if (ret) { + dev_err(dev, "Failed to register PCM %u\n", i); + return ret; + } + } + + /* Create card */ + + card = &audio->card; + card->name = "DisplayPort"; + card->long_name = "DisplayPort Monitor"; + card->driver_name = "zynqmp_dpsub"; + card->dev = dev; + card->owner = THIS_MODULE; + card->num_links = ZYNQMP_NUM_PCMS; + card->dai_link = audio->links; + + for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) { + struct snd_soc_dai_link *link = &card->dai_link[i]; + + link->ops = &zynqmp_dp_ops; + + link->name = audio->link_names[i]; + link->stream_name = audio->link_names[i]; + + link->cpus = &audio->components[i].cpu; + link->num_cpus = 1; + link->cpus[0].dai_name = audio->dai_name; + + link->codecs = &audio->components[i].codec; + link->num_codecs = 1; + link->codecs[0].name = "snd-soc-dummy"; + link->codecs[0].dai_name = "snd-soc-dummy-dai"; + + link->platforms = &audio->components[i].platform; + link->num_platforms = 1; + link->platforms[0].name = audio->pcm_names[i]; + } + + /* + * HACK: devm_snd_soc_register_card() overwrites current drvdata + * so we need to hack it back. + */ + dev_data = dev_get_drvdata(dev); + ret = devm_snd_soc_register_card(dev, card); + dev_set_drvdata(dev, dev_data); + if (ret) { + /* + * As older dtbs may not have the audio channel dmas defined, + * instead of returning an error here we'll continue and just + * mark the audio as disabled. + */ + dev_err(dev, "Failed to register sound card, disabling audio support\n"); + + devm_kfree(dev, audio); + dpsub->audio = NULL; + + return 0; + } + + return 0; +} + +void zynqmp_audio_uninit(struct zynqmp_dpsub *dpsub) +{ + struct zynqmp_dpsub_audio *audio = dpsub->audio; + + if (!audio) + return; + + if (!dpsub->aud_clk) + return; + + mutex_destroy(&audio->enable_lock); +} diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c index f5781939de9c..a72ffb31a2e8 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c @@ -56,36 +56,6 @@ static const struct dev_pm_ops zynqmp_dpsub_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(zynqmp_dpsub_suspend, zynqmp_dpsub_resume) }; -/* ----------------------------------------------------------------------------- - * DPSUB Configuration - */ - -/** - * zynqmp_dpsub_audio_enabled - If the audio is enabled - * @dpsub: DisplayPort subsystem - * - * Return if the audio is enabled depending on the audio clock. - * - * Return: true if audio is enabled, or false. - */ -bool zynqmp_dpsub_audio_enabled(struct zynqmp_dpsub *dpsub) -{ - return !!dpsub->aud_clk; -} - -/** - * zynqmp_dpsub_get_audio_clk_rate - Get the current audio clock rate - * @dpsub: DisplayPort subsystem - * - * Return: the current audio clock rate. - */ -unsigned int zynqmp_dpsub_get_audio_clk_rate(struct zynqmp_dpsub *dpsub) -{ - if (zynqmp_dpsub_audio_enabled(dpsub)) - return 0; - return clk_get_rate(dpsub->aud_clk); -} - /* ----------------------------------------------------------------------------- * Probe & Remove */ @@ -264,10 +234,17 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev) goto err_disp; } + ret = zynqmp_audio_init(dpsub); + if (ret) + goto err_drm_cleanup; + dev_info(&pdev->dev, "ZynqMP DisplayPort Subsystem driver probed"); return 0; +err_drm_cleanup: + if (dpsub->drm) + zynqmp_dpsub_drm_cleanup(dpsub); err_disp: drm_bridge_remove(dpsub->bridge); zynqmp_disp_remove(dpsub); @@ -287,6 +264,8 @@ static void zynqmp_dpsub_remove(struct platform_device *pdev) { struct zynqmp_dpsub *dpsub = platform_get_drvdata(pdev); + zynqmp_audio_uninit(dpsub); + if (dpsub->drm) zynqmp_dpsub_drm_cleanup(dpsub); diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.h b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h index b18554467e9c..49875529c2a4 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.h +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h @@ -12,6 +12,8 @@ #ifndef _ZYNQMP_DPSUB_H_ #define _ZYNQMP_DPSUB_H_ +#include <linux/types.h> + struct clk; struct device; struct drm_bridge; @@ -39,6 +41,8 @@ enum zynqmp_dpsub_format { ZYNQMP_DPSUB_FORMAT_YONLY, }; +struct zynqmp_dpsub_audio; + /** * struct zynqmp_dpsub - ZynqMP DisplayPort Subsystem * @dev: The physical device @@ -77,10 +81,17 @@ struct zynqmp_dpsub { struct zynqmp_dp *dp; unsigned int dma_align; + + struct zynqmp_dpsub_audio *audio; }; -bool zynqmp_dpsub_audio_enabled(struct zynqmp_dpsub *dpsub); -unsigned int zynqmp_dpsub_get_audio_clk_rate(struct zynqmp_dpsub *dpsub); +#ifdef CONFIG_DRM_ZYNQMP_DPSUB_AUDIO +int zynqmp_audio_init(struct zynqmp_dpsub *dpsub); +void zynqmp_audio_uninit(struct zynqmp_dpsub *dpsub); +#else +static inline int zynqmp_audio_init(struct zynqmp_dpsub *dpsub) { return 0; } +static inline void zynqmp_audio_uninit(struct zynqmp_dpsub *dpsub) { } +#endif void zynqmp_dpsub_release(struct zynqmp_dpsub *dpsub); -- 2.43.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v4 3/3] drm: xlnx: zynqmp_dpsub: Add DP audio support 2024-10-23 11:52 ` [PATCH v4 3/3] drm: xlnx: zynqmp_dpsub: Add DP audio support Tomi Valkeinen @ 2024-12-18 15:57 ` Sagar, Vishal 0 siblings, 0 replies; 6+ messages in thread From: Sagar, Vishal @ 2024-12-18 15:57 UTC (permalink / raw) To: Tomi Valkeinen, Lars-Peter Clausen, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Laurent Pinchart, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Michal Simek, Krzysztof Kozlowski, Simona Vetter Cc: linux-sound, linux-kernel, dri-devel, devicetree, linux-arm-kernel, Anatoliy Klymenko, Péter Ujfalusi, Markus Elfring Hi Tomi, Thanks for the patch. On 10/23/2024 1:52 PM, Tomi Valkeinen wrote: > Add basic DisplayPort audio support. > > Support non-live audio playback from two PCMs (DMA channels), and the > volume control in the audio mixer. > > As older dtb files may not have the audio DMA channels defined, the > driver will just mark the audio support as disabled if the audio DMA is > missing, and will continue with only display support. > > Note: Reset doesn't seem to work (ZYNQMP_DISP_AUD_SOFT_RESET). If we do > a reset, audio playback won't start again even if, afaics, we do set up > all the necessary registers. So, at the moment, resetting the audio > block in dp_dai_hw_free() is commented out. > > Tested-by: Anatoliy Klymenko <anatoliy.klymenko@amd.com> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> > --- > drivers/gpu/drm/xlnx/Kconfig | 9 + > drivers/gpu/drm/xlnx/Makefile | 1 + > drivers/gpu/drm/xlnx/zynqmp_disp.c | 48 ---- > drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 7 +- > drivers/gpu/drm/xlnx/zynqmp_dp.c | 54 ++-- > drivers/gpu/drm/xlnx/zynqmp_dp.h | 7 + > drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 447 ++++++++++++++++++++++++++++++++ > drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 39 +-- > drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 15 +- > 9 files changed, 526 insertions(+), 101 deletions(-) > > diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig > index 626e5ac4c33d..ecd7be347300 100644 > --- a/drivers/gpu/drm/xlnx/Kconfig > +++ b/drivers/gpu/drm/xlnx/Kconfig > @@ -16,3 +16,12 @@ config DRM_ZYNQMP_DPSUB > This is a DRM/KMS driver for ZynqMP DisplayPort controller. Choose > this option if you have a Xilinx ZynqMP SoC with DisplayPort > subsystem. > + > +config DRM_ZYNQMP_DPSUB_AUDIO > + bool "ZynqMP DisplayPort Audio Support" > + depends on DRM_ZYNQMP_DPSUB > + depends on SND && SND_SOC > + select SND_SOC_GENERIC_DMAENGINE_PCM > + help > + Choose this option to enable DisplayPort audio support in the ZynqMP > + DisplayPort driver. > diff --git a/drivers/gpu/drm/xlnx/Makefile b/drivers/gpu/drm/xlnx/Makefile > index ea1422a39502..ab6e2ffd7e8d 100644 > --- a/drivers/gpu/drm/xlnx/Makefile > +++ b/drivers/gpu/drm/xlnx/Makefile > @@ -1,2 +1,3 @@ > zynqmp-dpsub-y := zynqmp_disp.o zynqmp_dpsub.o zynqmp_dp.o zynqmp_kms.o > +zynqmp-dpsub-$(CONFIG_DRM_ZYNQMP_DPSUB_AUDIO) += zynqmp_dp_audio.o > obj-$(CONFIG_DRM_ZYNQMP_DPSUB) += zynqmp-dpsub.o > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c > index 9368acf56eaf..77dc485c0887 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > @@ -143,7 +143,6 @@ struct zynqmp_disp_layer { > * @dpsub: Display subsystem > * @blend: Register I/O base address for the blender > * @avbuf: Register I/O base address for the audio/video buffer manager > - * @audio: Registers I/O base address for the audio mixer > * @layers: Layers (planes) > */ > struct zynqmp_disp { > @@ -152,7 +151,6 @@ struct zynqmp_disp { > > void __iomem *blend; > void __iomem *avbuf; > - void __iomem *audio; > > struct zynqmp_disp_layer layers[ZYNQMP_DPSUB_NUM_LAYERS]; > }; > @@ -865,42 +863,6 @@ static void zynqmp_disp_blend_layer_disable(struct zynqmp_disp *disp, > csc_zero_offsets); > } > > -/* ----------------------------------------------------------------------------- > - * Audio Mixer > - */ > - > -static void zynqmp_disp_audio_write(struct zynqmp_disp *disp, int reg, u32 val) > -{ > - writel(val, disp->audio + reg); > -} > - > -/** > - * zynqmp_disp_audio_enable - Enable the audio mixer > - * @disp: Display controller > - * > - * Enable the audio mixer by de-asserting the soft reset. The audio state is set to > - * default values by the reset, set the default mixer volume explicitly. > - */ > -static void zynqmp_disp_audio_enable(struct zynqmp_disp *disp) > -{ > - /* Clear the audio soft reset register as it's an non-reset flop. */ > - zynqmp_disp_audio_write(disp, ZYNQMP_DISP_AUD_SOFT_RESET, 0); > - zynqmp_disp_audio_write(disp, ZYNQMP_DISP_AUD_MIXER_VOLUME, > - ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE); > -} > - > -/** > - * zynqmp_disp_audio_disable - Disable the audio mixer > - * @disp: Display controller > - * > - * Disable the audio mixer by asserting its soft reset. > - */ > -static void zynqmp_disp_audio_disable(struct zynqmp_disp *disp) > -{ > - zynqmp_disp_audio_write(disp, ZYNQMP_DISP_AUD_SOFT_RESET, > - ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST); > -} > - > /* ----------------------------------------------------------------------------- > * ZynqMP Display Layer & DRM Plane > */ > @@ -1338,8 +1300,6 @@ void zynqmp_disp_enable(struct zynqmp_disp *disp) > disp->dpsub->vid_clk_from_ps); > zynqmp_disp_avbuf_enable_channels(disp); > zynqmp_disp_avbuf_enable_audio(disp); > - > - zynqmp_disp_audio_enable(disp); > } > > /** > @@ -1348,8 +1308,6 @@ void zynqmp_disp_enable(struct zynqmp_disp *disp) > */ > void zynqmp_disp_disable(struct zynqmp_disp *disp) > { > - zynqmp_disp_audio_disable(disp); > - > zynqmp_disp_avbuf_disable_audio(disp); > zynqmp_disp_avbuf_disable_channels(disp); > zynqmp_disp_avbuf_disable(disp); > @@ -1418,12 +1376,6 @@ int zynqmp_disp_probe(struct zynqmp_dpsub *dpsub) > goto error; > } > > - disp->audio = devm_platform_ioremap_resource_byname(pdev, "aud"); > - if (IS_ERR(disp->audio)) { > - ret = PTR_ERR(disp->audio); > - goto error; > - } > - > ret = zynqmp_disp_create_layers(disp); > if (ret) > goto error; > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h > index fa3935384834..9a4ff094e276 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp_regs.h > @@ -177,12 +177,7 @@ > #define ZYNQMP_DISP_AUD_MIXER_VOLUME 0x0 > #define ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE 0x20002000 > #define ZYNQMP_DISP_AUD_MIXER_META_DATA 0x4 > -#define ZYNQMP_DISP_AUD_CH_STATUS0 0x8 > -#define ZYNQMP_DISP_AUD_CH_STATUS1 0xc > -#define ZYNQMP_DISP_AUD_CH_STATUS2 0x10 > -#define ZYNQMP_DISP_AUD_CH_STATUS3 0x14 > -#define ZYNQMP_DISP_AUD_CH_STATUS4 0x18 > -#define ZYNQMP_DISP_AUD_CH_STATUS5 0x1c > +#define ZYNQMP_DISP_AUD_CH_STATUS(x) (0x8 + ((x) * 4)) > #define ZYNQMP_DISP_AUD_CH_A_DATA0 0x20 > #define ZYNQMP_DISP_AUD_CH_A_DATA1 0x24 > #define ZYNQMP_DISP_AUD_CH_A_DATA2 0x28 > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c > index 129beac4c073..af1b4b104067 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_dp.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c > @@ -1221,7 +1221,6 @@ static void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, > { > u8 lane_cnt = dp->mode.lane_cnt; > u32 reg, wpl; > - unsigned int rate; > > zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_HTOTAL, mode->htotal); > zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_VTOTAL, mode->vtotal); > @@ -1246,18 +1245,8 @@ static void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, > reg = drm_dp_bw_code_to_link_rate(dp->mode.bw_code); > zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_N_VID, reg); > zynqmp_dp_write(dp, ZYNQMP_DP_MAIN_STREAM_M_VID, mode->clock); > - rate = zynqmp_dpsub_get_audio_clk_rate(dp->dpsub); > - if (rate) { > - dev_dbg(dp->dev, "Audio rate: %d\n", rate / 512); > - zynqmp_dp_write(dp, ZYNQMP_DP_TX_N_AUD, reg); > - zynqmp_dp_write(dp, ZYNQMP_DP_TX_M_AUD, rate / 1000); > - } > } > > - /* Only 2 channel audio is supported now */ > - if (zynqmp_dpsub_audio_enabled(dp->dpsub)) > - zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CHANNELS, 1); > - > zynqmp_dp_write(dp, ZYNQMP_DP_USER_PIX_WIDTH, 1); > > /* Translate to the native 16 bit datapath based on IP core spec */ > @@ -1266,6 +1255,44 @@ static void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, > zynqmp_dp_write(dp, ZYNQMP_DP_USER_DATA_COUNT_PER_LANE, reg); > } > > +/* ----------------------------------------------------------------------------- > + * Audio > + */ > + > +void zynqmp_dp_audio_set_channels(struct zynqmp_dp *dp, > + unsigned int num_channels) > +{ > + zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CHANNELS, num_channels - 1); > +} > + > +void zynqmp_dp_audio_enable(struct zynqmp_dp *dp) > +{ > + zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 1); > +} > + > +void zynqmp_dp_audio_disable(struct zynqmp_dp *dp) > +{ > + zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 0); > +} > + > +void zynqmp_dp_audio_write_n_m(struct zynqmp_dp *dp) > +{ > + unsigned int rate; > + u32 link_rate; > + > + if (!(dp->config.misc0 & ZYNQMP_DP_MAIN_STREAM_MISC0_SYNC_LOCK)) > + return; > + > + link_rate = drm_dp_bw_code_to_link_rate(dp->mode.bw_code); > + > + rate = clk_get_rate(dp->dpsub->aud_clk); > + > + dev_dbg(dp->dev, "Audio rate: %d\n", rate / 512); > + > + zynqmp_dp_write(dp, ZYNQMP_DP_TX_N_AUD, link_rate); > + zynqmp_dp_write(dp, ZYNQMP_DP_TX_M_AUD, rate / 1000); > +} > + > /* ----------------------------------------------------------------------------- > * DISP Configuration > */ > @@ -1453,8 +1480,7 @@ static void zynqmp_dp_bridge_atomic_enable(struct drm_bridge *bridge, > /* Enable the encoder */ > dp->enabled = true; > zynqmp_dp_update_misc(dp); > - if (zynqmp_dpsub_audio_enabled(dp->dpsub)) > - zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 1); > + > zynqmp_dp_write(dp, ZYNQMP_DP_TX_PHY_POWER_DOWN, 0); > if (dp->status == connector_status_connected) { > for (i = 0; i < 3; i++) { > @@ -1487,8 +1513,6 @@ static void zynqmp_dp_bridge_atomic_disable(struct drm_bridge *bridge, > drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, DP_SET_POWER_D3); > zynqmp_dp_write(dp, ZYNQMP_DP_TX_PHY_POWER_DOWN, > ZYNQMP_DP_TX_PHY_POWER_DOWN_ALL); > - if (zynqmp_dpsub_audio_enabled(dp->dpsub)) > - zynqmp_dp_write(dp, ZYNQMP_DP_TX_AUDIO_CONTROL, 0); > > zynqmp_dp_disp_disable(dp, old_bridge_state); > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.h b/drivers/gpu/drm/xlnx/zynqmp_dp.h > index f077d7fbd0ad..a3257793e23a 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_dp.h > +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.h > @@ -22,4 +22,11 @@ void zynqmp_dp_disable_vblank(struct zynqmp_dp *dp); > int zynqmp_dp_probe(struct zynqmp_dpsub *dpsub); > void zynqmp_dp_remove(struct zynqmp_dpsub *dpsub); > > +void zynqmp_dp_audio_set_channels(struct zynqmp_dp *dp, > + unsigned int num_channels); > +void zynqmp_dp_audio_enable(struct zynqmp_dp *dp); > +void zynqmp_dp_audio_disable(struct zynqmp_dp *dp); > + > +void zynqmp_dp_audio_write_n_m(struct zynqmp_dp *dp); > + > #endif /* _ZYNQMP_DP_H_ */ > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c > new file mode 100644 > index 000000000000..fa5f0ace6084 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/zynqmp_dp_audio.c > @@ -0,0 +1,447 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * ZynqMP DisplayPort Subsystem Driver - Audio support > + * > + * Copyright (C) 2015 - 2024 Xilinx, Inc. > + * > + * Authors: > + * - Hyun Woo Kwon <hyun.kwon@xilinx.com> > + * - Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> > + */ > + > +#include <linux/clk.h> > +#include <linux/device.h> > +#include <linux/mutex.h> > +#include <linux/pm_runtime.h> > + > +#include <sound/asoundef.h> > +#include <sound/core.h> > +#include <sound/dmaengine_pcm.h> > +#include <sound/initval.h> > +#include <sound/pcm.h> > +#include <sound/soc.h> > +#include <sound/tlv.h> > + > +#include "zynqmp_disp_regs.h" > +#include "zynqmp_dp.h" > +#include "zynqmp_dpsub.h" > + > +#define ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK 512 > +#define ZYNQMP_NUM_PCMS 2 > + > +struct zynqmp_dpsub_audio { > + void __iomem *base; > + > + struct snd_soc_card card; > + > + const char *dai_name; > + const char *link_names[ZYNQMP_NUM_PCMS]; > + const char *pcm_names[ZYNQMP_NUM_PCMS]; > + > + struct snd_soc_dai_driver dai_driver; > + struct snd_dmaengine_pcm_config pcm_configs[2]; > + > + struct snd_soc_dai_link links[ZYNQMP_NUM_PCMS]; > + > + struct { > + struct snd_soc_dai_link_component cpu; > + struct snd_soc_dai_link_component codec; > + struct snd_soc_dai_link_component platform; > + } components[ZYNQMP_NUM_PCMS]; > + > + /* > + * Protects: > + * - enabled_streams > + * - volumes > + * - current_rate > + */ > + struct mutex enable_lock; > + > + u32 enabled_streams; > + u32 current_rate; > + > + u16 volumes[2]; > +}; > + > +static const struct snd_pcm_hardware zynqmp_dp_pcm_hw = { > + .info = SNDRV_PCM_INFO_MMAP | > + SNDRV_PCM_INFO_MMAP_VALID | > + SNDRV_PCM_INFO_INTERLEAVED | > + SNDRV_PCM_INFO_PAUSE | > + SNDRV_PCM_INFO_RESUME | > + SNDRV_PCM_INFO_NO_PERIOD_WAKEUP, > + > + .buffer_bytes_max = 128 * 1024, > + .period_bytes_min = 256, > + .period_bytes_max = 1024 * 1024, > + .periods_min = 2, > + .periods_max = 256, > +}; > + > +static int zynqmp_dp_startup(struct snd_pcm_substream *substream) > +{ > + struct snd_pcm_runtime *runtime = substream->runtime; > + > + snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, > + 256); > + > + return 0; > +} > + > +static const struct snd_soc_ops zynqmp_dp_ops = { > + .startup = zynqmp_dp_startup, > +}; > + > +static void zynqmp_dp_audio_write(struct zynqmp_dpsub_audio *audio, int reg, > + u32 val) > +{ > + writel(val, audio->base + reg); > +} > + > +static int dp_dai_hw_params(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params, > + struct snd_soc_dai *socdai) > +{ > + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); > + struct zynqmp_dpsub *dpsub = > + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); > + struct zynqmp_dpsub_audio *audio = dpsub->audio; > + int ret; > + u32 sample_rate; > + struct snd_aes_iec958 iec = { 0 }; > + unsigned long rate; > + > + sample_rate = params_rate(params); > + > + if (sample_rate != 48000 && sample_rate != 44100) > + return -EINVAL; > + > + guard(mutex)(&audio->enable_lock); > + > + if (audio->enabled_streams && audio->current_rate != sample_rate) { > + dev_err(dpsub->dev, > + "Can't change rate while playback enabled\n"); > + return -EINVAL; > + } > + > + if (audio->enabled_streams > 0) { > + /* Nothing to do */ > + audio->enabled_streams++; > + return 0; > + } > + > + audio->current_rate = sample_rate; > + > + /* Note: clock rate can only be changed if the clock is disabled */ > + ret = clk_set_rate(dpsub->aud_clk, > + sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK); > + if (ret) { > + dev_err(dpsub->dev, "can't set aud_clk to %u err:%d\n", > + sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK, ret); > + return ret; > + } > + > + clk_prepare_enable(dpsub->aud_clk); > + > + rate = clk_get_rate(dpsub->aud_clk); > + > + /* Ignore some offset +- 10 */ > + if (abs(sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK - rate) > 10) { > + dev_err(dpsub->dev, "aud_clk offset is higher: %ld\n", > + sample_rate * ZYNQMP_DISP_AUD_SMPL_RATE_TO_CLK - rate); > + clk_disable_unprepare(dpsub->aud_clk); > + return -EINVAL; > + } > + > + pm_runtime_get_sync(dpsub->dev); > + > + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_MIXER_VOLUME, > + audio->volumes[0] | (audio->volumes[1] << 16)); > + > + /* Clear the audio soft reset register as it's an non-reset flop. */ > + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_SOFT_RESET, 0); > + > + /* Only 2 channel audio is supported now */ > + zynqmp_dp_audio_set_channels(dpsub->dp, 2); > + > + zynqmp_dp_audio_write_n_m(dpsub->dp); > + > + /* Channel status */ > + > + if (sample_rate == 48000) > + iec.status[3] = IEC958_AES3_CON_FS_48000; > + else > + iec.status[3] = IEC958_AES3_CON_FS_44100; > + > + for (unsigned int i = 0; i < AES_IEC958_STATUS_SIZE / 4; ++i) { > + u32 v; > + > + v = (iec.status[(i * 4) + 0] << 0) | > + (iec.status[(i * 4) + 1] << 8) | > + (iec.status[(i * 4) + 2] << 16) | > + (iec.status[(i * 4) + 3] << 24); > + > + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_CH_STATUS(i), v); > + } > + > + zynqmp_dp_audio_enable(dpsub->dp); > + > + audio->enabled_streams++; > + > + return 0; > +} > + > +static int dp_dai_hw_free(struct snd_pcm_substream *substream, > + struct snd_soc_dai *socdai) > +{ > + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); > + struct zynqmp_dpsub *dpsub = > + snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0)); > + struct zynqmp_dpsub_audio *audio = dpsub->audio; > + > + guard(mutex)(&audio->enable_lock); > + > + /* Nothing to do */ > + if (audio->enabled_streams > 1) { > + audio->enabled_streams--; > + return 0; > + } > + > + pm_runtime_put(dpsub->dev); > + > + zynqmp_dp_audio_disable(dpsub->dp); > + > + /* > + * Reset doesn't work. If we assert reset between audio stop and start, > + * the audio won't start anymore. Probably we are missing writing > + * some audio related registers. A/B buf? > + */ > + /* > + zynqmp_disp_audio_write(audio, ZYNQMP_DISP_AUD_SOFT_RESET, > + ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST); > + */ > + > + clk_disable_unprepare(dpsub->aud_clk); > + > + audio->current_rate = 0; > + audio->enabled_streams--; > + > + return 0; > +} > + > +static const struct snd_soc_dai_ops zynqmp_dp_dai_ops = { > + .hw_params = dp_dai_hw_params, > + .hw_free = dp_dai_hw_free, > +}; > + > +/* > + * Min = 10 * log10(0x1 / 0x2000) = -39.13 > + * Max = 10 * log10(0xffffff / 0x2000) = 9.03 > + */ > +static const DECLARE_TLV_DB_RANGE(zynqmp_dp_tlv, > + 0x0, 0x0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, -3913, 1), > + 0x1, 0x2000, TLV_DB_LINEAR_ITEM(-3913, 0), > + 0x2000, 0xffff, TLV_DB_LINEAR_ITEM(0, 903), > +); > + > +static const struct snd_kcontrol_new zynqmp_dp_snd_controls[] = { > + SOC_SINGLE_TLV("Input0 Playback Volume", 0, > + 0, 0xffff, 0, zynqmp_dp_tlv), > + SOC_SINGLE_TLV("Input1 Playback Volume", 1, > + 0, 0xffff, 0, zynqmp_dp_tlv), > +}; > + > +/* > + * Note: these read & write functions only support two "registers", 0 and 1, > + * for volume 0 and 1. In other words, these are not real register read/write > + * functions. > + * > + * This is done to support caching the volume value for the case where the > + * hardware is not enabled, and also to support locking as volumes 0 and 1 > + * are in the same register. > + */ > +static unsigned int zynqmp_dp_dai_read(struct snd_soc_component *component, > + unsigned int reg) > +{ > + struct zynqmp_dpsub *dpsub = dev_get_drvdata(component->dev); > + struct zynqmp_dpsub_audio *audio = dpsub->audio; > + > + return audio->volumes[reg]; > +} > + > +static int zynqmp_dp_dai_write(struct snd_soc_component *component, > + unsigned int reg, unsigned int val) > +{ > + struct zynqmp_dpsub *dpsub = dev_get_drvdata(component->dev); > + struct zynqmp_dpsub_audio *audio = dpsub->audio; > + > + guard(mutex)(&audio->enable_lock); > + > + audio->volumes[reg] = val; > + > + if (audio->enabled_streams) > + zynqmp_dp_audio_write(audio, ZYNQMP_DISP_AUD_MIXER_VOLUME, > + audio->volumes[0] | > + (audio->volumes[1] << 16)); > + > + return 0; > +} > + > +static const struct snd_soc_component_driver zynqmp_dp_component_driver = { > + .idle_bias_on = 1, > + .use_pmdown_time = 1, > + .endianness = 1, > + .controls = zynqmp_dp_snd_controls, > + .num_controls = ARRAY_SIZE(zynqmp_dp_snd_controls), > + .read = zynqmp_dp_dai_read, > + .write = zynqmp_dp_dai_write, > +}; > + > +int zynqmp_audio_init(struct zynqmp_dpsub *dpsub) > +{ > + struct platform_device *pdev = to_platform_device(dpsub->dev); > + struct device *dev = dpsub->dev; > + struct zynqmp_dpsub_audio *audio; > + struct snd_soc_card *card; > + void *dev_data; > + int ret; > + > + if (!dpsub->aud_clk) > + return 0; > + > + audio = devm_kzalloc(dev, sizeof(*audio), GFP_KERNEL); > + if (!audio) > + return -ENOMEM; > + > + dpsub->audio = audio; > + > + mutex_init(&audio->enable_lock); > + > + /* 0x2000 is the zero level, no change */ > + audio->volumes[0] = 0x2000; > + audio->volumes[1] = 0x2000; > + > + audio->dai_name = devm_kasprintf(dev, GFP_KERNEL, > + "%s-dai", dev_name(dev)); > + > + for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) { > + audio->link_names[i] = devm_kasprintf(dev, GFP_KERNEL, > + "%s-dp-%u", dev_name(dev), i); > + audio->pcm_names[i] = devm_kasprintf(dev, GFP_KERNEL, > + "%s-pcm-%u", dev_name(dev), i); > + } > + > + audio->base = devm_platform_ioremap_resource_byname(pdev, "aud"); > + if (IS_ERR(audio->base)) > + return PTR_ERR(audio->base); > + > + /* Create CPU DAI */ > + > + audio->dai_driver = (struct snd_soc_dai_driver) { > + .name = audio->dai_name, > + .ops = &zynqmp_dp_dai_ops, > + .playback = { > + .channels_min = 2, > + .channels_max = 2, > + .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, > + .formats = SNDRV_PCM_FMTBIT_S16_LE, > + }, > + }; > + > + ret = devm_snd_soc_register_component(dev, &zynqmp_dp_component_driver, > + &audio->dai_driver, 1); > + if (ret) { > + dev_err(dev, "Failed to register CPU DAI\n"); > + return ret; > + } > + > + /* Create PCMs */ > + > + for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) { > + struct snd_dmaengine_pcm_config *pcm_config = > + &audio->pcm_configs[i]; > + > + *pcm_config = (struct snd_dmaengine_pcm_config){ > + .name = audio->pcm_names[i], > + .pcm_hardware = &zynqmp_dp_pcm_hw, > + .prealloc_buffer_size = 64 * 1024, > + .chan_names[SNDRV_PCM_STREAM_PLAYBACK] = > + i == 0 ? "aud0" : "aud1", > + }; > + > + ret = devm_snd_dmaengine_pcm_register(dev, pcm_config, 0); > + if (ret) { > + dev_err(dev, "Failed to register PCM %u\n", i); > + return ret; > + } > + } > + > + /* Create card */ > + > + card = &audio->card; > + card->name = "DisplayPort"; > + card->long_name = "DisplayPort Monitor"; > + card->driver_name = "zynqmp_dpsub"; > + card->dev = dev; > + card->owner = THIS_MODULE; > + card->num_links = ZYNQMP_NUM_PCMS; > + card->dai_link = audio->links; > + > + for (unsigned int i = 0; i < ZYNQMP_NUM_PCMS; ++i) { > + struct snd_soc_dai_link *link = &card->dai_link[i]; > + > + link->ops = &zynqmp_dp_ops; > + > + link->name = audio->link_names[i]; > + link->stream_name = audio->link_names[i]; > + > + link->cpus = &audio->components[i].cpu; > + link->num_cpus = 1; > + link->cpus[0].dai_name = audio->dai_name; > + > + link->codecs = &audio->components[i].codec; > + link->num_codecs = 1; > + link->codecs[0].name = "snd-soc-dummy"; > + link->codecs[0].dai_name = "snd-soc-dummy-dai"; > + > + link->platforms = &audio->components[i].platform; > + link->num_platforms = 1; > + link->platforms[0].name = audio->pcm_names[i]; > + } > + > + /* > + * HACK: devm_snd_soc_register_card() overwrites current drvdata > + * so we need to hack it back. > + */ > + dev_data = dev_get_drvdata(dev); > + ret = devm_snd_soc_register_card(dev, card); > + dev_set_drvdata(dev, dev_data); > + if (ret) { > + /* > + * As older dtbs may not have the audio channel dmas defined, > + * instead of returning an error here we'll continue and just > + * mark the audio as disabled. > + */ > + dev_err(dev, "Failed to register sound card, disabling audio support\n"); > + > + devm_kfree(dev, audio); > + dpsub->audio = NULL; > + > + return 0; > + } > + > + return 0; > +} > + > +void zynqmp_audio_uninit(struct zynqmp_dpsub *dpsub) > +{ > + struct zynqmp_dpsub_audio *audio = dpsub->audio; > + > + if (!audio) > + return; > + > + if (!dpsub->aud_clk) > + return; > + > + mutex_destroy(&audio->enable_lock); > +} > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > index f5781939de9c..a72ffb31a2e8 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > @@ -56,36 +56,6 @@ static const struct dev_pm_ops zynqmp_dpsub_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(zynqmp_dpsub_suspend, zynqmp_dpsub_resume) > }; > > -/* ----------------------------------------------------------------------------- > - * DPSUB Configuration > - */ > - > -/** > - * zynqmp_dpsub_audio_enabled - If the audio is enabled > - * @dpsub: DisplayPort subsystem > - * > - * Return if the audio is enabled depending on the audio clock. > - * > - * Return: true if audio is enabled, or false. > - */ > -bool zynqmp_dpsub_audio_enabled(struct zynqmp_dpsub *dpsub) > -{ > - return !!dpsub->aud_clk; > -} > - > -/** > - * zynqmp_dpsub_get_audio_clk_rate - Get the current audio clock rate > - * @dpsub: DisplayPort subsystem > - * > - * Return: the current audio clock rate. > - */ > -unsigned int zynqmp_dpsub_get_audio_clk_rate(struct zynqmp_dpsub *dpsub) > -{ > - if (zynqmp_dpsub_audio_enabled(dpsub)) > - return 0; > - return clk_get_rate(dpsub->aud_clk); > -} > - > /* ----------------------------------------------------------------------------- > * Probe & Remove > */ > @@ -264,10 +234,17 @@ static int zynqmp_dpsub_probe(struct platform_device *pdev) > goto err_disp; > } > > + ret = zynqmp_audio_init(dpsub); > + if (ret) > + goto err_drm_cleanup; > + > dev_info(&pdev->dev, "ZynqMP DisplayPort Subsystem driver probed"); > > return 0; > > +err_drm_cleanup: > + if (dpsub->drm) > + zynqmp_dpsub_drm_cleanup(dpsub); > err_disp: > drm_bridge_remove(dpsub->bridge); > zynqmp_disp_remove(dpsub); > @@ -287,6 +264,8 @@ static void zynqmp_dpsub_remove(struct platform_device *pdev) > { > struct zynqmp_dpsub *dpsub = platform_get_drvdata(pdev); > > + zynqmp_audio_uninit(dpsub); > + > if (dpsub->drm) > zynqmp_dpsub_drm_cleanup(dpsub); > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.h b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h > index b18554467e9c..49875529c2a4 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.h > +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h > @@ -12,6 +12,8 @@ > #ifndef _ZYNQMP_DPSUB_H_ > #define _ZYNQMP_DPSUB_H_ > > +#include <linux/types.h> > + > struct clk; > struct device; > struct drm_bridge; > @@ -39,6 +41,8 @@ enum zynqmp_dpsub_format { > ZYNQMP_DPSUB_FORMAT_YONLY, > }; > > +struct zynqmp_dpsub_audio; > + > /** > * struct zynqmp_dpsub - ZynqMP DisplayPort Subsystem > * @dev: The physical device > @@ -77,10 +81,17 @@ struct zynqmp_dpsub { > struct zynqmp_dp *dp; > > unsigned int dma_align; > + > + struct zynqmp_dpsub_audio *audio; > }; > > -bool zynqmp_dpsub_audio_enabled(struct zynqmp_dpsub *dpsub); > -unsigned int zynqmp_dpsub_get_audio_clk_rate(struct zynqmp_dpsub *dpsub); > +#ifdef CONFIG_DRM_ZYNQMP_DPSUB_AUDIO > +int zynqmp_audio_init(struct zynqmp_dpsub *dpsub); > +void zynqmp_audio_uninit(struct zynqmp_dpsub *dpsub); > +#else > +static inline int zynqmp_audio_init(struct zynqmp_dpsub *dpsub) { return 0; } > +static inline void zynqmp_audio_uninit(struct zynqmp_dpsub *dpsub) { } > +#endif > > void zynqmp_dpsub_release(struct zynqmp_dpsub *dpsub); > > This looks good to me. Please feel free to add - Reviewed-by: Vishal Sagar <vishal.sagar@amd.com> Regards Vishal Sagar ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4 0/3] drm: xlnx: zynqmp: Add DP audio support 2024-10-23 11:52 [PATCH v4 0/3] drm: xlnx: zynqmp: Add DP audio support Tomi Valkeinen ` (2 preceding siblings ...) 2024-10-23 11:52 ` [PATCH v4 3/3] drm: xlnx: zynqmp_dpsub: Add DP audio support Tomi Valkeinen @ 2024-12-19 6:58 ` Tomi Valkeinen 3 siblings, 0 replies; 6+ messages in thread From: Tomi Valkeinen @ 2024-12-19 6:58 UTC (permalink / raw) To: Lars-Peter Clausen, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Laurent Pinchart, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Michal Simek, Krzysztof Kozlowski, Simona Vetter Cc: linux-sound, linux-kernel, dri-devel, devicetree, linux-arm-kernel, Vishal Sagar, Anatoliy Klymenko, Péter Ujfalusi, Markus Elfring, Rob Herring (Arm) Hi, On 23/10/2024 14:52, Tomi Valkeinen wrote: > Add DisplayPort audio support for Xilinx ZynqMP platforms. > > The current DT is, for some reason, missing the DMA channels for the > audio. This series adds that to the bindings and the dts file, but to > support older dtb files without the audio DMA, the driver will not fail > if the audio DMA is missing, but will just mark the audio support as > disabled. > > To: Lars-Peter Clausen <lars@metafoo.de> > To: Jaroslav Kysela <perex@perex.cz> > To: Takashi Iwai <tiwai@suse.com> > To: Liam Girdwood <lgirdwood@gmail.com> > To: Mark Brown <broonie@kernel.org> > To: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > To: Maxime Ripard <mripard@kernel.org> > To: Thomas Zimmermann <tzimmermann@suse.de> > To: David Airlie <airlied@gmail.com> > To: Daniel Vetter <daniel@ffwll.ch> > To: Rob Herring <robh+dt@kernel.org> > To: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > To: Conor Dooley <conor+dt@kernel.org> > To: Michal Simek <michal.simek@amd.com> > To: Krzysztof Kozlowski <krzk+dt@kernel.org> > Cc: linux-sound@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: devicetree@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: Vishal Sagar <vishal.sagar@amd.com> > Cc: Anatoliy Klymenko <anatoliy.klymenko@amd.com> > Cc: Péter Ujfalusi <peter.ujfalusi@gmail.com> > Cc: Markus Elfring <Markus.Elfring@web.de> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> > > Changes in v4: > - Update copyright year > - Use guard(mutex) in the zynqmp_dp_audio.c > - Add Rb and Ab tags > - Link to v3: https://lore.kernel.org/r/20240910-xilinx-dp-audio-v3-0-75560793f4d0@ideasonboard.com > > Changes in v3: > - Expand the description in "dt-bindings: display/xlnx/zynqmp-dpsub: Add > audio DMAs" to be more clear about the DT binding change. > - Rebased on top of current upstream > - Link to v2: https://lore.kernel.org/r/20240319-xilinx-dp-audio-v2-0-92d6d3a7ca7e@ideasonboard.com > > Changes in v2: > - Fix a missing double-quote in the DT binding > - Link to v1: https://lore.kernel.org/r/20240312-xilinx-dp-audio-v1-0-696c79facbb9@ideasonboard.com > > --- > Tomi Valkeinen (3): > dt-bindings: display/xlnx/zynqmp-dpsub: Add audio DMAs > arm64: dts: zynqmp: Add DMA for DP audio > drm: xlnx: zynqmp_dpsub: Add DP audio support > > .../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 10 +- > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 7 +- > drivers/gpu/drm/xlnx/Kconfig | 9 + > drivers/gpu/drm/xlnx/Makefile | 1 + > drivers/gpu/drm/xlnx/zynqmp_disp.c | 48 --- > drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 7 +- > drivers/gpu/drm/xlnx/zynqmp_dp.c | 54 ++- > drivers/gpu/drm/xlnx/zynqmp_dp.h | 7 + > drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 447 +++++++++++++++++++++ > drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 39 +- > drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 15 +- > 11 files changed, 539 insertions(+), 105 deletions(-) > --- > base-commit: 42f7652d3eb527d03665b09edac47f85fb600924 > change-id: 20240312-xilinx-dp-audio-468ad12f9f64 > > Best regards, Pushed to drm-misc-next. Tomi ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-12-19 7:00 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-10-23 11:52 [PATCH v4 0/3] drm: xlnx: zynqmp: Add DP audio support Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 1/3] dt-bindings: display/xlnx/zynqmp-dpsub: Add audio DMAs Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 2/3] arm64: dts: zynqmp: Add DMA for DP audio Tomi Valkeinen 2024-10-23 11:52 ` [PATCH v4 3/3] drm: xlnx: zynqmp_dpsub: Add DP audio support Tomi Valkeinen 2024-12-18 15:57 ` Sagar, Vishal 2024-12-19 6:58 ` [PATCH v4 0/3] drm: xlnx: zynqmp: " Tomi Valkeinen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).