diff options
author | Wu Fengguang <fengguang.wu@intel.com> | 2009-12-11 07:15:11 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-11 08:06:18 -0500 |
commit | 0287d970652027d5e299e0215578f228660a0e4e (patch) | |
tree | 9147b88351f901747fb25e8f7a396e1afd4b0a2b | |
parent | b14224bb74e19072c34617c501bceab94ebf579f (diff) |
intelhdmi - dont power off HDA link
For codecs without EPSS support (G45/IbexPeak), the hotplug event will
be lost if the HDA is powered off during the time. After that the pin
presence detection verb returns inaccurate info.
So always power-on HDA link for !EPSS codecs.
KarL offers the fact and Takashi recommends to flag hda_bus. Thanks!
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/hda_codec.h | 1 | ||||
-rw-r--r-- | sound/pci/hda/hda_intel.c | 3 | ||||
-rw-r--r-- | sound/pci/hda/patch_intelhdmi.c | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 9000d52fccca..1d541b7f5547 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -639,6 +639,7 @@ struct hda_bus { | |||
639 | unsigned int rirb_error:1; /* error in codec communication */ | 639 | unsigned int rirb_error:1; /* error in codec communication */ |
640 | unsigned int response_reset:1; /* controller was reset */ | 640 | unsigned int response_reset:1; /* controller was reset */ |
641 | unsigned int in_reset:1; /* during reset operation */ | 641 | unsigned int in_reset:1; /* during reset operation */ |
642 | unsigned int power_keep_link_on:1; /* don't power off HDA link */ | ||
642 | }; | 643 | }; |
643 | 644 | ||
644 | /* | 645 | /* |
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index efcc4f7c57f2..e54420e691ae 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -2082,7 +2082,8 @@ static void azx_power_notify(struct hda_bus *bus) | |||
2082 | } | 2082 | } |
2083 | if (power_on) | 2083 | if (power_on) |
2084 | azx_init_chip(chip); | 2084 | azx_init_chip(chip); |
2085 | else if (chip->running && power_save_controller) | 2085 | else if (chip->running && power_save_controller && |
2086 | !bus->power_keep_link_on) | ||
2086 | azx_stop_chip(chip); | 2087 | azx_stop_chip(chip); |
2087 | } | 2088 | } |
2088 | #endif /* CONFIG_SND_HDA_POWER_SAVE */ | 2089 | #endif /* CONFIG_SND_HDA_POWER_SAVE */ |
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c index 3990182777ee..918f40378d52 100644 --- a/sound/pci/hda/patch_intelhdmi.c +++ b/sound/pci/hda/patch_intelhdmi.c | |||
@@ -391,6 +391,17 @@ static int intel_hdmi_parse_codec(struct hda_codec *codec) | |||
391 | } | 391 | } |
392 | } | 392 | } |
393 | 393 | ||
394 | /* | ||
395 | * G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event | ||
396 | * can be lost and presence sense verb will become inaccurate if the | ||
397 | * HDA link is powered off at hot plug or hw initialization time. | ||
398 | */ | ||
399 | #ifdef CONFIG_SND_HDA_POWER_SAVE | ||
400 | if (!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) & | ||
401 | AC_PWRST_EPSS)) | ||
402 | codec->bus->power_keep_link_on = 1; | ||
403 | #endif | ||
404 | |||
394 | return 0; | 405 | return 0; |
395 | } | 406 | } |
396 | 407 | ||