Unverified Commit 19c745d1 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: ipc4-topology: Rename sof_ipc4_update_pipeline_mem_usage() to be generic 



Rename sof_ipc4_update_pipeline_mem_usage() to
sof_ipc4_update_resource_usage() in order to be re-usable for generic
resource storage, calculation of a module, like CPC adjustment.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20230522101313.12519-4-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fe04f300

sound/soc/sof/ipc4-topology.c

+7 −7
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ static void sof_ipc4_widget_free_comp_process(struct snd_sof_widget *swidget) 
}



static void

sof_ipc4_update_pipeline_mem_usage(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,

sof_ipc4_update_resource_usage(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget,

			       struct sof_ipc4_base_module_cfg *base_config)

{

	struct sof_ipc4_fw_module *fw_module = swidget->module_info;
@@ -1711,7 +1711,7 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget, 
		       *data, copier_data->gtw_cfg.config_length * 4);



	/* update pipeline memory usage */

	sof_ipc4_update_pipeline_mem_usage(sdev, swidget, &copier_data->base_config);

	sof_ipc4_update_resource_usage(sdev, swidget, &copier_data->base_config);



	return 0;

}
@@ -1748,7 +1748,7 @@ static int sof_ipc4_prepare_gain_module(struct snd_sof_widget *swidget, 
	}



	/* update pipeline memory usage */

	sof_ipc4_update_pipeline_mem_usage(sdev, swidget, &gain->base_config);

	sof_ipc4_update_resource_usage(sdev, swidget, &gain->base_config);



	return 0;

}
@@ -1785,7 +1785,7 @@ static int sof_ipc4_prepare_mixer_module(struct snd_sof_widget *swidget, 
	}



	/* update pipeline memory usage */

	sof_ipc4_update_pipeline_mem_usage(sdev, swidget, &mixer->base_config);

	sof_ipc4_update_resource_usage(sdev, swidget, &mixer->base_config);



	return 0;

}
@@ -1822,7 +1822,7 @@ static int sof_ipc4_prepare_src_module(struct snd_sof_widget *swidget, 
	}



	/* update pipeline memory usage */

	sof_ipc4_update_pipeline_mem_usage(sdev, swidget, &src->base_config);

	sof_ipc4_update_resource_usage(sdev, swidget, &src->base_config);



	/* update pipeline_params for sink widgets */

	rate = hw_param_interval(pipeline_params, SNDRV_PCM_HW_PARAM_RATE);
@@ -1959,7 +1959,7 @@ static int sof_ipc4_prepare_process_module(struct snd_sof_widget *swidget, 
	}



	/* update pipeline memory usage */

	sof_ipc4_update_pipeline_mem_usage(sdev, swidget, &process->base_config);

	sof_ipc4_update_resource_usage(sdev, swidget, &process->base_config);



	/* ipc_config_data is composed of the base_config followed by an optional extension */

	memcpy(cfg, &process->base_config, sizeof(struct sof_ipc4_base_module_cfg));