UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda - Yet another fix for D3 stop-clock refcounting 

The call of pm_notify callback in snd_hda_codec_free() should be with
the check of the current state whether pm_notify(false) is called or
not, instead of codec->power_on check.

For improving the code readability and fixing this inconsistency,
codec->d3_stop_clk_ok is renamed to codec->pm_down_notified, and this
flag is set only when runtime PM down is called.  The new name reflects
to a more direct purpose of the flag.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-08-31 07:46:56 -07:00
parent 5a798394c8
commit 08fa20ae20
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sound/pci/hda/hda_codec.c
View File

@ -1206,7 +1206,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
if (codec->patch_ops.free) if (codec->patch_ops.free)
codec->patch_ops.free(codec); codec->patch_ops.free(codec);
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (codec->power_on) if (!codec->pm_down_notified) /* cancel leftover refcounts */
hda_call_pm_notify(codec->bus, false); hda_call_pm_notify(codec->bus, false);
#endif #endif
module_put(codec->owner); module_put(codec->owner);
@ -1222,7 +1222,7 @@ static void snd_hda_codec_free(struct hda_codec *codec)
static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec, static bool snd_hda_codec_get_supported_ps(struct hda_codec *codec,
hda_nid_t fg, unsigned int power_state); hda_nid_t fg, unsigned int power_state);
static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, static unsigned int hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
unsigned int power_state); unsigned int power_state);
/** /**
@ -3564,18 +3564,14 @@ static unsigned int hda_sync_power_state(struct hda_codec *codec,
} }
/* /*
* set power state of the codec * set power state of the codec, and return the power state
*/ */
static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg, static unsigned int hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
unsigned int power_state) unsigned int power_state)
{ {
int count; int count;
unsigned int state; unsigned int state;
#ifdef CONFIG_PM
codec->d3_stop_clk_ok = 0;
#endif
/* this delay seems necessary to avoid click noise at power-down */ /* this delay seems necessary to avoid click noise at power-down */
if (power_state == AC_PWRST_D3) { if (power_state == AC_PWRST_D3) {
/* transition time less than 10ms for power down */ /* transition time less than 10ms for power down */
@ -3599,11 +3595,7 @@ static void hda_set_power_state(struct hda_codec *codec, hda_nid_t fg,
break; break;
} }
#ifdef CONFIG_PM return state;
if (!codec->bus->power_keep_link_on && power_state == AC_PWRST_D3
&& codec->d3_stop_clk && (state & AC_PWRST_CLK_STOP_OK))
codec->d3_stop_clk_ok = 1;
#endif
} }
#ifdef CONFIG_SND_HDA_HWDEP #ifdef CONFIG_SND_HDA_HWDEP
@ -3620,13 +3612,16 @@ static inline void hda_exec_init_verbs(struct hda_codec *codec) {}
#ifdef CONFIG_PM #ifdef CONFIG_PM
/* /*
* call suspend and power-down; used both from PM and power-save * call suspend and power-down; used both from PM and power-save
* this function returns the power state in the end
*/ */
static void hda_call_codec_suspend(struct hda_codec *codec) static unsigned int hda_call_codec_suspend(struct hda_codec *codec)
{ {
unsigned int state;
if (codec->patch_ops.suspend) if (codec->patch_ops.suspend)
codec->patch_ops.suspend(codec); codec->patch_ops.suspend(codec);
hda_cleanup_all_streams(codec); hda_cleanup_all_streams(codec);
hda_set_power_state(codec, state = hda_set_power_state(codec,
codec->afg ? codec->afg : codec->mfg, codec->afg ? codec->afg : codec->mfg,
AC_PWRST_D3); AC_PWRST_D3);
cancel_delayed_work(&codec->power_work); cancel_delayed_work(&codec->power_work);
@ -3637,6 +3632,7 @@ static void hda_call_codec_suspend(struct hda_codec *codec)
codec->power_transition = 0; codec->power_transition = 0;
codec->power_jiffies = jiffies; codec->power_jiffies = jiffies;
spin_unlock(&codec->power_lock); spin_unlock(&codec->power_lock);
return state;
} }
/* /*
@ -4438,6 +4434,7 @@ static void hda_power_work(struct work_struct *work)
struct hda_codec *codec = struct hda_codec *codec =
container_of(work, struct hda_codec, power_work.work); container_of(work, struct hda_codec, power_work.work);
struct hda_bus *bus = codec->bus; struct hda_bus *bus = codec->bus;
unsigned int state;
spin_lock(&codec->power_lock); spin_lock(&codec->power_lock);
if (codec->power_transition > 0) { /* during power-up sequence? */ if (codec->power_transition > 0) { /* during power-up sequence? */
@ -4451,9 +4448,12 @@ static void hda_power_work(struct work_struct *work)
} }
spin_unlock(&codec->power_lock); spin_unlock(&codec->power_lock);
hda_call_codec_suspend(codec); state = hda_call_codec_suspend(codec);
if (codec->d3_stop_clk_ok) codec->pm_down_notified = 0;
if (!bus->power_keep_link_on && (state & AC_PWRST_CLK_STOP_OK)) {
codec->pm_down_notified = 1;
hda_call_pm_notify(bus, false); hda_call_pm_notify(bus, false);
}
} }
static void hda_keep_power_on(struct hda_codec *codec) static void hda_keep_power_on(struct hda_codec *codec)
@ -4510,8 +4510,11 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)
codec->power_transition = 1; /* avoid reentrance */ codec->power_transition = 1; /* avoid reentrance */
spin_unlock(&codec->power_lock); spin_unlock(&codec->power_lock);
if (codec->d3_stop_clk_ok) /* flag set at suspend */ if (codec->pm_down_notified) {
codec->pm_down_notified = 0;
hda_call_pm_notify(bus, true); hda_call_pm_notify(bus, true);
}
hda_call_codec_resume(codec); hda_call_codec_resume(codec);
spin_lock(&codec->power_lock); spin_lock(&codec->power_lock);

2
sound/pci/hda/hda_codec.h
View File

@ -868,7 +868,7 @@ struct hda_codec {
#ifdef CONFIG_PM #ifdef CONFIG_PM
unsigned int power_on :1; /* current (global) power-state */ unsigned int power_on :1; /* current (global) power-state */
unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */
unsigned int d3_stop_clk_ok:1; /* BCLK can stop */ unsigned int pm_down_notified:1; /* PM notified to controller */
int power_transition; /* power-state in transition */ int power_transition; /* power-state in transition */
int power_count; /* current (global) power refcount */ int power_count; /* current (global) power refcount */
struct delayed_work power_work; /* delayed task for powerdown */ struct delayed_work power_work; /* delayed task for powerdown */