Unverified Commit 7623ae79 authored Jun 12, 2019 by Ranjani Sridharan Committed by Mark Brown Jun 17, 2019

ASoC: SOF: Intel: hda: save handle to sdev in sof_intel_hda_stream

Add a snd_sof_dev member to sof_intel_hda_stream. This will be
used to access the snd_sof_dev during link hw_params callback.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 83ee240a

sound/soc/sof/intel/hda-stream.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -564,6 +564,8 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev)
	if (!hda_stream)		if (!hda_stream)
	return -ENOMEM;		return -ENOMEM;

			hda_stream->sdev = sdev;

	stream = &hda_stream->hda_stream;		stream = &hda_stream->hda_stream;

	stream->pphc_addr = sdev->bar[HDA_DSP_PP_BAR] +		stream->pphc_addr = sdev->bar[HDA_DSP_PP_BAR] +
	@@ -617,6 +619,8 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev)
	if (!hda_stream)		if (!hda_stream)
	return -ENOMEM;		return -ENOMEM;

			hda_stream->sdev = sdev;

	stream = &hda_stream->hda_stream;		stream = &hda_stream->hda_stream;

	/* we always have DSP support */		/* we always have DSP support */

sound/soc/sof/intel/hda.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -409,6 +409,7 @@ static inline struct hda_bus sof_to_hbus(struct snd_sof_dev s)
	}		}

	struct sof_intel_hda_stream {		struct sof_intel_hda_stream {
			struct snd_sof_dev *sdev;
	struct hdac_ext_stream hda_stream;		struct hdac_ext_stream hda_stream;
	struct sof_intel_stream stream;		struct sof_intel_stream stream;
	int hw_params_upon_resume; /* set up hw_params upon resume */		int hw_params_upon_resume; /* set up hw_params upon resume */