[Intel-gfx] [PATCH 2/2 v2] hda - delayed ELD repoll

[Paul Menzel]

Dear Fengguang,


Am Mittwoch, den 16.11.2011, 00:57 +0800 schrieb Wu Fengguang:
> The Intel HDMI chips (ironlake at least) are found to have ~250ms delay
> between the ELD_Valid=1 hotplug event is send and the ELD buffer becomes
> actually readable. During the time the ELD buffer is mysteriously all 0.
> 
> Fix it by scheduling a delayed work to re-read ELD buffer after 300ms.
> 
> Signed-off-by: Wu Fengguang <fengguang.wu at intel.com>

other then my comment at the end, please note that it is very confusing
for European (and other folks) what your first name is.

If it is Fengguang then you should use

Fengguang Wu or Wu, Fengguang

where I prefer the first one.

> ---
>  sound/pci/hda/hda_local.h  |    2 +
>  sound/pci/hda/patch_hdmi.c |   49 ++++++++++++++++++++++++++++++-----
>  2 files changed, 44 insertions(+), 7 deletions(-)
> 
> --- linux.orig/sound/pci/hda/hda_local.h	2011-11-15 21:29:53.000000000 +0800
> +++ linux/sound/pci/hda/hda_local.h	2011-11-15 21:29:54.000000000 +0800
> @@ -655,6 +655,8 @@ struct hdmi_eld {
>  #ifdef CONFIG_PROC_FS
>  	struct snd_info_entry *proc_entry;
>  #endif
> +	struct hda_codec *codec;
> +	struct delayed_work work;
>  };
>  
>  int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid);
> --- linux.orig/sound/pci/hda/patch_hdmi.c	2011-11-15 21:29:53.000000000 +0800
> +++ linux/sound/pci/hda/patch_hdmi.c	2011-11-16 00:50:50.000000000 +0800
> @@ -746,7 +746,7 @@ static void hdmi_setup_audio_infoframe(s
>   */
>  
>  static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,
> -			       struct hdmi_eld *eld);
> +			       struct hdmi_eld *eld, bool retry);
>  
>  static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
>  {
> @@ -766,7 +766,7 @@ static void hdmi_intrinsic_event(struct 
>  		return;
>  	eld = &spec->pins[pin_idx].sink_eld;
>  
> -	hdmi_present_sense(codec, pin_nid, eld);
> +	hdmi_present_sense(codec, pin_nid, eld, true);
>  
>  	/*
>  	 * HDMI sink's ELD info cannot always be retrieved for now, e.g.
> @@ -969,7 +969,7 @@ static int hdmi_read_pin_conn(struct hda
>  }
>  
>  static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,
> -			       struct hdmi_eld *eld)
> +			       struct hdmi_eld *eld, bool retry)
>  {
>  	/*
>  	 * Always execute a GetPinSense verb here, even when called from
> @@ -992,13 +992,31 @@ static void hdmi_present_sense(struct hd
>  		"HDMI status: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n",
>  		codec->addr, pin_nid, eld->monitor_present, eld_valid);
>  
> -	if (eld_valid)
> +	if (eld_valid) {
>  		if (!snd_hdmi_get_eld(eld, codec, pin_nid))
>  			snd_hdmi_show_eld(eld);
> +		else if (retry) {
> +			queue_delayed_work(codec->bus->workq,
> +					   &eld->work,
> +					   msecs_to_jiffies(300));
> +		}

Would adding a comment referring to the discussion thread be beneficial
for code readers asking why a delay is needed?

> +	}
>  
>  	snd_hda_input_jack_report(codec, pin_nid);
>  }

[…]


Thanks,

Paul
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20111116/9eb53e40/attachment.sig>