diff mbox

[4/4] ALSA: hda - Wake the codec up on pin/ELD notify events

Message ID 1440781350-12053-5-git-send-email-david.henningsson@canonical.com (mailing list archive)
State New, archived
Headers show

Commit Message

David Henningsson Aug. 28, 2015, 5:02 p.m. UTC
Whenever there is an event from the i915 driver, wake the codec
and recheck plug/unplug + ELD status.

This fixes the issue with lost unsol events in power save mode,
the codec and controller can now sleep in D3 and still know when
the HDMI monitor has been connected.

Right now, this might mean we get two callbacks from the same event,
one from the unsol event and one from the i915 driver, but this is
not harmful and can be optimised away in a later patch.

Reviewed-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 sound/pci/hda/patch_hdmi.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

Comments

Zhang, Xiong Y Nov. 25, 2015, 9:56 a.m. UTC | #1
Recently I always see the following error message during S4 or S3 resume with drm-intel-nightly.
[   97.778063] PM: Syncing filesystems ... done.
[   97.801550] Freezing user space processes ... (elapsed 0.002 seconds) done.
[   97.804297] PM: Marking nosave pages: [mem 0x00000000-0x00000fff]
[   97.804302] PM: Marking nosave pages: [mem 0x00058000-0x00058fff]
[   97.804305] PM: Marking nosave pages: [mem 0x0009e000-0x000fffff]
[   97.804310] PM: Marking nosave pages: [mem 0x84c11000-0x84c12fff]
[   97.804312] PM: Marking nosave pages: [mem 0x876fc000-0x87746fff]
[   97.804317] PM: Marking nosave pages: [mem 0x8785e000-0x87fe9fff]
[   97.804387] PM: Marking nosave pages: [mem 0x88000000-0xffffffff]
[   97.806363] PM: Basic memory bitmaps created
[   97.806409] PM: Preallocating image memory... done (allocated 321557 pages)
[   98.150475] PM: Allocated 1286228 kbytes in 0.34 seconds (3783.02 MB/s)
[   98.150476] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done.
[   98.151998] Suspending console(s) (use no_console_suspend to debug)
[   98.173485] hdmi_present_sense: snd_hda_codec_hdmi hdaudioC0D2: HDMI status: Codec=2 Pin=6 Presence_Detect=1 ELD_Valid=1
[   99.178150] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178151] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178151] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178152] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178152] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178153] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178153] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178154] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178154] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178155] snd_hda_intel 0000:00:1f.3: spurious response 0x0:0x2, last cmd=0x206f2e08
[   99.178162] snd_hda_codec_hdmi hdaudioC0D2: HDMI: ELD buf size is 0, force 128
[  101.189709] snd_hda_intel 0000:00:1f.3: azx_get_response timeout, switching to polling mode: last cmd=0x206f2f00
[  102.195492] snd_hda_intel 0000:00:1f.3: No response from codec, disabling MSI: last cmd=0x206f2f00
[  103.201275] snd_hda_intel 0000:00:1f.3: azx_get_response timeout, switching to single_cmd mode: last cmd=0x206f2f00
[  103.201396] azx_single_wait_for_response: 42 callbacks suppressed

The bisect result points to this commit. 
I checked this patch and had one question: if i915 driver wake up ahead of snd_hda_intel driver during resume,  i915 driver will call audio driver's hdmi_present_sense() function through this patch, but the audio interrupt is disabled at this moment, how could hdmi_present_sense() get the response from codec ?  

thanks
> -----Original Message-----

> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of

> David Henningsson

> Sent: Saturday, August 29, 2015 1:03 AM

> To: tiwai@suse.de; alsa-devel@alsa-project.org;

> intel-gfx@lists.freedesktop.org; jani.nikula@linux.intel.com; Yang, Libin; Vetter,

> Daniel

> Cc: David Henningsson

> Subject: [Intel-gfx] [PATCH 4/4] ALSA: hda - Wake the codec up on pin/ELD notify

> events

> 

> Whenever there is an event from the i915 driver, wake the codec

> and recheck plug/unplug + ELD status.

> 

> This fixes the issue with lost unsol events in power save mode,

> the codec and controller can now sleep in D3 and still know when

> the HDMI monitor has been connected.

> 

> Right now, this might mean we get two callbacks from the same event,

> one from the unsol event and one from the i915 driver, but this is

> not harmful and can be optimised away in a later patch.

> 

> Reviewed-by: Takashi Iwai <tiwai@suse.de>

> Signed-off-by: David Henningsson <david.henningsson@canonical.com>

> ---

>  sound/pci/hda/patch_hdmi.c | 22 +++++++++++++++++++++-

>  1 file changed, 21 insertions(+), 1 deletion(-)

> 

> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c

> index a97db5f..acbfbe0 100644

> --- a/sound/pci/hda/patch_hdmi.c

> +++ b/sound/pci/hda/patch_hdmi.c

> @@ -37,6 +37,8 @@

>  #include <sound/jack.h>

>  #include <sound/asoundef.h>

>  #include <sound/tlv.h>

> +#include <sound/hdaudio.h>

> +#include <sound/hda_i915.h>

>  #include "hda_codec.h"

>  #include "hda_local.h"

>  #include "hda_jack.h"

> @@ -144,6 +146,9 @@ struct hdmi_spec {

>  	 */

>  	struct hda_multi_out multiout;

>  	struct hda_pcm_stream pcm_playback;

> +

> +	/* i915/powerwell (Haswell+/Valleyview+) specific */

> +	struct i915_audio_component_audio_ops i915_audio_ops;

>  };

> 

> 

> @@ -2191,6 +2196,9 @@ static void generic_hdmi_free(struct hda_codec

> *codec)

>  	struct hdmi_spec *spec = codec->spec;

>  	int pin_idx;

> 

> +	if (is_haswell_plus(codec) || is_valleyview_plus(codec))

> +		snd_hdac_i915_register_notifier(NULL);

> +

>  	for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {

>  		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);

> 

> @@ -2316,6 +2324,14 @@ static void haswell_set_power_state(struct

> hda_codec *codec, hda_nid_t fg,

>  	snd_hda_codec_set_power_to_all(codec, fg, power_state);

>  }

> 

> +static void intel_pin_eld_notify(void *audio_ptr, int port)

> +{

> +	struct hda_codec *codec = audio_ptr;

> +	int pin_nid = port + 0x04;

> +

> +	check_presence_and_report(codec, pin_nid);

> +}

> +

>  static int patch_generic_hdmi(struct hda_codec *codec)

>  {

>  	struct hdmi_spec *spec;

> @@ -2342,8 +2358,12 @@ static int patch_generic_hdmi(struct hda_codec

> *codec)

>  	if (is_valleyview_plus(codec) || is_skylake(codec))

>  		codec->core.link_power_control = 1;

> 

> -	if (is_haswell_plus(codec) || is_valleyview_plus(codec))

> +	if (is_haswell_plus(codec) || is_valleyview_plus(codec)) {

>  		codec->depop_delay = 0;

> +		spec->i915_audio_ops.audio_ptr = codec;

> +		spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify;

> +		snd_hdac_i915_register_notifier(&spec->i915_audio_ops);

> +	}

> 

>  	if (hdmi_parse_codec(codec) < 0) {

>  		codec->spec = NULL;

> --

> 1.9.1

> 

> _______________________________________________

> Intel-gfx mailing list

> Intel-gfx@lists.freedesktop.org

> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index a97db5f..acbfbe0 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -37,6 +37,8 @@ 
 #include <sound/jack.h>
 #include <sound/asoundef.h>
 #include <sound/tlv.h>
+#include <sound/hdaudio.h>
+#include <sound/hda_i915.h>
 #include "hda_codec.h"
 #include "hda_local.h"
 #include "hda_jack.h"
@@ -144,6 +146,9 @@  struct hdmi_spec {
 	 */
 	struct hda_multi_out multiout;
 	struct hda_pcm_stream pcm_playback;
+
+	/* i915/powerwell (Haswell+/Valleyview+) specific */
+	struct i915_audio_component_audio_ops i915_audio_ops;
 };
 
 
@@ -2191,6 +2196,9 @@  static void generic_hdmi_free(struct hda_codec *codec)
 	struct hdmi_spec *spec = codec->spec;
 	int pin_idx;
 
+	if (is_haswell_plus(codec) || is_valleyview_plus(codec))
+		snd_hdac_i915_register_notifier(NULL);
+
 	for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
 		struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
 
@@ -2316,6 +2324,14 @@  static void haswell_set_power_state(struct hda_codec *codec, hda_nid_t fg,
 	snd_hda_codec_set_power_to_all(codec, fg, power_state);
 }
 
+static void intel_pin_eld_notify(void *audio_ptr, int port)
+{
+	struct hda_codec *codec = audio_ptr;
+	int pin_nid = port + 0x04;
+
+	check_presence_and_report(codec, pin_nid);
+}
+
 static int patch_generic_hdmi(struct hda_codec *codec)
 {
 	struct hdmi_spec *spec;
@@ -2342,8 +2358,12 @@  static int patch_generic_hdmi(struct hda_codec *codec)
 	if (is_valleyview_plus(codec) || is_skylake(codec))
 		codec->core.link_power_control = 1;
 
-	if (is_haswell_plus(codec) || is_valleyview_plus(codec))
+	if (is_haswell_plus(codec) || is_valleyview_plus(codec)) {
 		codec->depop_delay = 0;
+		spec->i915_audio_ops.audio_ptr = codec;
+		spec->i915_audio_ops.pin_eld_notify = intel_pin_eld_notify;
+		snd_hdac_i915_register_notifier(&spec->i915_audio_ops);
+	}
 
 	if (hdmi_parse_codec(codec) < 0) {
 		codec->spec = NULL;