Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1375284 > unrolled thread

[PATCH 4.5 128/238] ALSA: hda - Fix missing ELD update at unplugging

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 4.5 128/238] ALSA: hda - Fix missing ELD update at unplugging Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-04-10 22:40 +0200
    Re: [PATCH 4.5 128/238] ALSA: hda - Fix missing ELD update at  unplugging Paul Bolle <pebolle@tiscali.nl> - 2016-04-12 20:40 +0200
      Re: [PATCH 4.5 128/238] ALSA: hda - Fix missing ELD update at unplugging Takashi Iwai <tiwai@suse.de> - 2016-04-12 21:00 +0200

#1375284 — [PATCH 4.5 128/238] ALSA: hda - Fix missing ELD update at unplugging

4.5-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Takashi Iwai <tiwai@suse.de>

commit c64c1437afb14ebc900e40910f31ffb20bf652ad upstream.

i915 get_eld ops may return an error when no encoder is connected, and
currently we regard the error as fatal and skip the whole ELD
handling.  This ended up with the missing ELD update at unplugging.

This patch fixes the issue by treating the error as the unplugged
state, instead of skipping the rest.

Reported-by: Libin Yang <libin.yang@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 sound/pci/hda/patch_hdmi.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1670,11 +1670,10 @@ static void sync_eld_via_acomp(struct hd
 	int size;
 
 	mutex_lock(&per_pin->lock);
+	eld->monitor_present = false;
 	size = snd_hdac_acomp_get_eld(&codec->bus->core, per_pin->pin_nid,
 				      &eld->monitor_present, eld->eld_buffer,
 				      ELD_MAX_SIZE);
-	if (size < 0)
-		goto unlock;
 	if (size > 0) {
 		size = min(size, ELD_MAX_SIZE);
 		if (snd_hdmi_parse_eld(codec, &eld->info,

[toc] | [next] | [standalone]

#1377114 — Re: [PATCH 4.5 128/238] ALSA: hda - Fix missing ELD update at unplugging

On zo, 2016-04-10 at 11:35 -0700, Greg Kroah-Hartman wrote:
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -1670,11 +1670,10 @@ static void sync_eld_via_acomp(struct hd
>  	int size;
>  
>  	mutex_lock(&per_pin->lock);
> +	eld->monitor_present = false;
>  	size = snd_hdac_acomp_get_eld(&codec->bus->core, per_pin->pin_nid,
>  				      &eld->monitor_present, eld->eld_buffer,
>  				      ELD_MAX_SIZE);
> -	if (size < 0)
> -		goto unlock;

This hunk triggers an obviously correct warning:
    sound/pci/hda/patch_hdmi.c: In function 'sync_eld_via_acomp':
    sound/pci/hda/patch_hdmi.c:1695:2: warning: label 'unlock' defined but not used [-Wunused-label]
      unlock:
      ^

It's trivial to silence this warning for the v4.5 stable build, of
course. But I never saw this warning in my v4.6-rc builds, so it's
possible another patch should also be included in the v4.5 stable tree.
Takashi?

Thanks,


Paul Bolle

[toc] | [prev] | [next] | [standalone]

#1377121

On Tue, 12 Apr 2016 20:39:00 +0200,
Paul Bolle wrote:
> 
> On zo, 2016-04-10 at 11:35 -0700, Greg Kroah-Hartman wrote:
> > --- a/sound/pci/hda/patch_hdmi.c
> > +++ b/sound/pci/hda/patch_hdmi.c
> > @@ -1670,11 +1670,10 @@ static void sync_eld_via_acomp(struct hd
> >  	int size;
> >  
> >  	mutex_lock(&per_pin->lock);
> > +	eld->monitor_present = false;
> >  	size = snd_hdac_acomp_get_eld(&codec->bus->core, per_pin->pin_nid,
> >  				      &eld->monitor_present, eld->eld_buffer,
> >  				      ELD_MAX_SIZE);
> > -	if (size < 0)
> > -		goto unlock;
> 
> This hunk triggers an obviously correct warning:
>     sound/pci/hda/patch_hdmi.c: In function 'sync_eld_via_acomp':
>     sound/pci/hda/patch_hdmi.c:1695:2: warning: label 'unlock' defined but not used [-Wunused-label]
>       unlock:
>       ^
> 
> It's trivial to silence this warning for the v4.5 stable build, of
> course. But I never saw this warning in my v4.6-rc builds, so it's
> possible another patch should also be included in the v4.5 stable tree.
> Takashi?

The newer kernel has more code jumping to unlock label, so it's a
warning seen only on 4.5 kernel.  If this really matters, we'd need a
non-upstream fix to paper over it.


thanks,

Takashi

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web