At Fri, 14 Jun 2013 23:20:26 +0800,
Wang Xingchao wrote:
>
> Haswell converters maybe in wrong power state before usage.
> i.e. only converter 0 is in D0, converter 1/2 are in D3.
> When pin choose converter 1/2, there's no audio output.
>
> Signed-off-by: Wang Xingchao <xingchao.wang at linux.intel.com>
Isn't this needed in hdmi_setup_stream() instead of open, like
haswell_verify_pin_D0() does? Note that the open callback won't be
called at PM resume. Also, if it's just a matter of the connected
converter from the specific pin, you can check the power state of the
specific converter, instead of checking the all converters at each
time.
If my guess above is correct, the better code would be to merge the
power check of converter into haswell_verify_pin_D0().
thanks,
Takashi
> ---
> sound/pci/hda/patch_hdmi.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index e12f7a0..8db5eb6 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -1053,6 +1053,23 @@ static void haswell_verify_pin_D0(struct hda_codec *codec, hda_nid_t nid)
> }
> }
>
> +static void hsw_verify_cvt_D0(struct hdmi_spec *spec,
> + struct hda_codec *codec)
> +{
> + struct hdmi_spec_per_cvt *per_cvt;
> + int pwr, cvt_idx;
> +
> + for (cvt_idx = 0; cvt_idx < spec->num_cvts; cvt_idx++) {
> + per_cvt = get_cvt(spec, cvt_idx);
> + pwr = snd_hda_codec_read(codec, per_cvt->cvt_nid, 0,
> + AC_VERB_GET_POWER_STATE, 0);
> + pwr = (pwr & AC_PWRST_ACTUAL) >> AC_PWRST_ACTUAL_SHIFT;
> + if (pwr != AC_PWRST_D0)
> + snd_hda_codec_write(codec, per_cvt->cvt_nid, 0, AC_VERB_SET_POWER_STATE,
> + AC_PWRST_D0);
> + }
> +}
> +
> /*
> * Callbacks
> */
> @@ -1122,6 +1139,9 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
> per_pin = get_pin(spec, pin_idx);
> eld = &per_pin->sink_eld;
>
> + if (codec->vendor_id == 0x80862807)
> + hsw_verify_cvt_D0(spec, codec);
> +
> /* Dynamically assign converter to stream */
> for (cvt_idx = 0; cvt_idx < spec->num_cvts; cvt_idx++) {
> per_cvt = get_cvt(spec, cvt_idx);
> --
> 1.8.1.2
>
