OSDN Git Service

ASoC: SOF: Intel: hda: move i915 init earlier
authorKai Vehmanen <kai.vehmanen@linux.intel.com>
Thu, 6 Feb 2020 20:02:23 +0000 (22:02 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 10 Feb 2020 14:06:12 +0000 (14:06 +0000)
commitaf7aae1b1f6306a1cda4da393e920a1334eaa3d4
tree9fdf237c481bae6171845faa9834dad8b12b334c
parent816938b272b0ac0203e25ce50483bd284ea4a2db
ASoC: SOF: Intel: hda: move i915 init earlier

To be compliant with i915 display driver requirements, i915 power-up
must be done before any HDA communication takes place, including
parsing the bus capabilities. Otherwise the initial codec probe
may fail.

Move i915 initialization earlier in the SOF HDA sequence. This
sequence is now aligned with the snd-hda-intel driver where the
display_power() call is before snd_hdac_bus_parse_capabilities()
and rest of the capability parsing.

Also remove unnecessary ifdef around hda_codec_i915_init(). There's
a dummy implementation provided if CONFIG_SND_SOC_SOF_HDA is not
enabled.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20200206200223.7715-3-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/intel/hda.c