1 files changed, 19 insertions, 11 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 36badba2dcec..39862e98551c 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -50,6 +50,8 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");
 #define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec))
 
 #define is_valleyview(codec) ((codec)->vendor_id == 0x80862882)
+#define is_cherryview(codec) ((codec)->vendor_id == 0x80862883)
+#define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec))
 
 struct hdmi_spec_per_cvt {
         hda_nid_t cvt_nid;
@@ -1161,17 +1163,23 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
 
 static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll);
 
-static void jack_callback(struct hda_codec *codec, struct hda_jack_tbl *jack)
+static void check_presence_and_report(struct hda_codec *codec, hda_nid_t nid)
 {
         struct hdmi_spec *spec = codec->spec;
-        int pin_idx = pin_nid_to_pin_index(codec, jack->nid);
+        int pin_idx = pin_nid_to_pin_index(codec, nid);
+
         if (pin_idx < 0)
                 return;
-
         if (hdmi_present_sense(get_pin(spec, pin_idx), 1))
                 snd_hda_jack_report_sync(codec);
 }
 
+static void jack_callback(struct hda_codec *codec,
+                          struct hda_jack_callback *jack)
+{
+        check_presence_and_report(codec, jack->tbl->nid);
+}
+
 static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
 {
         int tag = res >> AC_UNSOL_RES_TAG_SHIFT;
@@ -1188,7 +1196,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
                 codec->addr, jack->nid, dev_entry, !!(res & AC_UNSOL_RES_IA),
                 !!(res & AC_UNSOL_RES_PD), !!(res & AC_UNSOL_RES_ELDV));
 
-        jack_callback(codec, jack);
+        check_presence_and_report(codec, jack->nid);
 }
 
 static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
@@ -1459,7 +1467,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
                             mux_idx);
 
         /* configure unused pins to choose other converters */
-        if (is_haswell_plus(codec) || is_valleyview(codec))
+        if (is_haswell_plus(codec) || is_valleyview_plus(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);
@@ -1598,7 +1606,8 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
                  *   and this can make HW reset converter selection on a pin.
                  */
                 if (eld->eld_valid && !old_eld_valid && per_pin->setup) {
-                        if (is_haswell_plus(codec) || is_valleyview(codec)) {
+                        if (is_haswell_plus(codec) ||
+                                is_valleyview_plus(codec)) {
                                 intel_verify_pin_cvt_connect(codec, per_pin);
                                 intel_not_share_assigned_cvt(codec, pin_nid,
                                                         per_pin->mux_idx);
@@ -1779,7 +1788,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
         bool non_pcm;
         int pinctl;
 
-        if (is_haswell_plus(codec) || is_valleyview(codec)) {
+        if (is_haswell_plus(codec) || is_valleyview_plus(codec)) {
                 /* Verify pin:cvt selections to avoid silent audio after S3.
                  * After S3, the audio driver restores pin:cvt selections
                  * but this can happen before gfx is ready and such selection
@@ -2162,7 +2171,7 @@ static int generic_hdmi_init(struct hda_codec *codec)
                 hda_nid_t pin_nid = per_pin->pin_nid;
 
                 hdmi_init_pin(codec, pin_nid);
-                snd_hda_jack_detect_enable_callback(codec, pin_nid, pin_nid,
+                snd_hda_jack_detect_enable_callback(codec, pin_nid,
                         codec->jackpoll_interval > 0 ? jack_callback : NULL);
         }
         return 0;
@@ -2330,9 +2339,8 @@ static int patch_generic_hdmi(struct hda_codec *codec)
                 intel_haswell_fixup_enable_dp12(codec);
         }
 
-        if (is_haswell(codec) || is_valleyview(codec)) {
+        if (is_haswell_plus(codec) || is_valleyview_plus(codec))
                 codec->depop_delay = 0;
-        }
 
         if (hdmi_parse_codec(codec) < 0) {
                 codec->spec = NULL;
@@ -2426,7 +2434,7 @@ static int simple_playback_init(struct hda_codec *codec)
         if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP)
                 snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_AMP_GAIN_MUTE,
                                     AMP_OUT_UNMUTE);
-        snd_hda_jack_detect_enable(codec, pin, pin);
+        snd_hda_jack_detect_enable(codec, pin);
         return 0;
 }