From: Mark Brown <broonie@kernel.org>
Date: Wed, 9 Aug 2023 23:19:02 +0000 (+0100)
Subject: ASoC: Merge up fixes
X-Git-Tag: v6.6.7~1940^2^2~122
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81113108491edc277d61337ea410c5f89d85faa3;p=platform%2Fkernel%2Flinux-starfive.git

ASoC: Merge up fixes

For the benefit of CI
---

81113108491edc277d61337ea410c5f89d85faa3
diff --cc sound/soc/sof/ipc4-topology.c
index 0196cbf,11361e1..b436638
--- a/sound/soc/sof/ipc4-topology.c
+++ b/sound/soc/sof/ipc4-topology.c
@@@ -1731,6 -1731,9 +1731,12 @@@ sof_ipc4_prepare_copier_module(struct s
  
  	*ipc_config_size = ipc_size;
  
+ 	/* update pipeline memory usage */
+ 	sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);
+ 
++	/* update pipeline memory usage */
++	sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);
++
  	/* copy IPC data */
  	memcpy(*ipc_config_data, (void *)copier_data, sizeof(*copier_data));
  	if (gtw_cfg_config_length)
@@@ -1743,15 -1746,6 +1749,12 @@@
  		       gtw_cfg_config_length,
  		       &ipc4_copier->dma_config_tlv, dma_config_tlv_size);
  
- 	/* update pipeline memory usage */
- 	sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);
- 
 +	/*
 +	 * Restore gateway config length now that IPC payload is prepared. This avoids
 +	 * counting the DMA CONFIG TLV multiple times
 +	 */
 +	copier_data->gtw_cfg.config_length = gtw_cfg_config_length / 4;
 +
  	return 0;
  }