Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: dice: share PCM buffer size for both direction

Browse Source 
This commit allows ALSA dice driver to share PCM buffer size for both
capture and playback PCM substream. When AMDTP domain starts for one
of the PCM substream, buffer size of the PCM substream is stores to
AMDTP domain structure. Some AMDTP streams have already run with the
buffer size when another PCM substream starts, therefore the PCM
substream has a constraint to its buffer size.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191017155424.885-6-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2019-10-18 00:54:17 +09:00 committed by Takashi Iwai
parent 3299d2a0f7
commit ecb40fd2c8
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/firewire/dice/dice-midi.c
View File

@ -17,7 +17,7 @@ static int midi_open(struct snd_rawmidi_substream *substream)
mutex_lock(&dice->mutex); mutex_lock(&dice->mutex);
err = snd_dice_stream_reserve_duplex(dice, 0, 0); err = snd_dice_stream_reserve_duplex(dice, 0, 0, 0);
if (err >= 0) { if (err >= 0) {
++dice->substreams_counter; ++dice->substreams_counter;
err = snd_dice_stream_start_duplex(dice); err = snd_dice_stream_start_duplex(dice);

20
sound/firewire/dice/dice-pcm.c
View File

@ -204,6 +204,7 @@ static int pcm_open(struct snd_pcm_substream *substream)
if (!internal || if (!internal ||
(dice->substreams_counter > 0 && d->events_per_period > 0)) { (dice->substreams_counter > 0 && d->events_per_period > 0)) {
unsigned int frames_per_period = d->events_per_period; unsigned int frames_per_period = d->events_per_period;
unsigned int frames_per_buffer = d->events_per_buffer;
unsigned int rate; unsigned int rate;
err = snd_dice_transaction_get_rate(dice, &rate); err = snd_dice_transaction_get_rate(dice, &rate);
@ -217,8 +218,10 @@ static int pcm_open(struct snd_pcm_substream *substream)
if (frames_per_period > 0) { if (frames_per_period > 0) {
// For double_pcm_frame quirk. // For double_pcm_frame quirk.
if (rate > 96000) if (rate > 96000) {
frames_per_period *= 2; frames_per_period *= 2;
frames_per_buffer *= 2;
}
err = snd_pcm_hw_constraint_minmax(substream->runtime, err = snd_pcm_hw_constraint_minmax(substream->runtime,
SNDRV_PCM_HW_PARAM_PERIOD_SIZE, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
@ -227,6 +230,14 @@ static int pcm_open(struct snd_pcm_substream *substream)
mutex_unlock(&dice->mutex); mutex_unlock(&dice->mutex);
goto err_locked; goto err_locked;
} }
err = snd_pcm_hw_constraint_minmax(substream->runtime,
SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
frames_per_buffer, frames_per_buffer);
if (err < 0) {
mutex_unlock(&dice->mutex);
goto err_locked;
}
} }
} }
@ -263,13 +274,16 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) { if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
unsigned int rate = params_rate(hw_params); unsigned int rate = params_rate(hw_params);
unsigned int events_per_period = params_period_size(hw_params); unsigned int events_per_period = params_period_size(hw_params);
unsigned int events_per_buffer = params_buffer_size(hw_params);
mutex_lock(&dice->mutex); mutex_lock(&dice->mutex);
// For double_pcm_frame quirk. // For double_pcm_frame quirk.
if (rate > 96000) if (rate > 96000) {
events_per_period /= 2; events_per_period /= 2;
events_per_buffer /= 2;
}
err = snd_dice_stream_reserve_duplex(dice, rate, err = snd_dice_stream_reserve_duplex(dice, rate,
events_per_period); events_per_period, events_per_buffer);
if (err >= 0) if (err >= 0)
++dice->substreams_counter; ++dice->substreams_counter;
mutex_unlock(&dice->mutex); mutex_unlock(&dice->mutex);

5
sound/firewire/dice/dice-stream.c
View File

@ -279,7 +279,8 @@ static void finish_session(struct snd_dice *dice, struct reg_params *tx_params,
} }
int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate, int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
unsigned int events_per_period) unsigned int events_per_period,
unsigned int events_per_buffer)
{ {
unsigned int curr_rate; unsigned int curr_rate;
int err; int err;
@ -327,7 +328,7 @@ int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
goto error; goto error;
err = amdtp_domain_set_events_per_period(&dice->domain, err = amdtp_domain_set_events_per_period(&dice->domain,
events_per_period, 0); events_per_period, events_per_buffer);
if (err < 0) if (err < 0)
goto error; goto error;
} }

3
sound/firewire/dice/dice.h
View File

@ -211,7 +211,8 @@ void snd_dice_stream_stop_duplex(struct snd_dice *dice);
int snd_dice_stream_init_duplex(struct snd_dice *dice); int snd_dice_stream_init_duplex(struct snd_dice *dice);
void snd_dice_stream_destroy_duplex(struct snd_dice *dice); void snd_dice_stream_destroy_duplex(struct snd_dice *dice);
int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate, int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
unsigned int events_per_period); unsigned int events_per_period,
unsigned int events_per_buffer);
void snd_dice_stream_update_duplex(struct snd_dice *dice); void snd_dice_stream_update_duplex(struct snd_dice *dice);
int snd_dice_stream_detect_current_formats(struct snd_dice *dice); int snd_dice_stream_detect_current_formats(struct snd_dice *dice);