diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-21 17:46:13 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-21 17:46:13 +0100 |
| commit | 981212ff6770719d416cfdad9744a7c3a31dd4dd (patch) | |
| tree | 4c5785159418975dd7f7191bd9d2f31749fe58b2 /sound | |
| parent | 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff) | |
| parent | 5b43af6d25461d7de293e0704d3b4631dda9b1e8 (diff) | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/skylake/skl-messages.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index eca85827dbd2..fb2f1f603f3c 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -540,6 +540,14 @@ static void skl_setup_cpr_gateway_cfg(struct skl_sst *ctx, cpr_mconfig->gtw_cfg.dma_buffer_size = mconfig->dma_buffer_size * dma_io_buf; + /* fallback to 2ms default value */ + if (!cpr_mconfig->gtw_cfg.dma_buffer_size) { + if (mconfig->hw_conn_type == SKL_CONN_SOURCE) + cpr_mconfig->gtw_cfg.dma_buffer_size = 2 * mconfig->obs; + else + cpr_mconfig->gtw_cfg.dma_buffer_size = 2 * mconfig->ibs; + } + cpr_mconfig->cpr_feature_mask = 0; cpr_mconfig->gtw_cfg.config_length = 0; |