On Fri, Feb 05, 2016 at 07:57:17AM +0530, Patel, Vedang wrote:
> >
> > - if (dai->id > 0) {
> > - dev_err(&hdac->hdac.dev, "Only one dai supported as of
> > now\n");
> > + dai_map = &hdmi->dai_map[dai->id];
> > + pin = dai_map->pin;
> > +
> > + if (!pin)
> > + return -ENODEV;
> > +
> > + if ((!pin->eld.monitor_present) || (!pin->eld.eld_valid)) {
> > + dev_err(&hdac->hdac.dev, "device is not configured for this
> > PIN: %d\n",
>
> Don't you need the following fix anymore?
>
> ASoC: hdac_hdmi: Read pin sense detect during playback open
>
> If the monitor_present and eld_valid flags are not set due to some
> controller error during notify_cb, try reading once more during
> playback open.
> Link: https://chromium-review.googlesource.com/320943
With fix in patch "ASoC: Intel: Skylake: Remove autosuspend delay", the
controller resume and codec power ON are synchronized. The jack detection
happens successfully with few retries in notify callback. So this check is
not required anymore.
~Subhransu
>
> -Vedang
> > + pin->nid);
> > return -ENODEV;
> > }
> >
> > @@ -432,11 +442,6 @@ static int hdac_hdmi_playback_cleanup(struct
> > snd_pcm_substream *substream,
> >
> > dai_map = &hdmi->dai_map[dai->id];
> >
> > - snd_hdac_codec_write(&edev->hdac, dai_map->cvt->nid, 0,
> > - AC_VERB_SET_CHANNEL_STREAMID, 0);
> > - snd_hdac_codec_write(&edev->hdac, dai_map->cvt->nid, 0,
> > - AC_VERB_SET_STREAM_FORMAT, 0);
> > -
> > dd = (struct hdac_ext_dma_params
> > *)snd_soc_dai_get_dma_data(dai, substream);
> >
> > if (dd) {
> > @@ -537,6 +542,11 @@ static struct hdac_hdmi_pin
> > *hdac_hdmi_get_pin_from_cvt(
> > return NULL;
> > }
> >
> > +/*
> > + * This tries to get a valid PIN and set the HW constraints based on
> > +the
> > + * ELD. Even if a valid PIN is not found return success so that device
> > +open
> > + * doesn't fail.
> > + */
> > static int hdac_hdmi_pcm_open(struct snd_pcm_substream *substream,
> > struct snd_soc_dai *dai)
> > {
> > @@ -551,17 +561,22 @@ static int hdac_hdmi_pcm_open(struct
> > snd_pcm_substream *substream,
> >
> > cvt = dai_map->cvt;
> > pin = hdac_hdmi_get_pin_from_cvt(hdac, hdmi, cvt);
> > +
> > + /*
> > + * To make PA and other userland happy.
> > + * userland scans devices so returning error does not help.
> > + */
> > if (!pin)
> > - return -EIO;
> > + return 0;
> >
> > if ((!pin->eld.monitor_present) ||
> > (!pin->eld.eld_valid)) {
> >
> > - dev_err(&hdac->hdac.dev,
> > + dev_warn(&hdac->hdac.dev,
> > "failed: montior present? %d eld valid?: %d for pin:
> > %d\n",
> > pin->eld.monitor_present, pin->eld.eld_valid, pin-
> > >nid);
> >
> > - return -ENODEV;
> > + return 0;
> > }
> >
> > dai_map->pin = pin;
> > @@ -588,12 +603,19 @@ static void hdac_hdmi_pcm_close(struct
> > snd_pcm_substream *substream,
> >
> > dai_map = &hdmi->dai_map[dai->id];
> >
> > - hdac_hdmi_set_power_state(hdac, dai_map, AC_PWRST_D3);
> > + if (dai_map->pin && dai_map->pin->eld.monitor_present) {
> > + snd_hdac_codec_write(&hdac->hdac, dai_map->cvt->nid, 0,
> > + AC_VERB_SET_CHANNEL_STREAMID, 0);
> > + snd_hdac_codec_write(&hdac->hdac, dai_map->cvt->nid, 0,
> > + AC_VERB_SET_STREAM_FORMAT, 0);
> > +
> > + hdac_hdmi_set_power_state(hdac, dai_map,
> > AC_PWRST_D3);
> >
> > - snd_hdac_codec_write(&hdac->hdac, dai_map->pin->nid, 0,
> > + snd_hdac_codec_write(&hdac->hdac, dai_map->pin->nid, 0,
> > AC_VERB_SET_AMP_GAIN_MUTE,
> > AMP_OUT_MUTE);
> >
> > - dai_map->pin = NULL;
> > + dai_map->pin = NULL;
> > + }
> > }
> >
> > static int
> > --
> > 1.9.1
> >
> > _______________________________________________
> > Alsa-devel mailing list
> > Alsa-devel@xxxxxxxxxxxxxxxx
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
--
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
