diff options
| author | Jaska Uimonen <jaska.uimonen@linux.intel.com> | 2022-05-20 07:51:37 +0300 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2022-05-31 14:10:25 +0200 |
| commit | 96ddc346e0e11c4e119fafe9cbb8a154e6596228 (patch) | |
| tree | e909e43f57fd26396d32aa963e539ade913eea15 | |
| parent | 4b959a447aa1e9ce8d0076fc59fa71ff15f025c3 (diff) | |
| download | alsa-utils-96ddc346e0e11c4e119fafe9cbb8a154e6596228.tar.gz | |
topology: plugins: nhlt: fix intel dmic mode calculation
Dmic find_modes function was used with same sampling rate for both fifo
a and b parameter calculations. This bug was found in testing two
simultaneous dmic dais in topology. Fix this by introducing a sampling
rate argument for find_modes.
Fixes: https://github.com/alsa-project/alsa-utils/pull/148
Signed-off-by: Jaska Uimonen <jaska.uimonen@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| -rw-r--r-- | topology/nhlt/intel/dmic/dmic-process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/topology/nhlt/intel/dmic/dmic-process.c b/topology/nhlt/intel/dmic/dmic-process.c index a620c29..3a2fca6 100644 --- a/topology/nhlt/intel/dmic/dmic-process.c +++ b/topology/nhlt/intel/dmic/dmic-process.c @@ -120,10 +120,10 @@ static int norm_int32(int32_t val) * parameters. The parameters such as microphone clock min/max and duty cycle requirements need be * checked from used microphone component datasheet. */ -static void find_modes(struct intel_dmic_params *dmic, struct dmic_calc_decim_modes *modes) +static void find_modes(struct intel_dmic_params *dmic, struct dmic_calc_decim_modes *modes, + uint32_t fs) { int di = dmic->dmic_dai_index; - uint32_t fs = dmic->dmic_prm[di].fifo_fs; int clkdiv_min; int clkdiv_max; int clkdiv; @@ -993,14 +993,14 @@ int dmic_calculate(struct intel_nhlt_params *nhlt) * contains the scale value to use for FIR coefficient RAM write as well as the CIC and FIR * shift values. */ - find_modes(dmic, &modes_a); + find_modes(dmic, &modes_a, dmic->dmic_prm[0].fifo_fs); if (modes_a.num_of_modes == 0 && dmic->dmic_prm[0].fifo_fs > 0) { fprintf(stderr, "dmic_set_config(): No modes found for FIFO A\n"); ret = -EINVAL; goto out; } - find_modes(dmic, &modes_b); + find_modes(dmic, &modes_b, dmic->dmic_prm[1].fifo_fs); if (modes_b.num_of_modes == 0 && dmic->dmic_prm[1].fifo_fs > 0) { fprintf(stderr, "dmic_set_config(): No modes found for FIFO B\n"); ret = -EINVAL; |