Merge "ASoC: msm: increase slimbus channel FIFO watermark value" (a0f80a03) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/msm-dai-slim.c

+19 −3

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ struct msm_slim_dai_data {
		u8 status;
		struct snd_soc_dai_driver *dai_drv;
		struct msm_slim_dma_data dma_data;
		struct slim_port_cfg port_cfg;
		};

		struct msm_dai_slim_drv_data {
		@@ -137,6 +138,16 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
		goto done;
		}

		rc = slim_config_mgrports(sdev, &(dma_data->ph),
		dai_data->ch_cnt,
		&(dai_data->port_cfg));
		if (IS_ERR_VALUE(rc)) {
		dev_err(&sdev->dev,
		"%s: config mgrport failed rc %d\n",
		__func__ , rc);
		goto err_done;
		}

		for (i = 0; i < dai_data->ch_cnt; i++) {
		rc = slim_connect_sink(sdev,
		&dma_data->ph, 1,
		@@ -145,7 +156,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
		dev_err(&sdev->dev,
		"%s: slim_connect_sink failed, ch = %d, err = %d\n",
		__func__, i, rc);
		goto err_connect_sink;
		goto err_done;
		}
		}

		@@ -156,7 +167,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,
		dev_err(&sdev->dev,
		"%s: slim activate ch failed, err = %d\n",
		__func__, rc);
		goto err_connect_sink;
		goto err_done;
		}
		/* Mark dai status as running */
		SET_DAI_STATE(dai_data->status, DAI_STATE_RUNNING);
		@@ -192,7 +203,7 @@ static int msm_dai_slim_ch_ctl(struct msm_slim_dma_data *dma_data,

		return rc;

		err_connect_sink:
		err_done:
		rc1 = slim_dealloc_mgrports(sdev,
		&dma_data->ph, 1);
		if (IS_ERR_VALUE(rc1))
		@@ -229,6 +240,11 @@ static int msm_dai_slim_hw_params(
		}

		dai_data->rate = params_rate(params);
		dai_data->port_cfg.port_opts = SLIM_OPT_NONE;
		if (dai_data->rate >= SNDRV_PCM_RATE_48000)
		dai_data->port_cfg.watermark = 16;
		else
		dai_data->port_cfg.watermark = 8;

		switch (params_format(params)) {
		case SNDRV_PCM_FORMAT_S16_LE: