1 files changed, 29 insertions, 22 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index f281c8068557..64f0a5e73a25 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -46,6 +46,9 @@ module_param(static_hdmi_pcm, bool, 0644);
 MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");
 
 #define is_haswell(codec)  ((codec)->vendor_id == 0x80862807)
+#define is_broadwell(codec)    ((codec)->vendor_id == 0x80862808)
+#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec))
+
 #define is_valleyview(codec) ((codec)->vendor_id == 0x80862882)
 
 struct hdmi_spec_per_cvt {
@@ -1101,7 +1104,7 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
         if (!channels)
                 return;
 
-        if (is_haswell(codec))
+        if (is_haswell_plus(codec))
                 snd_hda_codec_write(codec, pin_nid, 0,
                                             AC_VERB_SET_AMP_GAIN_MUTE,
                                             AMP_OUT_UNMUTE);
@@ -1280,7 +1283,7 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,
         struct hdmi_spec *spec = codec->spec;
         int err;
 
-        if (is_haswell(codec))
+        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));
@@ -1421,7 +1424,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
                             mux_idx);
 
         /* configure unused pins to choose other converters */
-        if (is_haswell(codec) || is_valleyview(codec))
+        if (is_haswell_plus(codec) || is_valleyview(codec))
                 intel_not_share_assigned_cvt(codec, per_pin->pin_nid, mux_idx);
 
         snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid);
@@ -1496,11 +1499,14 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
          * specification worked this way. Hence, we just ignore the data in
          * the unsolicited response to avoid custom WARs.
          */
-        int present = snd_hda_pin_sense(codec, pin_nid);
+        int present;
         bool update_eld = false;
         bool eld_changed = false;
         bool ret;
 
+        snd_hda_power_up(codec);
+        present = snd_hda_pin_sense(codec, pin_nid);
+
         mutex_lock(&per_pin->lock);
         pin_eld->monitor_present = !!(present & AC_PINSENSE_PRESENCE);
         if (pin_eld->monitor_present)
@@ -1573,6 +1579,7 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
                 jack->block_report = !ret;
 
         mutex_unlock(&per_pin->lock);
+        snd_hda_power_down(codec);
         return ret;
 }
 
@@ -1607,7 +1614,7 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
         if (get_defcfg_connect(config) == AC_JACK_PORT_NONE)
                 return 0;
 
-        if (is_haswell(codec))
+        if (is_haswell_plus(codec))
                 intel_haswell_fixup_connect_list(codec, pin_nid);
 
         pin_idx = spec->num_pins;
@@ -1694,21 +1701,6 @@ static int hdmi_parse_codec(struct hda_codec *codec)
                 }
         }
 
-#ifdef CONFIG_PM
-        /* We're seeing some problems with unsolicited hot plug events on
-         * PantherPoint after S3, if this is not enabled */
-        if (codec->vendor_id == 0x80862806)
-                codec->bus->power_keep_link_on = 1;
-        /*
-         * G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event
-         * can be lost and presence sense verb will become inaccurate if the
-         * HDA link is powered off at hot plug or hw initialization time.
-         */
-        else if (!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) &
-              AC_PWRST_EPSS))
-                codec->bus->power_keep_link_on = 1;
-#endif
-
         return 0;
 }
 
@@ -2260,18 +2252,22 @@ static int patch_generic_hdmi(struct hda_codec *codec)
         codec->spec = spec;
         hdmi_array_init(spec, 4);
 
-        if (is_haswell(codec)) {
+        if (is_haswell_plus(codec)) {
                 intel_haswell_enable_all_pins(codec, true);
                 intel_haswell_fixup_enable_dp12(codec);
         }
 
+        if (is_haswell(codec) || is_valleyview(codec)) {
+                codec->depop_delay = 0;
+        }
+
         if (hdmi_parse_codec(codec) < 0) {
                 codec->spec = NULL;
                 kfree(spec);
                 return -EINVAL;
         }
         codec->patch_ops = generic_hdmi_patch_ops;
-        if (is_haswell(codec)) {
+        if (is_haswell_plus(codec)) {
                 codec->patch_ops.set_power_state = haswell_set_power_state;
                 codec->dp_mst = true;
         }
@@ -3218,6 +3214,15 @@ static int patch_via_hdmi(struct hda_codec *codec)
 }
 
 /*
+ * called from hda_codec.c for generic HDMI support
+ */
+int snd_hda_parse_hdmi_codec(struct hda_codec *codec)
+{
+        return patch_generic_hdmi(codec);
+}
+EXPORT_SYMBOL_GPL(snd_hda_parse_hdmi_codec);
+
+/*
  * patch entries
  */
 static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
@@ -3271,6 +3276,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
 { .id = 0x80862805, .name = "CougarPoint HDMI", .patch = patch_generic_hdmi },
 { .id = 0x80862806, .name = "PantherPoint HDMI", .patch = patch_generic_hdmi },
 { .id = 0x80862807, .name = "Haswell HDMI",     .patch = patch_generic_hdmi },
+{ .id = 0x80862808, .name = "Broadwell HDMI",   .patch = patch_generic_hdmi },
 { .id = 0x80862880, .name = "CedarTrail HDMI",  .patch = patch_generic_hdmi },
 { .id = 0x80862882, .name = "Valleyview2 HDMI", .patch = patch_generic_hdmi },
 { .id = 0x808629fb, .name = "Crestline HDMI",   .patch = patch_generic_hdmi },
@@ -3326,6 +3332,7 @@ MODULE_ALIAS("snd-hda-codec-id:80862804");
 MODULE_ALIAS("snd-hda-codec-id:80862805");
 MODULE_ALIAS("snd-hda-codec-id:80862806");
 MODULE_ALIAS("snd-hda-codec-id:80862807");
+MODULE_ALIAS("snd-hda-codec-id:80862808");
 MODULE_ALIAS("snd-hda-codec-id:80862880");
 MODULE_ALIAS("snd-hda-codec-id:80862882");
 MODULE_ALIAS("snd-hda-codec-id:808629fb");