Skip to content

ipc4: handler: Split the set_pipeline_state() #8084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 6 commits into from
Aug 29, 2023
Merged

ipc4: handler: Split the set_pipeline_state() #8084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5fe511
ipc4: handler: Split the set_pipeline_state()
ujfalusi Aug 23, 2023
5475e9f
idc: Add pipeline ID mask definition to IDC_MSG_PPL_STATE extension
ujfalusi Aug 28, 2023
05520fb
idc: Add phase definition to IDC_MSG_PPL_STATE extension
ujfalusi Aug 28, 2023
b20d503
ipc4: handler: Export ipc4_pipeline_prepare and ipc4_pipeline_trigger
ujfalusi Aug 28, 2023
f79b371
ipc4: idc: Handle the phase parameter in idc_ppl_state()
ujfalusi Aug 28, 2023
9e26d98
ipc4: handler: Use separate loops for pipeline state phases
ujfalusi Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/idc/idc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,26 +320,41 @@ static int idc_reset(uint32_t comp_id)
* \param[in] ppl_id Pipeline id to be triggered.
* \return Error code.
*/
static int idc_ppl_state(uint32_t ppl_id)
static int idc_ppl_state(uint32_t ppl_id, uint32_t phase)
{
#if CONFIG_IPC_MAJOR_4
struct ipc *ipc = ipc_get();
struct idc *idc = *idc_get();
struct idc_payload *payload = idc_payload_get(idc, cpu_get_id());
struct ipc_comp_dev *ppl_icd;
uint32_t cmd = *(uint32_t *)payload;
bool delayed = false;

ppl_icd = ipc_get_comp_by_ppl_id(ipc, COMP_TYPE_PIPELINE, ppl_id);
if (!ppl_icd) {
tr_err(&idc_tr, "idc: comp %d not found", ppl_id);
return IPC4_INVALID_RESOURCE_ID;
}

return set_pipeline_state(ppl_icd, cmd, &delayed);
#else
return 0;
/* if no phase specified, correct it to be a ONESHOT */
if (!phase)
phase = IDC_PPL_STATE_PHASE_ONESHOT;

if (phase & IDC_PPL_STATE_PHASE_PREPARE) {
int ret;

ret = ipc4_pipeline_prepare(ppl_icd, cmd);
if (ret)
return ret;
}

if (phase & IDC_PPL_STATE_PHASE_TRIGGER) {
bool delayed = false;

return ipc4_pipeline_trigger(ppl_icd, cmd, &delayed);
}

#endif
return 0;
}

static void idc_prepare_d0ix(void)
Expand Down Expand Up @@ -428,7 +443,8 @@ void idc_cmd(struct idc_msg *msg)
ret = idc_reset(msg->extension);
break;
case iTS(IDC_MSG_PPL_STATE):
ret = idc_ppl_state(msg->extension);
ret = idc_ppl_state(msg->extension & IDC_PPL_STATE_PPL_ID_MASK,
IDC_PPL_STATE_PHASE_GET(msg->extension));
break;
case iTS(IDC_MSG_PREPARE_D0ix):
idc_prepare_d0ix();
Expand Down
4 changes: 3 additions & 1 deletion src/include/sof/ipc/topology.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ int ipc4_trigger_chain_dma(struct ipc *ipc, struct ipc4_chain_dma *cdma, bool *d
int ipc4_process_on_core(uint32_t core, bool blocking);
int ipc4_pipeline_complete(struct ipc *ipc, uint32_t comp_id);
int ipc4_find_dma_config(struct ipc_config_dai *dai, uint8_t *data_buffer, uint32_t size);
int set_pipeline_state(struct ipc_comp_dev *ppl_icd, uint32_t cmd, bool *delayed);
int ipc4_pipeline_prepare(struct ipc_comp_dev *ppl_icd, uint32_t cmd);
int ipc4_pipeline_trigger(struct ipc_comp_dev *ppl_icd, uint32_t cmd, bool *delayed);

#else
#error "No or invalid IPC MAJOR version selected."
#endif
Expand Down
Loading