Commit feb20fae authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Move in_pm accessors to HDA core 



The in_pm atomic in hdac_device is an important field used as a flag
as well as a refcount for PM.  The existing snd_hdac_power_up/down
helpers already refer to it in the HD-audio core code, while the code
to actually setting the value (atomic_inc() / _dec()) is open-coded in
HDA legacy side, which is hard to find.

This patch adds the helper functions to set/reset the in_pm counter to
HDA core and use them in HDA legacy side, for making it clearer who /
where the PM is managed.

There is no functional changes, just code refactoring.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c288248f

include/sound/hdaudio.h

+27 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/device.h>

#include <linux/interrupt.h>

#include <linux/pm_runtime.h>

#include <linux/timecounter.h>

#include <sound/core.h>

#include <sound/memalloc.h>
@@ -171,12 +172,38 @@ int snd_hdac_power_down(struct hdac_device *codec); 
int snd_hdac_power_up_pm(struct hdac_device *codec);

int snd_hdac_power_down_pm(struct hdac_device *codec);

int snd_hdac_keep_power_up(struct hdac_device *codec);



/* call this at entering into suspend/resume callbacks in codec driver */

static inline void snd_hdac_enter_pm(struct hdac_device *codec)

{

	atomic_inc(&codec->in_pm);

}



/* call this at leaving from suspend/resume callbacks in codec driver */

static inline void snd_hdac_leave_pm(struct hdac_device *codec)

{

	atomic_dec(&codec->in_pm);

}



static inline bool snd_hdac_is_in_pm(struct hdac_device *codec)

{

	return atomic_read(&codec->in_pm);

}



static inline bool snd_hdac_is_power_on(struct hdac_device *codec)

{

	return !pm_runtime_suspended(&codec->dev);

}

#else

static inline int snd_hdac_power_up(struct hdac_device *codec) { return 0; }

static inline int snd_hdac_power_down(struct hdac_device *codec) { return 0; }

static inline int snd_hdac_power_up_pm(struct hdac_device *codec) { return 0; }

static inline int snd_hdac_power_down_pm(struct hdac_device *codec) { return 0; }

static inline int snd_hdac_keep_power_up(struct hdac_device *codec) { return 0; }

static inline void snd_hdac_enter_pm(struct hdac_device *codec) {}

static inline void snd_hdac_leave_pm(struct hdac_device *codec) {}

static inline bool snd_hdac_is_in_pm(struct hdac_device *codec) { return 0; }

static inline bool snd_hdac_is_power_on(struct hdac_device *codec) { return 1; }

#endif



/*

sound/pci/hda/hda_codec.c

+6 −15
Original line number Diff line number Diff line
@@ -37,15 +37,8 @@ 
#include "hda_jack.h"

#include <sound/hda_hwdep.h>



#ifdef CONFIG_PM

#define codec_in_pm(codec)	atomic_read(&(codec)->core.in_pm)

#define hda_codec_is_power_on(codec) \

	(!pm_runtime_suspended(hda_codec_dev(codec)))

#else

#define codec_in_pm(codec)	0

#define hda_codec_is_power_on(codec)	1

#endif



#define codec_in_pm(codec)		snd_hdac_is_in_pm(&codec->core)

#define hda_codec_is_power_on(codec)	snd_hdac_is_power_on(&codec->core)

#define codec_has_epss(codec) \

	((codec)->core.power_caps & AC_PWRST_EPSS)

#define codec_has_clkstop(codec) \
@@ -2846,14 +2839,13 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec) 
{

	unsigned int state;



	atomic_inc(&codec->core.in_pm);



	snd_hdac_enter_pm(&codec->core);

	if (codec->patch_ops.suspend)

		codec->patch_ops.suspend(codec);

	hda_cleanup_all_streams(codec);

	state = hda_set_power_state(codec, AC_PWRST_D3);

	update_power_acct(codec, true);

	atomic_dec(&codec->core.in_pm);

	snd_hdac_leave_pm(&codec->core);

	return state;

}
@@ -2862,8 +2854,7 @@ static unsigned int hda_call_codec_suspend(struct hda_codec *codec) 
 */

static void hda_call_codec_resume(struct hda_codec *codec)

{

	atomic_inc(&codec->core.in_pm);



	snd_hdac_enter_pm(&codec->core);

	if (codec->core.regmap)

		regcache_mark_dirty(codec->core.regmap);
@@ -2886,7 +2877,7 @@ static void hda_call_codec_resume(struct hda_codec *codec) 
		hda_jackpoll_work(&codec->jackpoll_work.work);

	else

		snd_hda_jack_report_sync(codec);

	atomic_dec(&codec->core.in_pm);

	snd_hdac_leave_pm(&codec->core);

}



static int hda_codec_runtime_suspend(struct device *dev)

sound/pci/hda/patch_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2489,7 +2489,7 @@ static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe) 
	if (snd_power_get_state(codec->card) != SNDRV_CTL_POWER_D0)

		return;

	/* ditto during suspend/resume process itself */

	if (atomic_read(&(codec)->core.in_pm))

	if (snd_hdac_is_in_pm(&codec->core))

		return;



	snd_hdac_i915_set_bclk(&codec->bus->core);

CRA Git | Maintained and supported by SUSTech CRA and CCSE