Skip to content
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

Refactor pipeline management #5262

Open
wants to merge 7 commits into
base: topic/sof-dev
Choose a base branch
from
Open

Refactor pipeline management #5262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85c69ce
ASoC: SOF: sof-audio: Add a new op in struct sof_ipc_tplg_ops
ranj063 Dec 7, 2024
d5ba315
ASoC: SOF: pcm: Split up widget prepare and setup
ranj063 Dec 3, 2024
736d252
ASoC: SOF: sof-audio: expose sof_route_setup()
ranj063 Dec 4, 2024
0fc6909
ASoC: SOF: Intel: hda-dai-ops: Add new BE DAI DMA ops
ranj063 Dec 4, 2024
37bbcbc
drivers: soundwire: Add new prepare op in struct sdw_intel_ops
ranj063 Dec 5, 2024
457b14d
ASoC: SOF: Refactor pipeline management
ranj063 Dec 4, 2024
f417fc7
ASoC: SOF: ipc4-topology: Remove the skip_during_fe_trigger flag
ranj063 Dec 4, 2024
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
25 changes: 23 additions & 2 deletions drivers/soundwire/intel_ace2x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,27 @@ static int intel_params_stream(struct sdw_intel *sdw,
return -EIO;
}

static int intel_prepare_stream(struct sdw_intel *sdw,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commit message:
For the moment, the prepare_stream op is exactly the same as the prepare_stream op.
I think one of them should be different, in this form it sound obvious that A is exactly the same as A.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, this applies to ACE2+ platforms, I guess.

struct snd_pcm_substream *substream,
struct snd_soc_dai *dai,
struct snd_pcm_hw_params *hw_params,
int link_id, int alh_stream_id)
{
struct sdw_intel_link_res *res = sdw->link_res;
struct sdw_intel_stream_params_data params_data;

params_data.substream = substream;
params_data.dai = dai;
params_data.hw_params = hw_params;
params_data.link_id = link_id;
params_data.alh_stream_id = alh_stream_id;

if (res->ops && res->ops->prepare_stream && res->dev)
return res->ops->prepare_stream(res->dev, &params_data);

return -EIO;
}
ranj063 marked this conversation as resolved.
Show resolved Hide resolved

static int intel_free_stream(struct sdw_intel *sdw,
struct snd_pcm_substream *substream,
struct snd_soc_dai *dai,
Expand Down Expand Up @@ -422,8 +443,8 @@ static int intel_prepare(struct snd_pcm_substream *substream,
}

/* Inform DSP about PDI stream number */
return intel_params_stream(sdw, substream, dai, hw_params, sdw->instance,
dai_runtime->pdi->intel_alh_id);
return intel_prepare_stream(sdw, substream, dai, hw_params, sdw->instance,
dai_runtime->pdi->intel_alh_id);
}

static int
Expand Down
2 changes: 2 additions & 0 deletions include/linux/soundwire/sdw_intel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ struct sdw_intel_stream_free_data {
struct sdw_intel_ops {
int (*params_stream)(struct device *dev,
struct sdw_intel_stream_params_data *params_data);
int (*prepare_stream)(struct device *dev,
struct sdw_intel_stream_params_data *params_data);
int (*free_stream)(struct device *dev,
struct sdw_intel_stream_free_data *free_data);
int (*trigger)(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai);
Expand Down
7 changes: 7 additions & 0 deletions sound/soc/sof/intel/hda-dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,13 @@ int sdw_hda_dai_trigger(struct snd_pcm_substream *substream, int cmd,
}
EXPORT_SYMBOL_NS(sdw_hda_dai_trigger, "SND_SOC_SOF_INTEL_HDA_COMMON");

int sdw_hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params,
struct snd_soc_dai *cpu_dai, int link_id, int intel_alh_id)
{
return sdw_hda_dai_hw_params(substream, params, cpu_dai, link_id, intel_alh_id);
}
EXPORT_SYMBOL_NS(sdw_hda_dai_prepare, "SND_SOC_SOF_INTEL_HDA_COMMON");

static int hda_dai_suspend(struct hdac_bus *bus)
{
struct snd_soc_pcm_runtime *rtd;
Expand Down
9 changes: 9 additions & 0 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ static int sdw_ace2x_params_stream(struct device *dev,
params_data->alh_stream_id);
}

static int sdw_ace2x_prepare_stream(struct device *dev,
struct sdw_intel_stream_params_data *params_data)
{
return sdw_hda_dai_prepare(params_data->substream, params_data->hw_params,
params_data->dai, params_data->link_id,
params_data->alh_stream_id);
}

static int sdw_ace2x_free_stream(struct device *dev,
struct sdw_intel_stream_free_data *free_data)
{
Expand All @@ -134,6 +142,7 @@ static int sdw_ace2x_trigger(struct snd_pcm_substream *substream, int cmd, struc

static struct sdw_intel_ops sdw_ace2x_callback = {
.params_stream = sdw_ace2x_params_stream,
.prepare_stream = sdw_ace2x_prepare_stream,
.free_stream = sdw_ace2x_free_stream,
.trigger = sdw_ace2x_trigger,
};
Expand Down
3 changes: 3 additions & 0 deletions sound/soc/sof/intel/hda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,9 @@ int sdw_hda_dai_hw_free(struct snd_pcm_substream *substream,
int sdw_hda_dai_trigger(struct snd_pcm_substream *substream, int cmd,
struct snd_soc_dai *cpu_dai);

int sdw_hda_dai_prepare(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params,
struct snd_soc_dai *cpu_dai, int link_id, int intel_alh_id);

/* common dai driver */
extern struct snd_soc_dai_driver skl_dai[];
int hda_dsp_dais_suspend(struct snd_sof_dev *sdev);
Expand Down