leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hda - Override HDMI setup_stream ops for Intel HSW+

Browse Source 
Instead of checking at each time with is_haswell_plus() macro,
override the setup_stream ops itself for HSW+ chips.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2016-03-21 12:42:06 +01:00
parent 44bb6d0c3f
commit 2c1c9b86c6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/pci/hda/patch_hdmi.c
View File

@ -864,9 +864,6 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,
struct hdmi_spec *spec = codec->spec; struct hdmi_spec *spec = codec->spec;
int err; int err;
if (is_haswell_plus(codec))
haswell_verify_D0(codec, cvt_nid, pin_nid);
err = spec->ops.pin_hbr_setup(codec, pin_nid, is_hbr_format(format)); err = spec->ops.pin_hbr_setup(codec, pin_nid, is_hbr_format(format));
if (err) { if (err) {
@ -2307,6 +2304,14 @@ static void register_i915_notifier(struct hda_codec *codec)
snd_hdac_i915_register_notifier(&spec->i915_audio_ops); snd_hdac_i915_register_notifier(&spec->i915_audio_ops);
} }
/* setup_stream ops override for HSW+ */
static int i915_hsw_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,
hda_nid_t pin_nid, u32 stream_tag, int format)
{
haswell_verify_D0(codec, cvt_nid, pin_nid);
return hdmi_setup_stream(codec, cvt_nid, pin_nid, stream_tag, format);
}
/* Intel Haswell and onwards; audio component with eld notifier */ /* Intel Haswell and onwards; audio component with eld notifier */
static int patch_i915_hsw_hdmi(struct hda_codec *codec) static int patch_i915_hsw_hdmi(struct hda_codec *codec)
{ {
@ -2338,6 +2343,8 @@ static int patch_i915_hsw_hdmi(struct hda_codec *codec)
codec->depop_delay = 0; codec->depop_delay = 0;
codec->auto_runtime_pm = 1; codec->auto_runtime_pm = 1;
spec->ops.setup_stream = i915_hsw_setup_stream;
err = hdmi_parse_codec(codec); err = hdmi_parse_codec(codec);
if (err < 0) { if (err < 0) {
generic_spec_free(codec); generic_spec_free(codec);