Unverified Commit cf0de67d authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: qdsp6: audioreach: add support for MFC Module 



Add support to enable and configure Media Format Converter (MFC) Module.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221027102710.21407-9-srinivas.kandagatla@linaro.org


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

sound/soc/qcom/qdsp6/audioreach.c

+52 −1
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ struct apm_module_hw_ep_mf_cfg { 


#define APM_HW_EP_CFG_PSIZE ALIGN(sizeof(struct apm_module_hw_ep_mf_cfg), 8)



#define APM_MFC_CFG_PSIZE(p, n) ALIGN(struct_size(p, channel_mapping, n), 4)



struct apm_module_frame_size_factor_cfg {

	struct apm_module_param_data param_data;

	uint32_t frame_size_factor;
@@ -729,6 +731,53 @@ static int audioreach_sal_set_media_format(struct q6apm_graph *graph, 
	return rc;

}



static int audioreach_mfc_set_media_format(struct q6apm_graph *graph,

					   struct audioreach_module *module,

					   struct audioreach_module_config *cfg)

{

	struct apm_module_param_data *param_data;

	struct param_id_mfc_media_format *media_format;

	uint32_t num_channels = cfg->num_channels;

	int payload_size;

	struct gpr_pkt *pkt;

	int rc;

	void *p;



	payload_size = APM_MFC_CFG_PSIZE(media_format, num_channels) +

		APM_MODULE_PARAM_DATA_SIZE;



	pkt = audioreach_alloc_apm_cmd_pkt(payload_size, APM_CMD_SET_CFG, 0);

	if (IS_ERR(pkt))

		return PTR_ERR(pkt);



	p = (void *)pkt + GPR_HDR_SIZE + APM_CMD_HDR_SIZE;



	param_data = p;

	param_data->module_instance_id = module->instance_id;

	param_data->error_code = 0;

	param_data->param_id = PARAM_ID_MFC_OUTPUT_MEDIA_FORMAT;

	param_data->param_size = APM_MFC_CFG_PSIZE(media_format, num_channels);

	p = p + APM_MODULE_PARAM_DATA_SIZE;

	media_format = p;



	media_format->sample_rate = cfg->sample_rate;

	media_format->bit_width = cfg->bit_width;

	media_format->num_channels = cfg->num_channels;



	if (num_channels == 1) {

		media_format->channel_mapping[0] = PCM_CHANNEL_L;

	} else if (num_channels == 2) {

		media_format->channel_mapping[0] = PCM_CHANNEL_L;

		media_format->channel_mapping[1] = PCM_CHANNEL_R;

	}



	rc = q6apm_send_cmd_sync(graph->apm, pkt, 0);



	kfree(pkt);



	return rc;

}



static int audioreach_i2s_set_media_format(struct q6apm_graph *graph,

					   struct audioreach_module *module,

					   struct audioreach_module_config *cfg)
@@ -1054,7 +1103,9 @@ int audioreach_set_media_format(struct q6apm_graph *graph, struct audioreach_mod 
		if (!rc)

			rc = audioreach_sal_limiter_enable(graph, module, true);

		break;



	case MODULE_ID_MFC:

		rc = audioreach_mfc_set_media_format(graph, module, cfg);

		break;

	default:

		rc = 0;

	}

sound/soc/qcom/qdsp6/audioreach.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ struct q6apm_graph; 
#define MODULE_ID_PCM_ENC		0x07001004

#define MODULE_ID_PCM_DEC		0x07001005

#define MODULE_ID_SAL			0x07001010

#define MODULE_ID_MFC			0x07001015

#define MODULE_ID_CODEC_DMA_SINK	0x07001023

#define MODULE_ID_CODEC_DMA_SOURCE	0x07001024

#define MODULE_ID_I2S_SINK		0x0700100A