Commit d2baa153 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Takashi Iwai
Browse files

ALSA: emu10k1: fix capture buffer size confusion 



The buffer size register sets the size of the whole buffer, not just one
period. We actually handled it like that, except that the constraint was
set on the wrong parameter. The period size is implicitly constrained by
the buffer size and the fixed period count of 2.

Signed-off-by: default avatarOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230523200709.236059-2-oswald.buddenhagen@gmx.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f4ab5950

sound/pci/emu10k1/emupcm.c

+10 −7
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm *epcm, 
	return 0;

}



static const unsigned int capture_period_sizes[31] = {

static const unsigned int capture_buffer_sizes[31] = {

	384,	448,	512,	640,

	384*2,	448*2,	512*2,	640*2,

	384*4,	448*4,	512*4,	640*4,
@@ -133,9 +133,9 @@ static const unsigned int capture_period_sizes[31] = { 
	384*128,448*128,512*128

};



static const struct snd_pcm_hw_constraint_list hw_constraints_capture_period_sizes = {

static const struct snd_pcm_hw_constraint_list hw_constraints_capture_buffer_sizes = {

	.count = 31,

	.list = capture_period_sizes,

	.list = capture_buffer_sizes,

	.mask = 0

};
@@ -499,7 +499,7 @@ static int snd_emu10k1_capture_prepare(struct snd_pcm_substream *substream) 
	epcm->capture_bufsize = snd_pcm_lib_buffer_bytes(substream);

	epcm->capture_bs_val = 0;

	for (idx = 0; idx < 31; idx++) {

		if (capture_period_sizes[idx] == epcm->capture_bufsize) {

		if (capture_buffer_sizes[idx] == epcm->capture_bufsize) {

			epcm->capture_bs_val = idx + 1;

			break;

		}
@@ -1219,9 +1219,10 @@ static int snd_emu10k1_capture_open(struct snd_pcm_substream *substream) 
	runtime->private_data = epcm;

	runtime->private_free = snd_emu10k1_pcm_free_substream;

	runtime->hw = snd_emu10k1_capture;

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,

				   &hw_constraints_capture_buffer_sizes);

	emu->capture_interrupt = snd_emu10k1_pcm_ac97adc_interrupt;

	emu->pcm_capture_substream = substream;

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_capture_period_sizes);

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_capture_rates);

	return 0;

}
@@ -1258,9 +1259,10 @@ static int snd_emu10k1_capture_mic_open(struct snd_pcm_substream *substream) 
	runtime->hw.rates = SNDRV_PCM_RATE_8000;

	runtime->hw.rate_min = runtime->hw.rate_max = 8000;

	runtime->hw.channels_min = 1;

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,

				   &hw_constraints_capture_buffer_sizes);

	emu->capture_mic_interrupt = snd_emu10k1_pcm_ac97mic_interrupt;

	emu->pcm_capture_mic_substream = substream;

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_capture_period_sizes);

	return 0;

}
@@ -1365,9 +1367,10 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream) 
	epcm->capture_cr_val = emu->efx_voices_mask[0];

	epcm->capture_cr_val2 = emu->efx_voices_mask[1];

	spin_unlock_irq(&emu->reg_lock);

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,

				   &hw_constraints_capture_buffer_sizes);

	emu->capture_efx_interrupt = snd_emu10k1_pcm_efx_interrupt;

	emu->pcm_capture_efx_substream = substream;

	snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_capture_period_sizes);

	return 0;

}