| Message ID | 1402555345-16481-1-git-send-email-mengdong.lin@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b4f75aea553a2146bbdd159c397a2ac42cbb9902 |
| Headers | show |
At Thu, 12 Jun 2014 14:42:25 +0800, mengdong.lin@intel.com wrote: > > From: Mengdong Lin <mengdong.lin@intel.com> > > This patch will verify the pin's coverter selection for an active stream > when an unsol event reports this pin becomes available again after a display > mode change or hot-plug event. > > For Haswell+ and Valleyview: display mode change or hot-plug can change the > transcoder:port connection and make all the involved audio pins share the 1st > converter. So the stream using 1st convertor will flow to multiple pins > but active streams using other converters will fail. This workaround > is to assure the pin selects the right conveter and an assigned converter is > not shared by other unused pins. > > Signed-off-by: Mengdong Lin <mengdong.lin@intel.com> Thanks, applied now with Cc to stable. Takashi > > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c > index be0a9ee..3e4417b 100644 > --- a/sound/pci/hda/patch_hdmi.c > +++ b/sound/pci/hda/patch_hdmi.c > @@ -1594,10 +1594,18 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) > * Re-setup pin and infoframe. This is needed e.g. when > * - sink is first plugged-in (infoframe is not set up if !monitor_present) > * - transcoder can change during stream playback on Haswell > + * and this can make HW reset converter selection on a pin. > */ > - if (eld->eld_valid && !old_eld_valid && per_pin->setup) > + if (eld->eld_valid && !old_eld_valid && per_pin->setup) { > + if (is_haswell_plus(codec) || is_valleyview(codec)) { > + intel_verify_pin_cvt_connect(codec, per_pin); > + intel_not_share_assigned_cvt(codec, pin_nid, > + per_pin->mux_idx); > + } > + > hdmi_setup_audio_infoframe(codec, per_pin, > per_pin->non_pcm); > + } > } > > if (eld_changed) > -- > 1.8.1.2 >
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index be0a9ee..3e4417b 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1594,10 +1594,18 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) * Re-setup pin and infoframe. This is needed e.g. when * - sink is first plugged-in (infoframe is not set up if !monitor_present) * - transcoder can change during stream playback on Haswell + * and this can make HW reset converter selection on a pin. */ - if (eld->eld_valid && !old_eld_valid && per_pin->setup) + if (eld->eld_valid && !old_eld_valid && per_pin->setup) { + if (is_haswell_plus(codec) || is_valleyview(codec)) { + intel_verify_pin_cvt_connect(codec, per_pin); + intel_not_share_assigned_cvt(codec, pin_nid, + per_pin->mux_idx); + } + hdmi_setup_audio_infoframe(codec, per_pin, per_pin->non_pcm); + } } if (eld_changed)