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

ASoC: qcom: audioreach: add support for DISPLAY PORT SINK module 



Add support for DISPLAY PORT SINK module and associated configuration.

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


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

sound/soc/qcom/qdsp6/audioreach.c

+75 −0
Original line number Diff line number Diff line
@@ -196,6 +196,12 @@ struct apm_codec_dma_module_intf_cfg { 


#define APM_CDMA_INTF_CFG_PSIZE ALIGN(sizeof(struct apm_codec_dma_module_intf_cfg), 8)



struct apm_display_port_module_intf_cfg {

	struct apm_module_param_data param_data;

	struct param_id_display_port_intf_cfg cfg;

} __packed;

#define APM_DP_INTF_CFG_PSIZE ALIGN(sizeof(struct apm_display_port_module_intf_cfg), 8)



static void *__audioreach_alloc_pkt(int payload_size, uint32_t opcode, uint32_t token,

				    uint32_t src_port, uint32_t dest_port, bool has_cmd_hdr)

{
@@ -582,6 +588,72 @@ int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, struct gpr_pkt *pk 
}

EXPORT_SYMBOL_GPL(audioreach_graph_send_cmd_sync);



static int audioreach_display_port_set_media_format(struct q6apm_graph *graph,

						    struct audioreach_module *module,

						    struct audioreach_module_config *cfg)

{

	struct apm_display_port_module_intf_cfg *intf_cfg;

	struct apm_module_frame_size_factor_cfg *fs_cfg;

	struct apm_module_param_data *param_data;

	struct apm_module_hw_ep_mf_cfg *hw_cfg;

	int ic_sz, ep_sz, fs_sz, dl_sz;

	int rc, payload_size;

	struct gpr_pkt *pkt;

	void *p;



	ic_sz = APM_DP_INTF_CFG_PSIZE;

	ep_sz = APM_HW_EP_CFG_PSIZE;

	fs_sz = APM_FS_CFG_PSIZE;

	dl_sz = 0;



	payload_size = ic_sz + ep_sz + fs_sz + dl_sz;



	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;



	hw_cfg = p;

	param_data = &hw_cfg->param_data;

	param_data->module_instance_id = module->instance_id;

	param_data->error_code = 0;

	param_data->param_id = PARAM_ID_HW_EP_MF_CFG;

	param_data->param_size = ep_sz - APM_MODULE_PARAM_DATA_SIZE;



	hw_cfg->mf.sample_rate = cfg->sample_rate;

	hw_cfg->mf.bit_width = cfg->bit_width;

	hw_cfg->mf.num_channels = cfg->num_channels;

	hw_cfg->mf.data_format = module->data_format;

	p += ep_sz;



	fs_cfg = p;

	param_data = &fs_cfg->param_data;

	param_data->module_instance_id = module->instance_id;

	param_data->error_code = 0;

	param_data->param_id = PARAM_ID_HW_EP_FRAME_SIZE_FACTOR;

	param_data->param_size = fs_sz - APM_MODULE_PARAM_DATA_SIZE;

	fs_cfg->frame_size_factor = 1;

	p += fs_sz;



	intf_cfg = p;

	param_data = &intf_cfg->param_data;

	param_data->module_instance_id = module->instance_id;

	param_data->error_code = 0;

	param_data->param_id = PARAM_ID_DISPLAY_PORT_INTF_CFG;

	param_data->param_size = ic_sz - APM_MODULE_PARAM_DATA_SIZE;



	intf_cfg->cfg.channel_allocation = cfg->channel_allocation;

	intf_cfg->cfg.mst_idx = 0;

	intf_cfg->cfg.dptx_idx = cfg->dp_idx;



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



	kfree(pkt);



	return rc;

}



/* LPASS Codec DMA port Module Media Format Setup */

static int audioreach_codec_dma_set_media_format(struct q6apm_graph *graph,

						 struct audioreach_module *module,
@@ -1122,6 +1194,9 @@ int audioreach_set_media_format(struct q6apm_graph *graph, struct audioreach_mod 
	case MODULE_ID_PCM_CNV:

		rc = audioreach_pcm_set_media_format(graph, module, cfg);

		break;

	case MODULE_ID_DISPLAY_PORT_SINK:

		rc = audioreach_display_port_set_media_format(graph, module, cfg);

		break;

	case MODULE_ID_I2S_SOURCE:

	case MODULE_ID_I2S_SINK:

		rc = audioreach_i2s_set_media_format(graph, module, cfg);

sound/soc/qcom/qdsp6/audioreach.h

+12 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct q6apm_graph; 
#define MODULE_ID_I2S_SINK		0x0700100A

#define MODULE_ID_I2S_SOURCE		0x0700100B

#define MODULE_ID_DATA_LOGGING		0x0700101A

#define MODULE_ID_DISPLAY_PORT_SINK	0x07001069



#define APM_CMD_GET_SPF_STATE		0x01001021

#define APM_CMD_RSP_GET_SPF_STATE	0x02001007
@@ -444,6 +445,15 @@ struct param_id_i2s_intf_cfg { 
#define PORT_ID_I2S_OUPUT		1

#define I2S_STACK_SIZE			2048



#define PARAM_ID_DISPLAY_PORT_INTF_CFG		0x08001154



struct param_id_display_port_intf_cfg {

	uint32_t channel_allocation;

	/* Multi-Steam Transport index */

	uint32_t mst_idx;

	uint32_t dptx_idx;

} __packed;



#define PARAM_ID_HW_EP_MF_CFG			0x08001017

struct param_id_hw_ep_mf {

	uint32_t sample_rate;
@@ -702,6 +712,8 @@ struct audioreach_module_config { 
	u16	data_format;

	u16	num_channels;

	u16	active_channels_mask;

	u16	dp_idx;

	u32	channel_allocation;

	u32	sd_line_mask;

	int	fmt;

	u8 channel_map[AR_PCM_MAX_NUM_CHANNEL];