ASoC: ti: davinci-mcasp: Set min period size using FIFO config
authorJai Luthra <j-luthra@ti.com>
Tue, 11 Jun 2024 12:32:56 +0000 (18:02 +0530)
committerMark Brown <broonie@kernel.org>
Tue, 11 Jun 2024 16:13:32 +0000 (17:13 +0100)
The minimum period size was enforced to 64 as older devices integrating
McASP with EDMA used an internal FIFO of 64 samples.

With UDMA based platforms this internal McASP FIFO is optional, as the
DMA engine internally does some buffering which is already accounted for
when registering the platform. So we should read the actual FIFO
configuration (txnumevt/rxnumevt) instead of hardcoding frames.min to
64.

Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Signed-off-by: Jai Luthra <j-luthra@ti.com>
Link: https://lore.kernel.org/r/20240611-asoc_next-v3-2-fcfd84b12164@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/davinci-mcasp.c

index 1e760c3155213db093ff09a12b922eb43c3ba4c4..2b1ed91a736c9af444887891c11382793629c2aa 100644 (file)
@@ -1472,10 +1472,11 @@ static int davinci_mcasp_hw_rule_min_periodsize(
 {
        struct snd_interval *period_size = hw_param_interval(params,
                                                SNDRV_PCM_HW_PARAM_PERIOD_SIZE);
+       u8 numevt = *((u8 *)rule->private);
        struct snd_interval frames;
 
        snd_interval_any(&frames);
-       frames.min = 64;
+       frames.min = numevt;
        frames.integer = 1;
 
        return snd_interval_refine(period_size, &frames);
@@ -1490,6 +1491,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,
        u32 max_channels = 0;
        int i, dir, ret;
        int tdm_slots = mcasp->tdm_slots;
+       u8 *numevt;
 
        /* Do not allow more then one stream per direction */
        if (mcasp->substreams[substream->stream])
@@ -1589,9 +1591,12 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream,
                        return ret;
        }
 
+       numevt = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
+                        &mcasp->txnumevt :
+                        &mcasp->rxnumevt;
        snd_pcm_hw_rule_add(substream->runtime, 0,
                            SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-                           davinci_mcasp_hw_rule_min_periodsize, NULL,
+                           davinci_mcasp_hw_rule_min_periodsize, numevt,
                            SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1);
 
        return 0;