summaryrefslogtreecommitdiffstats
path: root/sound/x86
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-01-30 18:17:44 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-03 17:25:30 +0100
commit6ddb3ab66f94109c524859ba4dd9d43772893676 (patch)
tree63defc73cfa9350e07f4c9e2a5d5cf5228f87f69 /sound/x86
parent7f2e9ab5a2e1afcedd1e50650670c309e46822ac (diff)
downloadlinux-6ddb3ab66f94109c524859ba4dd9d43772893676.tar.bz2
ALSA: x86: Move the global underrun_count to struct snd_intelhad
The last one is in intel_hdmi_audio.c, underrun_count: this can be embedded in snd_intelhad object. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86')
-rw-r--r--sound/x86/intel_hdmi_audio.c15
-rw-r--r--sound/x86/intel_hdmi_audio.h2
2 files changed, 9 insertions, 8 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index ed9db2ebe9cf..e08691110a48 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -40,7 +40,6 @@
/*standard module options for ALSA. This module supports only one card*/
static int hdmi_card_index = SNDRV_DEFAULT_IDX1;
static char *hdmi_card_id = SNDRV_DEFAULT_STR1;
-static int underrun_count;
module_param_named(index, hdmi_card_index, int, 0444);
MODULE_PARM_DESC(index,
@@ -969,7 +968,7 @@ static int snd_intelhad_open(struct snd_pcm_substream *substream)
intelhaddata = snd_pcm_substream_chip(substream);
had_stream = intelhaddata->private_data;
runtime = substream->runtime;
- underrun_count = 0;
+ intelhaddata->underrun_count = 0;
pm_runtime_get(intelhaddata->dev);
@@ -1376,19 +1375,19 @@ static snd_pcm_uframes_t snd_intelhad_pcm_pointer(
AUD_BUF_A_LENGTH + (buf_id * HAD_REG_WIDTH), &t);
if ((t == 0) || (t == ((u32)-1L))) {
- underrun_count++;
+ intelhaddata->underrun_count++;
pr_debug("discovered buffer done for buf %d, count = %d\n",
- buf_id, underrun_count);
+ buf_id, intelhaddata->underrun_count);
- if (underrun_count > (HAD_MIN_PERIODS/2)) {
+ if (intelhaddata->underrun_count > (HAD_MIN_PERIODS/2)) {
pr_debug("assume audio_codec_reset, underrun = %d - do xrun\n",
- underrun_count);
- underrun_count = 0;
+ intelhaddata->underrun_count);
+ intelhaddata->underrun_count = 0;
return SNDRV_PCM_POS_XRUN;
}
} else {
/* Reset Counter */
- underrun_count = 0;
+ intelhaddata->underrun_count = 0;
}
t = intelhaddata->buf_info[buf_id].buf_size - t;
diff --git a/sound/x86/intel_hdmi_audio.h b/sound/x86/intel_hdmi_audio.h
index 110d1d083000..da0a927d37fe 100644
--- a/sound/x86/intel_hdmi_audio.h
+++ b/sound/x86/intel_hdmi_audio.h
@@ -119,6 +119,7 @@ struct had_pvt_data {
* @chmap: holds channel map info
* @audio_reg_base: hdmi audio register base offset
* @hw_silence: flag indicates SoC support for HW silence/Keep alive
+ * @underrun_count: PCM stream underrun counter
*/
struct snd_intelhad {
struct snd_card *card;
@@ -142,6 +143,7 @@ struct snd_intelhad {
unsigned int *audio_reg_base;
unsigned int audio_cfg_offset;
bool hw_silence;
+ int underrun_count;
};
int had_event_handler(enum had_event_type event_type, void *data);