Skip to content

ASoC: SOF: use hdac_bus to manage streams #52

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

Closed
wants to merge 1 commit into from
Closed

ASoC: SOF: use hdac_bus to manage streams #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions sound/soc/sof/intel/hda-codec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static void hda_codec_load_module(struct hda_codec *codec) {}
/* probe individual codec */
static int hda_codec_probe(struct snd_sof_dev *sdev, int addr)
{
struct hda_bus *hbus = sdev->hbus;
struct hda_bus *hbus = sof_to_hbus(sdev);
unsigned int cmd = (addr << 28) | (AC_NODE_ROOT << 20) |
(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;
unsigned int res = -1;
Expand Down Expand Up @@ -92,8 +92,7 @@ static int hda_codec_probe(struct snd_sof_dev *sdev, int addr)
/* Codec initialization */
int hda_codec_probe_bus(struct snd_sof_dev *sdev)
{
struct hda_bus *hbus = sdev->hbus;
struct hdac_bus *bus = &hbus->core;
struct hdac_bus *bus = sof_to_bus(sdev);
int c, max_slots, ret = 0;

max_slots = HDA_MAX_CODECS;
Expand All @@ -116,8 +115,7 @@ int hda_codec_probe_bus(struct snd_sof_dev *sdev)

int hda_codec_i915_init(struct snd_sof_dev *sdev)
{
struct hda_bus *hbus = sdev->hbus;
struct hdac_bus *bus = &hbus->core;
struct hdac_bus *bus = sof_to_bus(sdev);
int ret;

/* i915 exposes a HDA codec for HDMI audio */
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/intel/hda-ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ void hda_dsp_ctrl_enable_miscbdcge(struct snd_sof_dev *sdev, bool enable)
*/
int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)
{
struct hdac_bus *bus = &sdev->hbus->core;
struct hdac_bus *bus = sof_to_bus(sdev);
int ret;

hda_dsp_ctrl_enable_miscbdcge(sdev, false);
Expand Down
14 changes: 8 additions & 6 deletions sound/soc/sof/intel/hda-loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,17 +242,19 @@ static int cl_cleanup(struct snd_sof_dev *sdev, struct snd_dma_buffer *dmab,

static int cl_copy_fw(struct snd_sof_dev *sdev, int tag)
{
struct sof_intel_hda_stream *stream = NULL;
struct sof_intel_hda_dev *hdev = sdev->hda;
int ret, status, i;
struct hdac_bus *bus = sof_to_bus(sdev);
struct sof_intel_hda_stream *s, *stream = NULL;
int ret, status;

/* get stream with tag */
for (i = 0; i < hdev->num_playback; i++) {
if (hdev->pstream[i].tag == tag) {
stream = &hdev->pstream[i];
list_for_each_entry(s, &bus->stream_list, list) {
if (s->direction == SNDRV_PCM_STREAM_PLAYBACK
&& s->tag == tag) {
stream = s;
break;
}
}

if (!stream) {
dev_err(sdev->dev,
"error: could not get stream with stream tag%d\n",
Expand Down
Loading