Skip to content

Commit

Permalink
ALSA: hda - convert intelhdmi global references to local parameters
Browse files Browse the repository at this point in the history 
No behavior change.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Wu Fengguang authored and Takashi Iwai committed Oct 30, 2009
1 parent 92608ba commit 6797cf2
Showing 1 changed file with 43 additions and 37 deletions.
80 changes: 43 additions & 37 deletions sound/pci/hda/patch_intelhdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,35 +189,36 @@ static struct cea_channel_speaker_allocation channel_allocations[] = {
*/

#ifdef BE_PARANOID
static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t nid,
static void hdmi_get_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,
int *packet_index, int *byte_index)
{
int val;

val = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_INDEX, 0);
val = snd_hda_codec_read(codec, pin_nid, 0,
AC_VERB_GET_HDMI_DIP_INDEX, 0);

*packet_index = val >> 5;
*byte_index = val & 0x1f;
}
#endif

static void hdmi_set_dip_index(struct hda_codec *codec, hda_nid_t nid,
static void hdmi_set_dip_index(struct hda_codec *codec, hda_nid_t pin_nid,
int packet_index, int byte_index)
{
int val;

val = (packet_index << 5) | (byte_index & 0x1f);

snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);
snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_INDEX, val);
}

static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t nid,
static void hdmi_write_dip_byte(struct hda_codec *codec, hda_nid_t pin_nid,
unsigned char val)
{
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val);
snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_DATA, val);
}

static void hdmi_enable_output(struct hda_codec *codec)
static void hdmi_enable_output(struct hda_codec *codec, hda_nid_t pin_nid)
{
/* Unmute */
if (get_wcaps(codec, pin_nid) & AC_WCAP_OUT_AMP)
Expand All @@ -231,7 +232,8 @@ static void hdmi_enable_output(struct hda_codec *codec)
/*
* Enable Audio InfoFrame Transmission
*/
static void hdmi_start_infoframe_trans(struct hda_codec *codec)
static void hdmi_start_infoframe_trans(struct hda_codec *codec,
hda_nid_t pin_nid)
{
hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
Expand All @@ -241,37 +243,40 @@ static void hdmi_start_infoframe_trans(struct hda_codec *codec)
/*
* Disable Audio InfoFrame Transmission
*/
static void hdmi_stop_infoframe_trans(struct hda_codec *codec)
static void hdmi_stop_infoframe_trans(struct hda_codec *codec,
hda_nid_t pin_nid)
{
hdmi_set_dip_index(codec, pin_nid, 0x0, 0x0);
snd_hda_codec_write(codec, pin_nid, 0, AC_VERB_SET_HDMI_DIP_XMIT,
AC_DIPXMIT_DISABLE);
}

static int hdmi_get_channel_count(struct hda_codec *codec)
static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t nid)
{
return 1 + snd_hda_codec_read(codec, cvt_nid, 0,
return 1 + snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_CVT_CHAN_COUNT, 0);
}

static void hdmi_set_channel_count(struct hda_codec *codec, int chs)
static void hdmi_set_channel_count(struct hda_codec *codec,
hda_nid_t nid, int chs)
{
snd_hda_codec_write(codec, cvt_nid, 0,
AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CVT_CHAN_COUNT, chs - 1);

if (chs != hdmi_get_channel_count(codec))
#ifdef CONFIG_SND_DEBUG_VERBOSE
if (chs != hdmi_get_channel_count(codec, nid))
snd_printd(KERN_INFO "HDMI channel count: expect %d, get %d\n",
chs, hdmi_get_channel_count(codec));
chs, hdmi_get_channel_count(codec, nid));
#endif
}

static void hdmi_debug_channel_mapping(struct hda_codec *codec)
static void hdmi_debug_channel_mapping(struct hda_codec *codec, hda_nid_t nid)
{
#ifdef CONFIG_SND_DEBUG_VERBOSE
int i;
int slot;

for (i = 0; i < 8; i++) {
slot = snd_hda_codec_read(codec, cvt_nid, 0,
slot = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_HDMI_CHAN_SLOT, i);
printk(KERN_DEBUG "HDMI: ASP channel %d => slot %d\n",
slot >> 4, slot & 0x7);
Expand All @@ -293,7 +298,7 @@ static void hdmi_parse_eld(struct hda_codec *codec)
* Audio InfoFrame routines
*/

static void hdmi_debug_dip_size(struct hda_codec *codec)
static void hdmi_debug_dip_size(struct hda_codec *codec, hda_nid_t pin_nid)
{
#ifdef CONFIG_SND_DEBUG_VERBOSE
int i;
Expand All @@ -310,7 +315,7 @@ static void hdmi_debug_dip_size(struct hda_codec *codec)
#endif
}

static void hdmi_clear_dip_buffers(struct hda_codec *codec)
static void hdmi_clear_dip_buffers(struct hda_codec *codec, hda_nid_t pin_nid)
{
#ifdef BE_PARANOID
int i, j;
Expand Down Expand Up @@ -340,14 +345,15 @@ static void hdmi_clear_dip_buffers(struct hda_codec *codec)
}

static void hdmi_fill_audio_infoframe(struct hda_codec *codec,
struct hdmi_audio_infoframe *ai)
hda_nid_t pin_nid,
struct hdmi_audio_infoframe *ai)
{
u8 *params = (u8 *)ai;
u8 sum = 0;
int i;

hdmi_debug_dip_size(codec);
hdmi_clear_dip_buffers(codec); /* be paranoid */
hdmi_debug_dip_size(codec, pin_nid);
hdmi_clear_dip_buffers(codec, pin_nid); /* be paranoid */

for (i = 0; i < sizeof(ai); i++)
sum += params[i];
Expand Down Expand Up @@ -386,7 +392,7 @@ static void init_channel_allocations(void)
*
* TODO: it could select the wrong CA from multiple candidates.
*/
static int hdmi_setup_channel_allocation(struct hda_codec *codec,
static int hdmi_setup_channel_allocation(struct hda_codec *codec, hda_nid_t nid,
struct hdmi_audio_infoframe *ai)
{
struct intel_hdmi_spec *spec = codec->spec;
Expand Down Expand Up @@ -439,8 +445,8 @@ static int hdmi_setup_channel_allocation(struct hda_codec *codec,
return ai->CA;
}

static void hdmi_setup_channel_mapping(struct hda_codec *codec,
struct hdmi_audio_infoframe *ai)
static void hdmi_setup_channel_mapping(struct hda_codec *codec, hda_nid_t nid,
struct hdmi_audio_infoframe *ai)
{
int i;

Expand All @@ -453,15 +459,15 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
*/

for (i = 0; i < 8; i++)
snd_hda_codec_write(codec, cvt_nid, 0,
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_HDMI_CHAN_SLOT,
(i << 4) | i);

hdmi_debug_channel_mapping(codec);
hdmi_debug_channel_mapping(codec, nid);
}


static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid,
struct snd_pcm_substream *substream)
{
struct hdmi_audio_infoframe ai = {
Expand All @@ -471,11 +477,11 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
.CC02_CT47 = substream->runtime->channels - 1,
};

hdmi_setup_channel_allocation(codec, &ai);
hdmi_setup_channel_mapping(codec, &ai);
hdmi_setup_channel_allocation(codec, nid, &ai);
hdmi_setup_channel_mapping(codec, nid, &ai);

hdmi_fill_audio_infoframe(codec, &ai);
hdmi_start_infoframe_trans(codec);
hdmi_fill_audio_infoframe(codec, pin_nid, &ai);
hdmi_start_infoframe_trans(codec, pin_nid);
}


Expand Down Expand Up @@ -553,7 +559,7 @@ static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
{
struct intel_hdmi_spec *spec = codec->spec;

hdmi_stop_infoframe_trans(codec);
hdmi_stop_infoframe_trans(codec, pin_nid);

return snd_hda_multi_out_dig_close(codec, &spec->multiout);
}
Expand All @@ -569,9 +575,9 @@ static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
format, substream);

hdmi_set_channel_count(codec, substream->runtime->channels);
hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels);

hdmi_setup_audio_infoframe(codec, substream);
hdmi_setup_audio_infoframe(codec, cvt_nid, substream);

return 0;
}
Expand Down Expand Up @@ -619,7 +625,7 @@ static int intel_hdmi_build_controls(struct hda_codec *codec)

static int intel_hdmi_init(struct hda_codec *codec)
{
hdmi_enable_output(codec);
hdmi_enable_output(codec, pin_nid);

snd_hda_codec_write(codec, pin_nid, 0,
AC_VERB_SET_UNSOLICITED_ENABLE,
Expand Down

0 comments on commit 6797cf2

Please sign in to comment.