* [PATCH 1/5] ALSA: hda - Split the generic parser as an individual module
2013-11-26 8:29 [PATCH 0/5] A few HD-audio things for 3.14 Takashi Iwai
@ 2013-11-26 8:29 ` Takashi Iwai
2013-11-26 8:29 ` [PATCH 2/5] ALSA: hda - Bind with HDMI codec parser automatically Takashi Iwai
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Takashi Iwai @ 2013-11-26 8:29 UTC (permalink / raw)
To: alsa-devel
Drop the hard dependency on the generic parser code and load / unload
the generic parser code dynamically if built as a module. This allows
us to avoid the generic parser if only HDMI/DP codecs are found.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/hda/Makefile | 5 +++-
sound/pci/hda/hda_codec.c | 67 +++++++++++++++++++++++++++++++++------------
sound/pci/hda/hda_codec.h | 1 +
sound/pci/hda/hda_generic.c | 4 +++
sound/pci/hda/hda_local.h | 7 -----
5 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index c091438286a3..5a40c652df41 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -3,7 +3,6 @@ snd-hda-intel-objs := hda_intel.o
snd-hda-intel-$(CONFIG_SND_HDA_I915) += hda_i915.o
snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o
-snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o
snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o
snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
@@ -12,6 +11,7 @@ snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
CFLAGS_hda_codec.o := -I$(src)
CFLAGS_hda_intel.o := -I$(src)
+snd-hda-codec-generic-objs := hda_generic.o
snd-hda-codec-realtek-objs := patch_realtek.o
snd-hda-codec-cmedia-objs := patch_cmedia.o
snd-hda-codec-analog-objs := patch_analog.o
@@ -28,6 +28,9 @@ snd-hda-codec-hdmi-objs := patch_hdmi.o hda_eld.o
obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o
# codec drivers (note: CONFIG_SND_HDA_CODEC_XXX are booleans)
+ifdef CONFIG_SND_HDA_GENERIC
+obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-generic.o
+endif
ifdef CONFIG_SND_HDA_CODEC_REALTEK
obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-realtek.o
endif
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 69178c4f4113..4d3f46329eb5 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -945,9 +945,6 @@ find_codec_preset(struct hda_codec *codec)
const struct hda_codec_preset *preset;
unsigned int mod_requested = 0;
- if (is_generic_config(codec))
- return NULL; /* use the generic parser */
-
again:
mutex_lock(&preset_mutex);
list_for_each_entry(tbl, &hda_preset_tables, list) {
@@ -1330,6 +1327,28 @@ get_hda_cvt_setup(struct hda_codec *codec, hda_nid_t nid)
}
/*
+ * Dynamic symbol binding for the codec parsers
+ */
+#ifdef MODULE
+#define load_parser_sym(sym) ((int (*)(struct hda_codec *))symbol_request(sym))
+#define unload_parser_addr(addr) symbol_put_addr(addr)
+#else
+#define load_parser_sym(sym) (sym)
+#define unload_parser_addr(addr) do {} while (0)
+#endif
+
+#define load_parser(codec, sym) \
+ ((codec)->parser = load_parser_sym(sym))
+
+static void unload_parser(struct hda_codec *codec)
+{
+ if (codec->parser) {
+ unload_parser_addr(codec->parser);
+ codec->parser = NULL;
+ }
+}
+
+/*
* codec destructor
*/
static void snd_hda_codec_free(struct hda_codec *codec)
@@ -1356,6 +1375,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
if (!codec->pm_down_notified) /* cancel leftover refcounts */
hda_call_pm_notify(codec->bus, false);
#endif
+ unload_parser(codec);
module_put(codec->owner);
free_hda_cache(&codec->amp_cache);
free_hda_cache(&codec->cmd_cache);
@@ -1548,6 +1568,7 @@ EXPORT_SYMBOL_HDA(snd_hda_codec_update_widgets);
*/
int snd_hda_codec_configure(struct hda_codec *codec)
{
+ int (*patch)(struct hda_codec *) = NULL;
int err;
codec->preset = find_codec_preset(codec);
@@ -1557,29 +1578,38 @@ int snd_hda_codec_configure(struct hda_codec *codec)
return err;
}
- if (is_generic_config(codec)) {
- err = snd_hda_parse_generic_codec(codec);
- goto patched;
- }
- if (codec->preset && codec->preset->patch) {
- err = codec->preset->patch(codec);
- goto patched;
+ if (!is_generic_config(codec) && codec->preset)
+ patch = codec->preset->patch;
+ if (!patch) {
+ unload_parser(codec); /* to be sure */
+#ifdef CONFIG_SND_HDA_GENERIC
+ if (!patch)
+ patch = load_parser(codec, snd_hda_parse_generic_codec);
+#endif
+ if (!patch) {
+ printk(KERN_ERR "hda-codec: No codec parser is available\n");
+ return -ENODEV;
+ }
}
- /* call the default parser */
- err = snd_hda_parse_generic_codec(codec);
- if (err < 0)
- printk(KERN_ERR "hda-codec: No codec parser is available\n");
+ err = patch(codec);
+ if (err < 0) {
+ unload_parser(codec);
+ return err;
+ }
- patched:
- if (!err && codec->patch_ops.unsol_event)
+ if (codec->patch_ops.unsol_event) {
err = init_unsol_queue(codec->bus);
+ if (err < 0)
+ return err;
+ }
+
/* audio codec should override the mixer name */
- if (!err && (codec->afg || !*codec->bus->card->mixername))
+ if (codec->afg || !*codec->bus->card->mixername)
snprintf(codec->bus->card->mixername,
sizeof(codec->bus->card->mixername),
"%s %s", codec->vendor_name, codec->chip_name);
- return err;
+ return 0;
}
EXPORT_SYMBOL_HDA(snd_hda_codec_configure);
@@ -2610,6 +2640,7 @@ int snd_hda_codec_reset(struct hda_codec *codec)
codec->preset = NULL;
codec->slave_dig_outs = NULL;
codec->spdif_status_reset = 0;
+ unload_parser(codec);
module_put(codec->owner);
codec->owner = NULL;
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 77db69480c19..a45eaeebb4ec 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -835,6 +835,7 @@ struct hda_codec {
/* detected preset */
const struct hda_codec_preset *preset;
struct module *owner;
+ int (*parser)(struct hda_codec *codec);
const char *vendor_name; /* codec vendor name */
const char *chip_name; /* codec chip name */
const char *modelname; /* model name for preset */
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 3067ed4fe3b2..9b251456f2a0 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -28,6 +28,7 @@
#include <linux/ctype.h>
#include <linux/string.h>
#include <linux/bitops.h>
+#include <linux/module.h>
#include <sound/core.h>
#include <sound/jack.h>
#include "hda_codec.h"
@@ -5291,3 +5292,6 @@ error:
return err;
}
EXPORT_SYMBOL_HDA(snd_hda_parse_generic_codec);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Generic HD-audio codec parser");
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index d398b648bb5d..4d571a6d9230 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -352,14 +352,7 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
/*
* generic codec parser
*/
-#ifdef CONFIG_SND_HDA_GENERIC
int snd_hda_parse_generic_codec(struct hda_codec *codec);
-#else
-static inline int snd_hda_parse_generic_codec(struct hda_codec *codec)
-{
- return -ENODEV;
-}
-#endif
/*
* generic proc interface
--
1.8.4.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/5] ALSA: hda - Bind with HDMI codec parser automatically
2013-11-26 8:29 [PATCH 0/5] A few HD-audio things for 3.14 Takashi Iwai
2013-11-26 8:29 ` [PATCH 1/5] ALSA: hda - Split the generic parser as an individual module Takashi Iwai
@ 2013-11-26 8:29 ` Takashi Iwai
2013-11-26 8:29 ` [PATCH 3/5] ALSA: hda - Refactor pm notification in hda_codec.c Takashi Iwai
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Takashi Iwai @ 2013-11-26 8:29 UTC (permalink / raw)
To: alsa-devel
If a codec contains only the digital outputs, it's very likely a
HDMI/DP codec, which isn't supported by the generic parser but via
HDMI codec parser code. Detect such a case and bind with the proper
parser object if available.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/hda/hda_codec.c | 27 +++++++++++++++++++++++++++
sound/pci/hda/hda_local.h | 1 +
sound/pci/hda/patch_hdmi.c | 9 +++++++++
3 files changed, 37 insertions(+)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 4d3f46329eb5..bada677df8a7 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1557,6 +1557,31 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec)
EXPORT_SYMBOL_HDA(snd_hda_codec_update_widgets);
+#ifdef CONFIG_SND_HDA_CODEC_HDMI
+/* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */
+static bool is_likely_hdmi_codec(struct hda_codec *codec)
+{
+ hda_nid_t nid = codec->start_nid;
+ int i;
+
+ for (i = 0; i < codec->num_nodes; i++, nid++) {
+ unsigned int wcaps = get_wcaps(codec, nid);
+ switch (get_wcaps_type(wcaps)) {
+ case AC_WID_AUD_IN:
+ return false; /* HDMI parser supports only HDMI out */
+ case AC_WID_AUD_OUT:
+ if (!(wcaps & AC_WCAP_DIGITAL))
+ return false;
+ break;
+ }
+ }
+ return true;
+}
+#else
+/* no HDMI codec parser support */
+#define is_likely_hdmi_codec(codec) false
+#endif /* CONFIG_SND_HDA_CODEC_HDMI */
+
/**
* snd_hda_codec_configure - (Re-)configure the HD-audio codec
* @codec: the HDA codec
@@ -1582,6 +1607,8 @@ int snd_hda_codec_configure(struct hda_codec *codec)
patch = codec->preset->patch;
if (!patch) {
unload_parser(codec); /* to be sure */
+ if (is_likely_hdmi_codec(codec))
+ patch = load_parser(codec, snd_hda_parse_hdmi_codec);
#ifdef CONFIG_SND_HDA_GENERIC
if (!patch)
patch = load_parser(codec, snd_hda_parse_generic_codec);
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 4d571a6d9230..da80c5bd7fd4 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -353,6 +353,7 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
* generic codec parser
*/
int snd_hda_parse_generic_codec(struct hda_codec *codec);
+int snd_hda_parse_hdmi_codec(struct hda_codec *codec);
/*
* generic proc interface
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 08407bed093e..a6081ed34b88 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -3214,6 +3214,15 @@ static int patch_via_hdmi(struct hda_codec *codec)
}
/*
+ * called from hda_codec.c for generic HDMI support
+ */
+int snd_hda_parse_hdmi_codec(struct hda_codec *codec)
+{
+ return patch_generic_hdmi(codec);
+}
+EXPORT_SYMBOL_HDA(snd_hda_parse_hdmi_codec);
+
+/*
* patch entries
*/
static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
--
1.8.4.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] ALSA: hda - Refactor pm notification in hda_codec.c
2013-11-26 8:29 [PATCH 0/5] A few HD-audio things for 3.14 Takashi Iwai
2013-11-26 8:29 ` [PATCH 1/5] ALSA: hda - Split the generic parser as an individual module Takashi Iwai
2013-11-26 8:29 ` [PATCH 2/5] ALSA: hda - Bind with HDMI codec parser automatically Takashi Iwai
@ 2013-11-26 8:29 ` Takashi Iwai
2013-11-26 8:29 ` [PATCH 4/5] ALSA: hda - Enable runtime PM on Panther Point Takashi Iwai
2013-11-26 8:29 ` [PATCH 5/5] ALSA: hda - Make device D3 during runtime suspend Takashi Iwai
4 siblings, 0 replies; 9+ messages in thread
From: Takashi Iwai @ 2013-11-26 8:29 UTC (permalink / raw)
To: alsa-devel
No functional change.
- codec->pm_down_notified flag is renamed to codec->pm_up_notified
flag (and takes the reversed meaning), which is managed solely in
hda_call_pm_notify() now.
- The explicit call of hda_call_pm_notify() is moved into
hda_keep_power_on().
- Removed a redundant call of hda_call_pm_notify() in
snd_hda_power_up(), as it's called in hda_call_codec_resume()
anyway.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/hda/hda_codec.c | 37 ++++++++++++++-----------------------
sound/pci/hda/hda_codec.h | 2 +-
2 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index bada677df8a7..8f7295bdccbd 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -99,16 +99,24 @@ EXPORT_SYMBOL_HDA(snd_hda_delete_codec_preset);
static void hda_power_work(struct work_struct *work);
static void hda_keep_power_on(struct hda_codec *codec);
#define hda_codec_is_power_on(codec) ((codec)->power_on)
-static inline void hda_call_pm_notify(struct hda_bus *bus, bool power_up)
+
+static void hda_call_pm_notify(struct hda_codec *codec, bool power_up)
{
+ struct hda_bus *bus = codec->bus;
+
+ if ((power_up && codec->pm_up_notified) ||
+ (!power_up && !codec->pm_up_notified))
+ return;
if (bus->ops.pm_notify)
bus->ops.pm_notify(bus, power_up);
+ codec->pm_up_notified = power_up;
}
+
#else
#define codec_in_pm(codec) 0
static inline void hda_keep_power_on(struct hda_codec *codec) {}
#define hda_codec_is_power_on(codec) 1
-#define hda_call_pm_notify(bus, state) {}
+#define hda_call_pm_notify(codec, state) {}
#endif
/**
@@ -1371,10 +1379,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
codec->bus->caddr_tbl[codec->addr] = NULL;
if (codec->patch_ops.free)
codec->patch_ops.free(codec);
-#ifdef CONFIG_PM
- if (!codec->pm_down_notified) /* cancel leftover refcounts */
- hda_call_pm_notify(codec->bus, false);
-#endif
+ hda_call_pm_notify(codec, false); /* cancel leftover refcounts */
unload_parser(codec);
module_put(codec->owner);
free_hda_cache(&codec->amp_cache);
@@ -1453,7 +1458,6 @@ int snd_hda_codec_new(struct hda_bus *bus,
* phase.
*/
hda_keep_power_on(codec);
- hda_call_pm_notify(bus, true);
#endif
if (codec->bus->modelname) {
@@ -4058,10 +4062,6 @@ static void hda_call_codec_resume(struct hda_codec *codec)
* in the resume / power-save sequence
*/
hda_keep_power_on(codec);
- if (codec->pm_down_notified) {
- codec->pm_down_notified = 0;
- hda_call_pm_notify(codec->bus, true);
- }
hda_set_power_state(codec, AC_PWRST_D0);
restore_shutup_pins(codec);
hda_exec_init_verbs(codec);
@@ -4935,11 +4935,8 @@ static void hda_power_work(struct work_struct *work)
spin_unlock(&codec->power_lock);
state = hda_call_codec_suspend(codec, true);
- if (!codec->pm_down_notified &&
- !bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) {
- codec->pm_down_notified = 1;
- hda_call_pm_notify(bus, false);
- }
+ if (!bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK))
+ hda_call_pm_notify(codec, false);
}
static void hda_keep_power_on(struct hda_codec *codec)
@@ -4949,6 +4946,7 @@ static void hda_keep_power_on(struct hda_codec *codec)
codec->power_on = 1;
codec->power_jiffies = jiffies;
spin_unlock(&codec->power_lock);
+ hda_call_pm_notify(codec, true);
}
/* update the power on/off account with the current jiffies */
@@ -4968,8 +4966,6 @@ void snd_hda_update_power_acct(struct hda_codec *codec)
/* call this with codec->power_lock held! */
static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)
{
- struct hda_bus *bus = codec->bus;
-
/* Return if power_on or transitioning to power_on, unless currently
* powering down. */
if ((codec->power_on || codec->power_transition > 0) &&
@@ -4996,11 +4992,6 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)
codec->power_transition = 1; /* avoid reentrance */
spin_unlock(&codec->power_lock);
- if (codec->pm_down_notified) {
- codec->pm_down_notified = 0;
- hda_call_pm_notify(bus, true);
- }
-
hda_call_codec_resume(codec);
spin_lock(&codec->power_lock);
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index a45eaeebb4ec..6190d3f0d452 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -909,7 +909,7 @@ struct hda_codec {
#ifdef CONFIG_PM
unsigned int power_on :1; /* current (global) power-state */
unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */
- unsigned int pm_down_notified:1; /* PM notified to controller */
+ unsigned int pm_up_notified:1; /* PM notified to controller */
unsigned int in_pm:1; /* suspend/resume being performed */
int power_transition; /* power-state in transition */
int power_count; /* current (global) power refcount */
--
1.8.4.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] ALSA: hda - Enable runtime PM on Panther Point
2013-11-26 8:29 [PATCH 0/5] A few HD-audio things for 3.14 Takashi Iwai
` (2 preceding siblings ...)
2013-11-26 8:29 ` [PATCH 3/5] ALSA: hda - Refactor pm notification in hda_codec.c Takashi Iwai
@ 2013-11-26 8:29 ` Takashi Iwai
2013-11-26 8:29 ` [PATCH 5/5] ALSA: hda - Make device D3 during runtime suspend Takashi Iwai
4 siblings, 0 replies; 9+ messages in thread
From: Takashi Iwai @ 2013-11-26 8:29 UTC (permalink / raw)
To: alsa-devel
Now we fixed the long-standing bugs of runtime PM, let's enable
Panther Point again. The runtime PM was disabled in the HDMI codec
driver due to the S3 issue, and this should have been fixed now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/hda/patch_hdmi.c | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 7a09404579a7..b001aa6da3bc 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -3979,7 +3979,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
/* Panther Point */
{ PCI_DEVICE(0x8086, 0x1e20),
- .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH_NOPM },
+ .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
/* Lynx Point */
{ PCI_DEVICE(0x8086, 0x8c20),
.driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index a6081ed34b88..1773a640e72e 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1693,16 +1693,12 @@ static int hdmi_parse_codec(struct hda_codec *codec)
}
#ifdef CONFIG_PM
- /* We're seeing some problems with unsolicited hot plug events on
- * PantherPoint after S3, if this is not enabled */
- if (codec->vendor_id == 0x80862806)
- codec->bus->power_keep_link_on = 1;
/*
* G45/IbexPeak don't support EPSS: the unsolicited pin hot plug event
* can be lost and presence sense verb will become inaccurate if the
* HDA link is powered off at hot plug or hw initialization time.
*/
- else if (!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) &
+ if (!(snd_hda_param_read(codec, codec->afg, AC_PAR_POWER_STATE) &
AC_PWRST_EPSS))
codec->bus->power_keep_link_on = 1;
#endif
--
1.8.4.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] ALSA: hda - Make device D3 during runtime suspend
2013-11-26 8:29 [PATCH 0/5] A few HD-audio things for 3.14 Takashi Iwai
` (3 preceding siblings ...)
2013-11-26 8:29 ` [PATCH 4/5] ALSA: hda - Enable runtime PM on Panther Point Takashi Iwai
@ 2013-11-26 8:29 ` Takashi Iwai
2013-11-26 12:34 ` Takashi Iwai
4 siblings, 1 reply; 9+ messages in thread
From: Takashi Iwai @ 2013-11-26 8:29 UTC (permalink / raw)
To: alsa-devel
We can make the device D3 for saving more power during the runtime
suspend. Meanwhile, I observed that Haswell HDMI codecs gets
corrupted ELD bytes when woken up from runtime suspend with D3.
As a quick workaround, exclude these chips from D3.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/hda/hda_intel.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index b001aa6da3bc..c0b2c9079607 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2997,6 +2997,13 @@ static int azx_runtime_suspend(struct device *dev)
if (!chip->bus->avoid_link_reset)
azx_enter_link_reset(chip);
azx_clear_irq_pending(chip);
+
+ /* Haswell HDMI/DP shows the broken ELD read after runtime PM */
+ if (chip->driver_type != AZX_DRIVER_HDMI) {
+ pci_save_state(chip->pci);
+ pci_set_power_state(chip->pci, PCI_D3hot);
+ }
+
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
hda_display_power(false);
return 0;
@@ -3019,6 +3026,11 @@ static int azx_runtime_resume(struct device *dev)
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
hda_display_power(true);
+ if (chip->driver_type != AZX_DRIVER_HDMI) {
+ pci_set_power_state(chip->pci, PCI_D0);
+ pci_restore_state(chip->pci);
+ }
+
/* Read STATESTS before controller reset */
status = azx_readw(chip, STATESTS);
--
1.8.4.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 5/5] ALSA: hda - Make device D3 during runtime suspend
2013-11-26 8:29 ` [PATCH 5/5] ALSA: hda - Make device D3 during runtime suspend Takashi Iwai
@ 2013-11-26 12:34 ` Takashi Iwai
2013-11-26 13:32 ` Lin, Mengdong
0 siblings, 1 reply; 9+ messages in thread
From: Takashi Iwai @ 2013-11-26 12:34 UTC (permalink / raw)
To: alsa-devel
At Tue, 26 Nov 2013 09:29:13 +0100,
Takashi Iwai wrote:
>
> We can make the device D3 for saving more power during the runtime
> suspend. Meanwhile, I observed that Haswell HDMI codecs gets
> corrupted ELD bytes when woken up from runtime suspend with D3.
> As a quick workaround, exclude these chips from D3.
Scratch this. After reading the PCI core code, I found this patch is
just a nonsense.
Takashi
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> sound/pci/hda/hda_intel.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index b001aa6da3bc..c0b2c9079607 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2997,6 +2997,13 @@ static int azx_runtime_suspend(struct device *dev)
> if (!chip->bus->avoid_link_reset)
> azx_enter_link_reset(chip);
> azx_clear_irq_pending(chip);
> +
> + /* Haswell HDMI/DP shows the broken ELD read after runtime PM */
> + if (chip->driver_type != AZX_DRIVER_HDMI) {
> + pci_save_state(chip->pci);
> + pci_set_power_state(chip->pci, PCI_D3hot);
> + }
> +
> if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
> hda_display_power(false);
> return 0;
> @@ -3019,6 +3026,11 @@ static int azx_runtime_resume(struct device *dev)
> if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
> hda_display_power(true);
>
> + if (chip->driver_type != AZX_DRIVER_HDMI) {
> + pci_set_power_state(chip->pci, PCI_D0);
> + pci_restore_state(chip->pci);
> + }
> +
> /* Read STATESTS before controller reset */
> status = azx_readw(chip, STATESTS);
>
> --
> 1.8.4.3
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 5/5] ALSA: hda - Make device D3 during runtime suspend
2013-11-26 12:34 ` Takashi Iwai
@ 2013-11-26 13:32 ` Lin, Mengdong
2013-11-26 13:53 ` Takashi Iwai
0 siblings, 1 reply; 9+ messages in thread
From: Lin, Mengdong @ 2013-11-26 13:32 UTC (permalink / raw)
To: Takashi Iwai, alsa-devel@alsa-project.org
> -----Original Message-----
> From: alsa-devel-bounces@alsa-project.org
> [mailto:alsa-devel-bounces@alsa-project.org] On Behalf Of Takashi Iwai
> Sent: Tuesday, November 26, 2013 8:34 PM
> To: alsa-devel@alsa-project.org
> Subject: Re: [alsa-devel] [PATCH 5/5] ALSA: hda - Make device D3 during
> runtime suspend
>
> At Tue, 26 Nov 2013 09:29:13 +0100,
> Takashi Iwai wrote:
> >
> > We can make the device D3 for saving more power during the runtime
> > suspend. Meanwhile, I observed that Haswell HDMI codecs gets
> > corrupted ELD bytes when woken up from runtime suspend with D3.
> > As a quick workaround, exclude these chips from D3.
>
> Scratch this. After reading the PCI core code, I found this patch is just a
> nonsense.
Could you share more info here?
On Haswell, the HDMI audio controller (PCI device 3) and codec are in display power well, so the power saving is achieved by releasing and turning off the display power well.
But at least for legacy audio, we need the controller (PCI device 1b) to enter D3 at runtime so PCI driver will call ACPI and BIOS can know the legacy audio controller is in D3 and power down the on-board codec.
Thanks
Mengdong
> >
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> > sound/pci/hda/hda_intel.c | 12 ++++++++++++
> > 1 file changed, 12 insertions(+)
> >
> > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> > index b001aa6da3bc..c0b2c9079607 100644
> > --- a/sound/pci/hda/hda_intel.c
> > +++ b/sound/pci/hda/hda_intel.c
> > @@ -2997,6 +2997,13 @@ static int azx_runtime_suspend(struct device
> *dev)
> > if (!chip->bus->avoid_link_reset)
> > azx_enter_link_reset(chip);
> > azx_clear_irq_pending(chip);
> > +
> > + /* Haswell HDMI/DP shows the broken ELD read after runtime PM */
> > + if (chip->driver_type != AZX_DRIVER_HDMI) {
> > + pci_save_state(chip->pci);
> > + pci_set_power_state(chip->pci, PCI_D3hot);
> > + }
> > +
> > if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
> > hda_display_power(false);
> > return 0;
> > @@ -3019,6 +3026,11 @@ static int azx_runtime_resume(struct device
> *dev)
> > if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
> > hda_display_power(true);
> >
> > + if (chip->driver_type != AZX_DRIVER_HDMI) {
> > + pci_set_power_state(chip->pci, PCI_D0);
> > + pci_restore_state(chip->pci);
> > + }
> > +
> > /* Read STATESTS before controller reset */
> > status = azx_readw(chip, STATESTS);
> >
> > --
> > 1.8.4.3
> >
> > _______________________________________________
> > Alsa-devel mailing list
> > Alsa-devel@alsa-project.org
> > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> >
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 5/5] ALSA: hda - Make device D3 during runtime suspend
2013-11-26 13:32 ` Lin, Mengdong
@ 2013-11-26 13:53 ` Takashi Iwai
0 siblings, 0 replies; 9+ messages in thread
From: Takashi Iwai @ 2013-11-26 13:53 UTC (permalink / raw)
To: Lin, Mengdong; +Cc: alsa-devel@alsa-project.org
At Tue, 26 Nov 2013 13:32:11 +0000,
Lin, Mengdong wrote:
>
> > -----Original Message-----
> > From: alsa-devel-bounces@alsa-project.org
> > [mailto:alsa-devel-bounces@alsa-project.org] On Behalf Of Takashi Iwai
> > Sent: Tuesday, November 26, 2013 8:34 PM
> > To: alsa-devel@alsa-project.org
> > Subject: Re: [alsa-devel] [PATCH 5/5] ALSA: hda - Make device D3 during
> > runtime suspend
> >
> > At Tue, 26 Nov 2013 09:29:13 +0100,
> > Takashi Iwai wrote:
> > >
> > > We can make the device D3 for saving more power during the runtime
> > > suspend. Meanwhile, I observed that Haswell HDMI codecs gets
> > > corrupted ELD bytes when woken up from runtime suspend with D3.
> > > As a quick workaround, exclude these chips from D3.
> >
> > Scratch this. After reading the PCI core code, I found this patch is just a
> > nonsense.
>
> Could you share more info here?
>
> On Haswell, the HDMI audio controller (PCI device 3) and codec are in display power well, so the power saving is achieved by releasing and turning off the display power well.
>
> But at least for legacy audio, we need the controller (PCI device 1b) to enter D3 at runtime so PCI driver will call ACPI and BIOS can know the legacy audio controller is in D3 and power down the on-board codec.
The D3 state should be achieved by the runtime suspend code of PCI
driver itself, thus the driver doesn't have to do it. For details,
look at pci_pm_runtime_suspend() and pci_finish_runtime_suspend().
Takashi
^ permalink raw reply [flat|nested] 9+ messages in thread