On Mon, 11 Nov 2019 16:33:45 +0100,
Takashi Iwai wrote:
>
> On Mon, 11 Nov 2019 15:45:02 +0100,
> Hui Wang wrote:
> >
> > With the commit 7f641e26a6df ("ALSA: hda/hdmi - Consider eld_valid
> > when reporting jack event"), the driver checks eld_valid before
> > reporting Jack state, this fixes the 4 HDMI/DP audio devices issue.
> >
> > But recently some users complained that the hdmi audio on their
> > machines couldn't work anymore with this commit. On their machines,
> > the monitor_present is 1 while the eld_valid is 0 when plugging a
> > monitor, and the hdmi audio could work even the eld_valid is 0.
> >
> > To make the hdmi audio work again on those machines, adding a module
> > parameter, if usrs want to skip the checking eld_valid, they
> > could set checking_eld_valid=0 when loading the module. And this
> > parameter only applies to sense_via_verbs, for those getting eld via
> > component, no need to apply this parameter since it is impossible
> > that present is 1 while eld_valid is 0.
> >
> > BugLink: https://bugs.launchpad.net/bugs/1834771
> > Fixes: 7f641e26a6df ("ALSA: hda/hdmi - Consider eld_valid when reporting jack event")
> > Cc: <stable@xxxxxxxxxxxxxxx>
> > Signed-off-by: Hui Wang <hui.wang@xxxxxxxxxxxxx>
>
> Well, this sort of module option is rather a last resort, so I
> hesitate to apply this.
>
> The bug reports in the above are a bit hard to digest quickly.
> Could you tell exactly which hardware (and drivers) show the problem?
>
> FWIW, amdgpu driver already got the audio-component binding recently,
> so this problem shouldn't be triggered, at least in this code path.
> And, for nouveau and radeon, I already submitted the patches to
> support the audio-component binding, but by some reason they haven't
> been merged to the upstream. In that case, we'd need to ping DRM
> guys.
On the second thought, I wonder whether eld_valid would be corrected
later by the graphics side at all. If yes, it's a timing issue, and
it can be corrected with the repolling.
A totally untested patch is below.
thanks,
Takashi
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1549,19 +1549,25 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin,
do_repoll = true;
}
- if (do_repoll)
+ do_repoll |= repoll && eld->eld_valid != eld->monitor_present;
+ if (do_repoll) {
schedule_delayed_work(&per_pin->work, msecs_to_jiffies(300));
- else
+ ret = false;
+ } else {
update_eld(codec, per_pin, eld);
-
- ret = !repoll || !eld->monitor_present || eld->eld_valid;
+ per_pin->repoll_count = 0;
+ ret = true;
+ }
jack = snd_hda_jack_tbl_get(codec, pin_nid);
if (jack) {
jack->block_report = !ret;
- jack->pin_sense = (eld->monitor_present && eld->eld_valid) ?
- AC_PINSENSE_PRESENCE : 0;
+ if (ret) {
+ jack->pin_sense = (eld->monitor_present && eld->eld_valid) ?
+ AC_PINSENSE_PRESENCE : 0;
+ }
}
+
mutex_unlock(&per_pin->lock);
return ret;
}
