January 2020 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: amd: Fix simultaneous playback and capture
by Akshu Agrawal 29 Jan '20

29 Jan '20

Stopping of one stream is killing the other stream when they are running simultaneously. This is because, IER register is cleared which disables I2S and overrides any other block enables. Clearing IER register only when all streams on a channel are disabled, fixes the issue. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 8619ed5f08ef..c40422fe0001 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -234,30 +234,32 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: reg_val = mmACP_BTTDM_ITER; - ier_val = mmACP_BTTDM_IER; break; case I2S_SP_INSTANCE: default: reg_val = mmACP_I2STDM_ITER; - ier_val = mmACP_I2STDM_IER; } } else { switch (rtd->i2s_instance) { case I2S_BT_INSTANCE: reg_val = mmACP_BTTDM_IRER; - ier_val = mmACP_BTTDM_IER; break; case I2S_SP_INSTANCE: default: reg_val = mmACP_I2STDM_IRER; - ier_val = mmACP_I2STDM_IER; } } val = rv_readl(rtd->acp3x_base + reg_val); val = val & ~BIT(0); rv_writel(val, rtd->acp3x_base + reg_val); - rv_writel(0, rtd->acp3x_base + ier_val); + + if (!(rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER) & BIT(0)) && + !(rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER) & BIT(0))) + rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); + if (!(rv_readl(rtd->acp3x_base + mmACP_I2STDM_ITER) & BIT(0)) && + !(rv_readl(rtd->acp3x_base + mmACP_I2STDM_IRER) & BIT(0))) + rv_writel(0, rtd->acp3x_base + mmACP_I2STDM_IER); ret = 0; break; default: -- 2.21.0

2 1

[alsa-devel] [PATCH 0/4] ASoC: realtek sdw: Add __maybe_unused to PM callbacks
by Takashi Iwai 29 Jan '20

29 Jan '20

Hi, the trivial compile warnings were caught by my build test after pulling Mark's tree. Here are the fixes. Takashi === Takashi Iwai (4): ASoC: rt1308-sdw: Add __maybe_unused to PM callbacks ASoC: rt700: Add __maybe_unused to PM callbacks ASoC: rt711: Add __maybe_unused to PM callbacks ASoC: rt715: Add __maybe_unused to PM callbacks sound/soc/codecs/rt1308-sdw.c | 4 ++-- sound/soc/codecs/rt700-sdw.c | 4 ++-- sound/soc/codecs/rt711-sdw.c | 4 ++-- sound/soc/codecs/rt715-sdw.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) -- 2.16.4

2 8

[alsa-devel] Question about the right fix for a sparse warning
by Sridharan, Ranjani 29 Jan '20

29 Jan '20

Hi Takashi, We're seeing the following sparse warning in the SOF code: sound/soc/sof/sof-audio.c:86:31: warning: incorrect type in assignment (different base types) sound/soc/sof/sof-audio.c:86:31: expected restricted snd_pcm_state_t [usertype] state sound/soc/sof/sof-audio.c:86:31: got signed int [signed] [usertype] [explicitly-signed] state The line under scrutiny where we assign "state" is as follows: state = substream->runtime->status->state; and it is defined as snd_pcm_state_t state; There are other places (ex pcm_oss.c) where a similar assignment has been used as well. What fixes the issue is a forced cast to snd_pcm_state_t as below before assigning: state = (__force snd_pcm_state_t)substream->runtime->status->state; Do you think this is acceptable? If not, could you please suggest an alternative? Thanks, Ranjani

3 8

Re: [alsa-devel] [linux-sunxi] [PATCH v3 1/1] drm: sun4i: hdmi: Add support for sun4i HDMI encoder audio
by Chen-Yu Tsai 29 Jan '20

29 Jan '20

On Tue, Jan 28, 2020 at 10:07 PM Stefan Mavrodiev <stefan(a)olimex.com> wrote: > > Add HDMI audio support for the sun4i-hdmi encoder, used on > the older Allwinner chips - A10, A20, A31. > > Most of the code is based on the BSP implementation. In it > dditional formats are supported (S20_3LE and S24_LE), however > there where some problems with them and only S16_LE is left. > > Signed-off-by: Stefan Mavrodiev <stefan(a)olimex.com> > --- > Changes for v3: > - Instead of platfrom_driver dynammicly register/unregister card > - Add Kconfig dependencies > - Restrore drvdata after card unregistering > > Changes for v2: > - Create a new platform driver instead of using the HDMI encoder > - Expose a new kcontrol to the userspace holding the ELD data > - Wrap all macro arguments in parentheses > > drivers/gpu/drm/sun4i/Kconfig | 11 + > drivers/gpu/drm/sun4i/Makefile | 3 + > drivers/gpu/drm/sun4i/sun4i_hdmi.h | 37 ++ > drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c | 450 +++++++++++++++++++++++ > drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 14 + > 5 files changed, 515 insertions(+) > create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c Since this is actually an audio driver, please include all the ALSA / ASoC maintainers and mailing lists (CC-ed). > diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig > index 37e90e42943f..ca2ab5d53dd4 100644 > --- a/drivers/gpu/drm/sun4i/Kconfig > +++ b/drivers/gpu/drm/sun4i/Kconfig > @@ -23,6 +23,17 @@ config DRM_SUN4I_HDMI > Choose this option if you have an Allwinner SoC with an HDMI > controller. > > +config DRM_SUN4I_HDMI_AUDIO > + bool "Allwinner A10 HDMI Audio Support" > + default y > + depends on DRM_SUN4I_HDMI > + depends on SND_SOC=y || SND_SOC=DRM_SUN4I_HDMI > + select SND_PCM_ELD > + select SND_SOC_GENERIC_DMAENGINE_PCM > + help > + Choose this option if you have an Allwinner SoC with an HDMI > + controller and want to use audio. > + > config DRM_SUN4I_HDMI_CEC > bool "Allwinner A10 HDMI CEC Support" > depends on DRM_SUN4I_HDMI > diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile > index 0d04f2447b01..492bfd28ad2e 100644 > --- a/drivers/gpu/drm/sun4i/Makefile > +++ b/drivers/gpu/drm/sun4i/Makefile > @@ -5,6 +5,9 @@ sun4i-frontend-y += sun4i_frontend.o > sun4i-drm-y += sun4i_drv.o > sun4i-drm-y += sun4i_framebuffer.o > > +ifdef CONFIG_DRM_SUN4I_HDMI_AUDIO > +sun4i-drm-hdmi-y += sun4i_hdmi_audio.o > +endif > sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o > sun4i-drm-hdmi-y += sun4i_hdmi_enc.o > sun4i-drm-hdmi-y += sun4i_hdmi_i2c.o > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi.h b/drivers/gpu/drm/sun4i/sun4i_hdmi.h > index 7ad3f06c127e..28621d289655 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_hdmi.h > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi.h > @@ -42,7 +42,32 @@ > #define SUN4I_HDMI_VID_TIMING_POL_VSYNC BIT(1) > #define SUN4I_HDMI_VID_TIMING_POL_HSYNC BIT(0) > > +#define SUN4I_HDMI_AUDIO_CTRL_REG 0x040 > +#define SUN4I_HDMI_AUDIO_CTRL_ENABLE BIT(31) > +#define SUN4I_HDMI_AUDIO_CTRL_RESET BIT(30) > + > +#define SUN4I_HDMI_AUDIO_FMT_REG 0x048 > +#define SUN4I_HDMI_AUDIO_FMT_SRC BIT(31) > +#define SUN4I_HDMI_AUDIO_FMT_LAYOUT BIT(3) > +#define SUN4I_HDMI_AUDIO_FMT_CH_CFG(n) ((n) - 1) > +#define SUN4I_HDMI_AUDIO_FMT_CH_CFG_MASK GENMASK(2, 0) > + > +#define SUN4I_HDMI_AUDIO_PCM_REG 0x4c > +#define SUN4I_HDMI_AUDIO_PCM_CH_MAP(n, m) (((m) - 1) << ((n) * 4)) > +#define SUN4I_HDMI_AUDIO_PCM_CH_MAP_MASK(n) (GENMASK(2, 0) << ((n) * 4)) > + > +#define SUN4I_HDMI_AUDIO_CTS_REG 0x050 > +#define SUN4I_HDMI_AUDIO_CTS(n) ((n) & GENMASK(19, 0)) > + > +#define SUN4I_HDMI_AUDIO_N_REG 0x054 > +#define SUN4I_HDMI_AUDIO_N(n) ((n) & GENMASK(19, 0)) > + > +#define SUN4I_HDMI_AUDIO_STAT0_REG 0x58 > +#define SUN4I_HDMI_AUDIO_STAT0_FREQ(n) ((n) << 24) > +#define SUN4I_HDMI_AUDIO_STAT0_FREQ_MASK GENMASK(27, 24) > + > #define SUN4I_HDMI_AVI_INFOFRAME_REG(n) (0x080 + (n)) > +#define SUN4I_HDMI_AUDIO_INFOFRAME_REG(n) (0x0a0 + (n)) > > #define SUN4I_HDMI_PAD_CTRL0_REG 0x200 > #define SUN4I_HDMI_PAD_CTRL0_BIASEN BIT(31) > @@ -242,6 +267,11 @@ struct sun4i_hdmi_variant { > bool ddc_fifo_has_dir; > }; > > +struct sun4i_hdmi_audio { > + struct snd_soc_card *card; > + u8 channels; > +}; > + > struct sun4i_hdmi { > struct drm_connector connector; > struct drm_encoder encoder; > @@ -283,9 +313,14 @@ struct sun4i_hdmi { > struct regmap_field *field_ddc_sda_en; > struct regmap_field *field_ddc_sck_en; > > + > struct sun4i_drv *drv; > > bool hdmi_monitor; > + bool hdmi_audio; > + > + struct sun4i_hdmi_audio audio; > + > struct cec_adapter *cec_adap; > > const struct sun4i_hdmi_variant *variant; > @@ -294,5 +329,7 @@ struct sun4i_hdmi { > int sun4i_ddc_create(struct sun4i_hdmi *hdmi, struct clk *clk); > int sun4i_tmds_create(struct sun4i_hdmi *hdmi); > int sun4i_hdmi_i2c_create(struct device *dev, struct sun4i_hdmi *hdmi); > +int sun4i_hdmi_audio_create(struct sun4i_hdmi *hdmi); > +void sun4i_hdmi_audio_destroy(struct sun4i_hdmi *hdmi); > > #endif /* _SUN4I_HDMI_H_ */ > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c > new file mode 100644 > index 000000000000..f42f2cea4e9e > --- /dev/null > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c > @@ -0,0 +1,450 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (C) 2020 Olimex Ltd. > + * Author: Stefan Mavrodiev <stefan(a)olimex.com> > + */ > +#include <linux/dma-mapping.h> > +#include <linux/dmaengine.h> > +#include <linux/module.h> > +#include <linux/of_dma.h> > +#include <linux/regmap.h> > + > +#include <drm/drm_print.h> > + > +#include <sound/dmaengine_pcm.h> > +#include <sound/pcm_drm_eld.h> > +#include <sound/pcm_params.h> > +#include <sound/soc.h> > + > +#include "sun4i_hdmi.h" > + > +static int sun4i_hdmi_audio_ctl_eld_info(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_info *uinfo) > +{ > + uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES; > + uinfo->count = MAX_ELD_BYTES; > + return 0; > +} > + > +static int sun4i_hdmi_audio_ctl_eld_get(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); > + struct snd_soc_card *card = snd_soc_component_get_drvdata(component); > + struct sun4i_hdmi *hdmi = snd_soc_card_get_drvdata(card); > + > + memcpy(ucontrol->value.bytes.data, > + hdmi->connector.eld, > + MAX_ELD_BYTES); > + > + return 0; > +} > + > +static const struct snd_kcontrol_new sun4i_hdmi_audio_controls[] = { > + { > + .access = SNDRV_CTL_ELEM_ACCESS_READ | > + SNDRV_CTL_ELEM_ACCESS_VOLATILE, > + .iface = SNDRV_CTL_ELEM_IFACE_PCM, > + .name = "ELD", > + .info = sun4i_hdmi_audio_ctl_eld_info, > + .get = sun4i_hdmi_audio_ctl_eld_get, > + }, > +}; > + > +static const struct snd_soc_dapm_widget sun4i_hdmi_audio_widgets[] = { > + SND_SOC_DAPM_OUTPUT("TX"), > +}; > + > +static const struct snd_soc_dapm_route sun4i_hdmi_audio_routes[] = { > + { "TX", NULL, "Playback" }, > +}; > + > +static const struct snd_soc_component_driver sun4i_hdmi_audio_component = { > + .controls = sun4i_hdmi_audio_controls, > + .num_controls = ARRAY_SIZE(sun4i_hdmi_audio_controls), > + .dapm_widgets = sun4i_hdmi_audio_widgets, > + .num_dapm_widgets = ARRAY_SIZE(sun4i_hdmi_audio_widgets), > + .dapm_routes = sun4i_hdmi_audio_routes, > + .num_dapm_routes = ARRAY_SIZE(sun4i_hdmi_audio_routes), > +}; > + > +static int sun4i_hdmi_audio_startup(struct snd_pcm_substream *substream, > + struct snd_soc_dai *dai) > +{ > + struct snd_soc_card *card = snd_soc_dai_get_drvdata(dai); > + struct sun4i_hdmi *hdmi = snd_soc_card_get_drvdata(card); > + u32 reg; > + int ret; > + > + regmap_write(hdmi->regmap, SUN4I_HDMI_AUDIO_CTRL_REG, 0); > + regmap_write(hdmi->regmap, > + SUN4I_HDMI_AUDIO_CTRL_REG, > + SUN4I_HDMI_AUDIO_CTRL_RESET); > + ret = regmap_read_poll_timeout(hdmi->regmap, > + SUN4I_HDMI_AUDIO_CTRL_REG, > + reg, !reg, 100, 50000); > + if (ret < 0) { > + DRM_ERROR("Failed to reset HDMI Audio\n"); > + return ret; > + } > + > + regmap_write(hdmi->regmap, > + SUN4I_HDMI_AUDIO_CTRL_REG, > + SUN4I_HDMI_AUDIO_CTRL_ENABLE); > + > + return snd_pcm_hw_constraint_eld(substream->runtime, > + hdmi->connector.eld); > +} > + > +static void sun4i_hdmi_audio_shutdown(struct snd_pcm_substream *substream, > + struct snd_soc_dai *dai) > +{ > + struct snd_soc_card *card = snd_soc_dai_get_drvdata(dai); > + struct sun4i_hdmi *hdmi = snd_soc_card_get_drvdata(card); > + > + regmap_write(hdmi->regmap, SUN4I_HDMI_AUDIO_CTRL_REG, 0); > +} > + > +static int sun4i_hdmi_setup_audio_infoframes(struct sun4i_hdmi *hdmi) > +{ > + union hdmi_infoframe frame; > + u8 buffer[14]; > + int i, ret; > + > + ret = hdmi_audio_infoframe_init(&frame.audio); > + if (ret < 0) { > + DRM_ERROR("Failed to init HDMI audio infoframe\n"); > + return ret; > + } > + > + frame.audio.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM; > + frame.audio.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM; > + frame.audio.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM; > + frame.audio.channels = hdmi->audio.channels; > + > + ret = hdmi_infoframe_pack(&frame, buffer, sizeof(buffer)); > + if (ret < 0) { > + DRM_ERROR("Failed to pack HDMI audio infoframe\n"); > + return ret; > + } > + > + for (i = 0; i < sizeof(buffer); i++) > + writeb(buffer[i], > + hdmi->base + SUN4I_HDMI_AUDIO_INFOFRAME_REG(i)); > + > + return 0; > +} > + > +static void sun4i_hdmi_audio_set_cts_n(struct sun4i_hdmi *hdmi, > + struct snd_pcm_hw_params *params) > +{ > + struct drm_encoder *encoder = &hdmi->encoder; > + struct drm_crtc *crtc = encoder->crtc; > + const struct drm_display_mode *mode = &crtc->state->adjusted_mode; > + u32 rate = params_rate(params); > + u32 n, cts; > + u64 tmp; > + > + /** > + * Calculate Cycle Time Stamp (CTS) and Numerator (N): > + * > + * N = 128 * Samplerate / 1000 > + * CTS = (Ftdms * N) / (128 * Samplerate) > + */ > + > + n = 128 * rate / 1000; > + tmp = (u64)(mode->clock * 1000) * n; > + do_div(tmp, 128 * rate); > + cts = tmp; > + > + regmap_write(hdmi->regmap, > + SUN4I_HDMI_AUDIO_CTS_REG, > + SUN4I_HDMI_AUDIO_CTS(cts)); > + > + regmap_write(hdmi->regmap, > + SUN4I_HDMI_AUDIO_N_REG, > + SUN4I_HDMI_AUDIO_N(n)); > +} > + > +static int sun4i_hdmi_audio_set_hw_rate(struct sun4i_hdmi *hdmi, > + struct snd_pcm_hw_params *params) > +{ > + u32 rate = params_rate(params); > + u32 val; > + > + switch (rate) { > + case 44100: > + val = 0x0; > + break; > + case 48000: > + val = 0x2; > + break; > + case 32000: > + val = 0x3; > + break; > + case 88200: > + val = 0x8; > + break; > + case 96000: > + val = 0x9; > + break; > + case 176400: > + val = 0xc; > + break; > + case 192000: > + val = 0xe; > + break; > + default: > + return -EINVAL; > + } > + > + regmap_update_bits(hdmi->regmap, > + SUN4I_HDMI_AUDIO_STAT0_REG, > + SUN4I_HDMI_AUDIO_STAT0_FREQ_MASK, > + SUN4I_HDMI_AUDIO_STAT0_FREQ(val)); > + > + return 0; > +} > + > +static int sun4i_hdmi_audio_set_hw_channels(struct sun4i_hdmi *hdmi, > + struct snd_pcm_hw_params *params) > +{ > + u32 channels = params_channels(params); > + > + if (channels > 8) > + return -EINVAL; > + > + hdmi->audio.channels = channels; > + > + regmap_update_bits(hdmi->regmap, > + SUN4I_HDMI_AUDIO_FMT_REG, > + SUN4I_HDMI_AUDIO_FMT_LAYOUT, > + (channels > 2) ? SUN4I_HDMI_AUDIO_FMT_LAYOUT : 0); > + > + regmap_update_bits(hdmi->regmap, > + SUN4I_HDMI_AUDIO_FMT_REG, > + SUN4I_HDMI_AUDIO_FMT_CH_CFG_MASK, > + SUN4I_HDMI_AUDIO_FMT_CH_CFG(channels)); > + > + regmap_write(hdmi->regmap, SUN4I_HDMI_AUDIO_PCM_REG, 0x76543210); > + > + /** > + * If only one channel is required, send the same sample > + * to the sink device as a left and right channel. > + */ > + if (channels == 1) > + regmap_update_bits(hdmi->regmap, > + SUN4I_HDMI_AUDIO_PCM_REG, > + SUN4I_HDMI_AUDIO_PCM_CH_MAP_MASK(1), > + SUN4I_HDMI_AUDIO_PCM_CH_MAP(1, 1)); > + > + return 0; > +} > + > +static int sun4i_hdmi_audio_hw_params(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params, > + struct snd_soc_dai *dai) > +{ > + struct snd_soc_card *card = snd_soc_dai_get_drvdata(dai); > + struct sun4i_hdmi *hdmi = snd_soc_card_get_drvdata(card); > + int ret; > + > + ret = sun4i_hdmi_audio_set_hw_rate(hdmi, params); > + if (ret < 0) > + return ret; > + > + ret = sun4i_hdmi_audio_set_hw_channels(hdmi, params); > + if (ret < 0) > + return ret; > + > + sun4i_hdmi_audio_set_cts_n(hdmi, params); > + > + return 0; > +} > + > +static int sun4i_hdmi_audio_trigger(struct snd_pcm_substream *substream, > + int cmd, > + struct snd_soc_dai *dai) > +{ > + struct snd_soc_card *card = snd_soc_dai_get_drvdata(dai); > + struct sun4i_hdmi *hdmi = snd_soc_card_get_drvdata(card); > + int ret = 0; > + > + switch (cmd) { > + case SNDRV_PCM_TRIGGER_START: > + ret = sun4i_hdmi_setup_audio_infoframes(hdmi); > + break; > + default: > + break; > + } > + > + return ret; > +} > + > +static const struct snd_soc_dai_ops sun4i_hdmi_audio_dai_ops = { > + .startup = sun4i_hdmi_audio_startup, > + .shutdown = sun4i_hdmi_audio_shutdown, > + .hw_params = sun4i_hdmi_audio_hw_params, > + .trigger = sun4i_hdmi_audio_trigger, > +}; > + > +static int sun4i_hdmi_audio_dai_probe(struct snd_soc_dai *dai) > +{ > + struct snd_dmaengine_dai_dma_data *dma_data; > + > + dma_data = devm_kzalloc(dai->dev, sizeof(*dma_data), GFP_KERNEL); > + if (!dma_data) > + return -ENOMEM; > + > + dma_data->addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; > + dma_data->maxburst = 8; > + > + snd_soc_dai_init_dma_data(dai, dma_data, NULL); > + > + return 0; > +} > + > +static struct snd_soc_dai_driver sun4i_hdmi_audio_dai = { > + .name = "HDMI", > + .ops = &sun4i_hdmi_audio_dai_ops, > + .probe = sun4i_hdmi_audio_dai_probe, > + .playback = { > + .stream_name = "Playback", > + .channels_min = 1, > + .channels_max = 8, > + .formats = SNDRV_PCM_FMTBIT_S16_LE, > + .rates = SNDRV_PCM_RATE_8000_192000, > + }, > +}; > + > +static const struct snd_pcm_hardware sun4i_hdmi_audio_pcm_hardware = { > + .info = SNDRV_PCM_INFO_INTERLEAVED | > + SNDRV_PCM_INFO_BLOCK_TRANSFER | > + SNDRV_PCM_INFO_MMAP | > + SNDRV_PCM_INFO_MMAP_VALID | > + SNDRV_PCM_INFO_PAUSE | > + SNDRV_PCM_INFO_RESUME, > + .formats = SNDRV_PCM_FMTBIT_S16_LE, > + .rates = SNDRV_PCM_RATE_8000_192000, > + .rate_min = 8000, > + .rate_max = 192000, > + .channels_min = 1, > + .channels_max = 8, > + .buffer_bytes_max = 128 * 1024, > + .period_bytes_min = 4 * 1024, > + .period_bytes_max = 32 * 1024, > + .periods_min = 2, > + .periods_max = 8, > + .fifo_size = 128, > +}; > + > +static const struct snd_dmaengine_pcm_config sun4i_hdmi_audio_pcm_config = { > + .chan_names[SNDRV_PCM_STREAM_PLAYBACK] = "audio-tx", > + .pcm_hardware = &sun4i_hdmi_audio_pcm_hardware, > + .prealloc_buffer_size = 128 * 1024, > + .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, > +}; > + > +struct snd_soc_card sun4i_hdmi_audio_card = { > + .name = "sun4i-hdmi", > +}; > + > +int sun4i_hdmi_audio_create(struct sun4i_hdmi *hdmi) > +{ > + struct snd_soc_card *card = &sun4i_hdmi_audio_card; > + struct snd_soc_dai_link_component *comp; > + struct snd_soc_dai_link *link; > + int ret; > + > + ret = snd_dmaengine_pcm_register(hdmi->dev, > + &sun4i_hdmi_audio_pcm_config, 0); > + if (ret < 0) { > + DRM_ERROR("Could not register PCM\n"); > + return ret; > + } > + > + ret = snd_soc_register_component(hdmi->dev, > + &sun4i_hdmi_audio_component, > + &sun4i_hdmi_audio_dai, 1); > + if (ret < 0) { > + DRM_ERROR("Could not register DAI\n"); > + goto unregister_pcm; > + } > + > + link = devm_kzalloc(hdmi->dev, sizeof(*link), GFP_KERNEL); > + if (!link) { > + ret = -ENOMEM; > + goto unregister_component; > + } > + > + comp = devm_kzalloc(hdmi->dev, sizeof(*comp) * 3, GFP_KERNEL); > + if (!comp) { > + ret = -ENOMEM; > + goto unregister_component; > + } > + > + link->cpus = &comp[0]; > + link->codecs = &comp[1]; > + link->platforms = &comp[2]; > + > + link->num_cpus = 1; > + link->num_codecs = 1; > + link->num_platforms = 1; > + > + link->playback_only = 1; > + > + link->name = "SUN4I-HDMI"; > + link->stream_name = "SUN4I-HDMI PCM"; > + > + link->codecs->name = dev_name(hdmi->dev); > + link->codecs->dai_name = sun4i_hdmi_audio_dai.name; > + > + link->cpus->dai_name = dev_name(hdmi->dev); > + > + link->platforms->name = dev_name(hdmi->dev); > + > + link->dai_fmt = SND_SOC_DAIFMT_I2S; > + > + card->dai_link = link; > + card->num_links = 1; > + card->dev = hdmi->dev; > + > + hdmi->audio.card = card; > + > + /** > + * snd_soc_register_card() will overwrite the driver_data pointer. > + * So before registering the card, store the original pointer in > + * card->drvdata. > + */ > + snd_soc_card_set_drvdata(card, hdmi); > + ret = snd_soc_register_card(card); > + if (ret) > + goto unregister_component; So using ASoC with all the components IMHO is just adding dead weight. The audio interface for this particular hardware is just a FIFO that needs to be written to by an external DMA engine, and a bunch of controls to setup the parameters of the HDMI audio stream. There's no power sequencing to do, and no actual individual components to control. There's no reason you couldn't use just the ALSA DMAENGINE helpers to create a simple ALSA sound card. (Maybe we could clean it up after it's merged? Would there be any issues with backward compatibility?) I think the only example of this besides ASoC is the PXA2xx sound library and AC97 driver: - sound/arm/pxa2xx-pcm-lib.c - sound/arm/pxa2xx-ac97.c Regards ChenYu > + > + return 0; > + > +unregister_component: > + snd_soc_unregister_component(hdmi->dev); > +unregister_pcm: > + snd_dmaengine_pcm_unregister(hdmi->dev); > + return ret; > +} > + > +void sun4i_hdmi_audio_destroy(struct sun4i_hdmi *hdmi) > +{ > + struct snd_soc_card *card = hdmi->audio.card; > + void *data; > + > + /** > + * Before removing the card, restore the previously stored driver_data. > + * This will ensure proper removal of the sun4i-hdmi module, since it > + * uses dev_get_drvdata() in the unbind function. > + */ > + data = snd_soc_card_get_drvdata(card); > + > + snd_soc_unregister_card(card); > + snd_soc_unregister_component(hdmi->dev); > + snd_dmaengine_pcm_unregister(hdmi->dev); > + > + dev_set_drvdata(hdmi->dev, data); > +} > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > index 68d4644ac2dc..4cd35c97c503 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c > @@ -23,6 +23,8 @@ > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > > +#include <sound/soc.h> > + > #include "sun4i_backend.h" > #include "sun4i_crtc.h" > #include "sun4i_drv.h" > @@ -87,6 +89,10 @@ static void sun4i_hdmi_disable(struct drm_encoder *encoder) > > DRM_DEBUG_DRIVER("Disabling the HDMI Output\n"); > > +#ifdef CONFIG_DRM_SUN4I_HDMI_AUDIO > + sun4i_hdmi_audio_destroy(hdmi); > +#endif > + > val = readl(hdmi->base + SUN4I_HDMI_VID_CTRL_REG); > val &= ~SUN4I_HDMI_VID_CTRL_ENABLE; > writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG); > @@ -114,6 +120,11 @@ static void sun4i_hdmi_enable(struct drm_encoder *encoder) > val |= SUN4I_HDMI_VID_CTRL_HDMI_MODE; > > writel(val, hdmi->base + SUN4I_HDMI_VID_CTRL_REG); > + > +#ifdef CONFIG_DRM_SUN4I_HDMI_AUDIO > + if (hdmi->hdmi_audio && sun4i_hdmi_audio_create(hdmi)) > + DRM_ERROR("Couldn't create the HDMI audio adapter\n"); > +#endif > } > > static void sun4i_hdmi_mode_set(struct drm_encoder *encoder, > @@ -218,6 +229,9 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector) > if (!edid) > return 0; > > +#ifdef CONFIG_DRM_SUN4I_HDMI_AUDIO > + hdmi->hdmi_audio = drm_detect_monitor_audio(edid); > +#endif > hdmi->hdmi_monitor = drm_detect_hdmi_monitor(edid); > DRM_DEBUG_DRIVER("Monitor is %s monitor\n", > hdmi->hdmi_monitor ? "an HDMI" : "a DVI"); > -- > 2.17.1 > > -- > You received this message because you are subscribed to the Google Groups "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe(a)googlegroups.com. > To view this discussion on the web, visit https://groups.google.com/d/msgid/linux-sunxi/20200128140642.8404-2-stefan%….

1 0

[alsa-devel] memory leak in snd_pcm_hw_params
by syzbot 29 Jan '20

29 Jan '20

Hello, syzbot found the following crash on: HEAD commit: b3a60822 Merge branch 'for-v5.6' of git://git.kernel.org:/.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=1351cf66e00000 kernel config: https://syzkaller.appspot.com/x/.config?x=e97a1bc78afb77f dashboard link: https://syzkaller.appspot.com/bug?extid=30edd0f34bfcdc548ac4 compiler: gcc (GCC) 9.0.0 20181231 (experimental) syz repro: https://syzkaller.appspot.com/x/repro.syz?x=14e97735e00000 C reproducer: https://syzkaller.appspot.com/x/repro.c?x=13cd9bc9e00000 IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+30edd0f34bfcdc548ac4(a)syzkaller.appspotmail.com executing program executing program executing program BUG: memory leak unreferenced object 0xffff888108fdefc0 (size 64): comm "syz-executor222", pid 7310, jiffies 4294946025 (age 13.660s) hex dump (first 32 bytes): 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 10 33 02 00 c9 ff ff 00 00 00 00 00 00 00 00 ..3............. backtrace: [<00000000c59c6b0c>] kmemleak_alloc_recursive include/linux/kmemleak.h:43 [inline] [<00000000c59c6b0c>] slab_post_alloc_hook mm/slab.h:586 [inline] [<00000000c59c6b0c>] slab_alloc mm/slab.c:3320 [inline] [<00000000c59c6b0c>] kmem_cache_alloc_trace+0x145/0x2c0 mm/slab.c:3549 [<00000000478172ce>] kmalloc include/linux/slab.h:556 [inline] [<00000000478172ce>] kzalloc include/linux/slab.h:670 [inline] [<00000000478172ce>] snd_pcm_lib_malloc_pages+0x12b/0x200 sound/core/pcm_memory.c:404 [<0000000091532e16>] snd_pcm_hw_params+0x720/0x830 sound/core/pcm_native.c:691 [<000000002070a986>] snd_pcm_kernel_ioctl+0xb5/0x170 sound/core/pcm_native.c:3238 [<00000000394e99f4>] snd_pcm_oss_change_params_locked+0x745/0x1140 sound/core/oss/pcm_oss.c:944 [<00000000c81f42ac>] snd_pcm_oss_change_params+0x43/0x80 sound/core/oss/pcm_oss.c:1087 [<000000007710a1c0>] snd_pcm_oss_make_ready+0x55/0xc0 sound/core/oss/pcm_oss.c:1146 [<0000000069305204>] snd_pcm_oss_sync.isra.0+0xb8/0x310 sound/core/oss/pcm_oss.c:1707 [<00000000692460c8>] snd_pcm_oss_release+0xef/0x100 sound/core/oss/pcm_oss.c:2545 [<0000000013ba02c9>] __fput+0xed/0x300 fs/file_table.c:280 [<0000000080810f18>] ____fput+0x16/0x20 fs/file_table.c:313 [<00000000e6bb3aa6>] task_work_run+0x9d/0xc0 kernel/task_work.c:113 [<00000000b6ce71eb>] exit_task_work include/linux/task_work.h:22 [inline] [<00000000b6ce71eb>] do_exit+0x3fa/0xe20 kernel/exit.c:801 [<0000000045ce7ad3>] do_group_exit+0x4b/0xe0 kernel/exit.c:899 [<00000000aeb85903>] __do_sys_exit_group kernel/exit.c:910 [inline] [<00000000aeb85903>] __se_sys_exit_group kernel/exit.c:908 [inline] [<00000000aeb85903>] __x64_sys_exit_group+0x1c/0x20 kernel/exit.c:908 [<000000008b12db16>] do_syscall_64+0x73/0x220 arch/x86/entry/common.c:294 --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot. syzbot can test patches for this bug, for details see: https://goo.gl/tpsmEJ#testing-patches

1 0

[alsa-devel] issue with alsa lib (ucm vs ucm2 folders?)
by Pedro Costa 29 Jan '20

29 Jan '20

Dear all, My apologies in advance for a very non-technical feedback from a non-expert. I was unable to get sound output after updating alsa-lib on my Manjaro Linux system. I managed to get it working after downgrading it to version 1.1.9.2. It seems that I faced the same problem as reported here: https://bbs.archlinux.org/viewtopic.php?id=251113 You may already be aware of the issue, but just in case I would like be sure that you are! Best regards, Pedro Costa

2 1

[alsa-devel] [CX2075] No sound after suspend/resume from front speaker
by Roman Šmakal 29 Jan '20

29 Jan '20

Hi, this still seem to be an issue. After startup everything works well until the laptop goes to suspend. Tried pretty much everything basic user can do (unmutes, rmmods and so on), still no way to wake the output. ALSA seems to be thinking, that output is active, you can set volume and stuff, but nothing happens. ALSA info: http://alsa-project.org/db/?f=9d1ee81fe037acb53ca381f2de27be420f83a373 Related links: https://www.reddit.com/r/archlinux/comments/4nwzua/ no_sound_after_suspend_killing_or_restarting/ https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1612916 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=851404 Regards Roman

2 1

[alsa-devel] [PATCH v6 00/11] ASoC: Add support to WCD9340/WCD9341 codec
by Srinivas Kandagatla 29 Jan '20

29 Jan '20

This patchset adds support to Qualcomm WCD9340/WCD9341 Codec which is a standalone Hi-Fi audio codec IC. This codec supports both I2S/I2C and SLIMbus audio interfaces. On slimbus interface it supports two data lanes; 16 Tx ports and 8 Rx ports. It has Five DACs and seven dedicated interpolators, Multibutton headset control (MBHC), Active noise cancellation, Sidetone paths, MAD (mic activity detection) and codec processing engine. It supports Class-H differential earpiece out and stereo single ended headphones out. This codec also has integrated SoundWire controller. Patchset for this is already sent for review. This patchset has been tested on SDM845 based DragonBoard DB845c and Lenovo Yoga C630 laptop with WSA881x smart speaker amplifiers via soundwire and 4 DMICs. gpio controller patch does not have any link dependency, it can go by its own. Most of the code in this driver is rework of Qualcomm downstream drivers used in Andriod. Credits to Banajit Goswami and Patrick Lai's Team. Thanks, srini Changes since v5: - added correct MFD dependency to codec driver Srinivas Kandagatla (11): ASoC: dt-bindings: add dt bindings for WCD9340/WCD9341 audio codec mfd: wcd934x: add support to wcd9340/wcd9341 codec ASoC: wcd934x: add support to wcd9340/wcd9341 codec ASoC: wcd934x: add basic controls ASoC: wcd934x: add playback dapm widgets ASoC: wcd934x: add capture dapm widgets ASoC: wcd934x: add audio routings dt-bindings: gpio: wcd934x: Add bindings for gpio gpio: wcd934x: Add support to wcd934x gpio controller ASoC: qcom: dt-bindings: Add compatible for DB845c and Lenovo Yoga ASoC: qcom: sdm845: add support to DB845c and Lenovo Yoga .../bindings/gpio/qcom,wcd934x-gpio.yaml | 47 + .../devicetree/bindings/sound/qcom,sdm845.txt | 5 +- .../bindings/sound/qcom,wcd934x.yaml | 175 + drivers/gpio/Kconfig | 8 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-wcd934x.c | 104 + drivers/mfd/Kconfig | 12 + drivers/mfd/Makefile | 1 + drivers/mfd/wcd934x.c | 306 + include/linux/mfd/wcd934x/registers.h | 531 ++ include/linux/mfd/wcd934x/wcd934x.h | 31 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wcd934x.c | 5084 +++++++++++++++++ sound/soc/qcom/sdm845.c | 86 +- 15 files changed, 6399 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml create mode 100644 drivers/gpio/gpio-wcd934x.c create mode 100644 drivers/mfd/wcd934x.c create mode 100644 include/linux/mfd/wcd934x/registers.h create mode 100644 include/linux/mfd/wcd934x/wcd934x.h create mode 100644 sound/soc/codecs/wcd934x.c -- 2.21.0

6 23

[alsa-devel] [PATCH] ASoC: amd: raven: Make the driver name consistent across files
by Akshu Agrawal 29 Jan '20

29 Jan '20

This fixes the issue of driver not getting auto loaded with MODULE_ALIAS. With this patch: find /sys/devices -name modalias -print0 | xargs -0 grep -i acp3x /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_i2s_playcap.2/modalias:platform:acp3x_i2s_playcap /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_i2s_playcap.0/modalias:platform:acp3x_i2s_playcap /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_rv_i2s_dma.0/modalias:platform:acp3x_rv_i2s_dma /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_i2s_playcap.1/modalias:platform:acp3x_i2s_playcap Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 6 +++--- sound/soc/amd/raven/acp3x-pcm-dma.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index bf51cadf8682..8619ed5f08ef 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -15,7 +15,7 @@ #include "acp3x.h" -#define DRV_NAME "acp3x-i2s" +#define DRV_NAME "acp3x_i2s_playcap" static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) @@ -276,7 +276,7 @@ static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { }; static const struct snd_soc_component_driver acp3x_dai_component = { - .name = "acp3x-i2s", + .name = DRV_NAME, }; static struct snd_soc_dai_driver acp3x_i2s_dai = { @@ -355,4 +355,4 @@ module_platform_driver(acp3x_dai_driver); MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS("platform:"DRV_NAME); diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index aecc3c061679..c865aeca6907 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -15,7 +15,7 @@ #include "acp3x.h" -#define DRV_NAME "acp3x-i2s-audio" +#define DRV_NAME "acp3x_rv_i2s_dma" static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { .info = SNDRV_PCM_INFO_INTERLEAVED | @@ -534,4 +534,4 @@ MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_AUTHOR("Vijendar.Mukunda(a)amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS("platform:"DRV_NAME); -- 2.17.1

1 0

[alsa-devel] [PATCH] ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug
by Cezary Rojewski 28 Jan '20

28 Jan '20

Definitions for idisp snd_soc_dai_links within skl_hda_dsp_common are missing platform component. Add it to address following bug reported by KASAN: [ 10.538502] BUG: KASAN: global-out-of-bounds in skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538509] Write of size 8 at addr ffffffffc0606840 by task systemd-udevd/299 (...) [ 10.538519] Call Trace: [ 10.538524] dump_stack+0x62/0x95 [ 10.538528] print_address_description+0x2f5/0x3b0 [ 10.538532] ? skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538535] __kasan_report+0x134/0x191 [ 10.538538] ? skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538542] ? skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538544] kasan_report+0x12/0x20 [ 10.538546] __asan_store8+0x57/0x90 [ 10.538550] skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538553] platform_drv_probe+0x51/0xb0 [ 10.538556] really_probe+0x311/0x600 [ 10.538559] driver_probe_device+0x87/0x1b0 [ 10.538562] device_driver_attach+0x8f/0xa0 [ 10.538565] ? device_driver_attach+0xa0/0xa0 [ 10.538567] __driver_attach+0x102/0x1a0 [ 10.538569] ? device_driver_attach+0xa0/0xa0 [ 10.538572] bus_for_each_dev+0xe8/0x160 [ 10.538574] ? subsys_dev_iter_exit+0x10/0x10 [ 10.538577] ? preempt_count_sub+0x18/0xc0 [ 10.538580] ? _raw_write_unlock+0x1f/0x40 [ 10.538582] driver_attach+0x2b/0x30 [ 10.538585] bus_add_driver+0x251/0x340 [ 10.538588] driver_register+0xd3/0x1c0 [ 10.538590] __platform_driver_register+0x6c/0x80 [ 10.538592] ? 0xffffffffc03e8000 [ 10.538595] skl_hda_audio_init+0x1c/0x1000 [snd_soc_skl_hda_dsp] [ 10.538598] do_one_initcall+0xd0/0x36a [ 10.538600] ? trace_event_raw_event_initcall_finish+0x160/0x160 [ 10.538602] ? kasan_unpoison_shadow+0x36/0x50 [ 10.538605] ? __kasan_kmalloc+0xcc/0xe0 [ 10.538607] ? kasan_unpoison_shadow+0x36/0x50 [ 10.538609] ? kasan_poison_shadow+0x2f/0x40 [ 10.538612] ? __asan_register_globals+0x65/0x80 [ 10.538615] do_init_module+0xf9/0x36f [ 10.538619] load_module+0x398e/0x4590 [ 10.538625] ? module_frob_arch_sections+0x20/0x20 [ 10.538628] ? __kasan_check_write+0x14/0x20 [ 10.538630] ? kernel_read+0x9a/0xc0 [ 10.538632] ? __kasan_check_write+0x14/0x20 [ 10.538634] ? kernel_read_file+0x1d3/0x3c0 [ 10.538638] ? cap_capable+0xca/0x110 [ 10.538642] __do_sys_finit_module+0x190/0x1d0 [ 10.538644] ? __do_sys_finit_module+0x190/0x1d0 [ 10.538646] ? __x64_sys_init_module+0x50/0x50 [ 10.538649] ? expand_files+0x380/0x380 [ 10.538652] ? __kasan_check_write+0x14/0x20 [ 10.538654] ? fput_many+0x20/0xc0 [ 10.538658] __x64_sys_finit_module+0x43/0x50 [ 10.538660] do_syscall_64+0xce/0x700 [ 10.538662] ? syscall_return_slowpath+0x230/0x230 [ 10.538665] ? __do_page_fault+0x51e/0x640 [ 10.538668] ? __kasan_check_read+0x11/0x20 [ 10.538670] ? prepare_exit_to_usermode+0xc7/0x200 [ 10.538673] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: a78959f407e6 ("ASoC: Intel: skl_hda_dsp_common: use modern dai_link style") Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- sound/soc/intel/boards/skl_hda_dsp_common.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c index eb419e1ec42b..78ff5f24c40e 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.c +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c @@ -41,16 +41,19 @@ int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device) return 0; } -SND_SOC_DAILINK_DEFS(idisp1, - DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")), +SND_SOC_DAILINK_DEF(idisp1_cpu, + DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin"))); +SND_SOC_DAILINK_DEF(idisp1_codec, DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi1"))); -SND_SOC_DAILINK_DEFS(idisp2, - DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin")), +SND_SOC_DAILINK_DEF(idisp2_cpu, + DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin"))); +SND_SOC_DAILINK_DEF(idisp2_codec, DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi2"))); -SND_SOC_DAILINK_DEFS(idisp3, - DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin")), +SND_SOC_DAILINK_DEF(idisp3_cpu, + DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin"))); +SND_SOC_DAILINK_DEF(idisp3_codec, DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi3"))); SND_SOC_DAILINK_DEF(analog_cpu, @@ -83,21 +86,21 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = { .id = 1, .dpcm_playback = 1, .no_pcm = 1, - SND_SOC_DAILINK_REG(idisp1), + SND_SOC_DAILINK_REG(idisp1_cpu, idisp1_codec, platform), }, { .name = "iDisp2", .id = 2, .dpcm_playback = 1, .no_pcm = 1, - SND_SOC_DAILINK_REG(idisp2), + SND_SOC_DAILINK_REG(idisp2_cpu, idisp2_codec, platform), }, { .name = "iDisp3", .id = 3, .dpcm_playback = 1, .no_pcm = 1, - SND_SOC_DAILINK_REG(idisp3), + SND_SOC_DAILINK_REG(idisp3_cpu, idisp3_codec, platform), }, { .name = "Analog Playback and Capture", -- 2.17.1

6 14