Commit dd20e68a authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: fireworks: register the size of PCM period to AMDTP domain

This commit is a preparation to share the size of PCM period between
PCM substreams on AMDTP streams in the same domain. At this time,
the size of PCM period in PCM substream which starts AMDTP streams in the
same domain is recorded.
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191007110532.30270-4-o-takashi@sakamocchi.jpSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8737209f
...@@ -207,7 +207,8 @@ int snd_efw_command_get_sampling_rate(struct snd_efw *efw, unsigned int *rate); ...@@ -207,7 +207,8 @@ int snd_efw_command_get_sampling_rate(struct snd_efw *efw, unsigned int *rate);
int snd_efw_command_set_sampling_rate(struct snd_efw *efw, unsigned int rate); int snd_efw_command_set_sampling_rate(struct snd_efw *efw, unsigned int rate);
int snd_efw_stream_init_duplex(struct snd_efw *efw); int snd_efw_stream_init_duplex(struct snd_efw *efw);
int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate); int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate,
unsigned int frames_per_period);
int snd_efw_stream_start_duplex(struct snd_efw *efw); int snd_efw_stream_start_duplex(struct snd_efw *efw);
void snd_efw_stream_stop_duplex(struct snd_efw *efw); void snd_efw_stream_stop_duplex(struct snd_efw *efw);
void snd_efw_stream_update_duplex(struct snd_efw *efw); void snd_efw_stream_update_duplex(struct snd_efw *efw);
......
...@@ -17,7 +17,7 @@ static int midi_open(struct snd_rawmidi_substream *substream) ...@@ -17,7 +17,7 @@ static int midi_open(struct snd_rawmidi_substream *substream)
goto end; goto end;
mutex_lock(&efw->mutex); mutex_lock(&efw->mutex);
err = snd_efw_stream_reserve_duplex(efw, 0); err = snd_efw_stream_reserve_duplex(efw, 0, 0);
if (err >= 0) { if (err >= 0) {
++efw->substreams_counter; ++efw->substreams_counter;
err = snd_efw_stream_start_duplex(efw); err = snd_efw_stream_start_duplex(efw);
......
...@@ -231,9 +231,11 @@ static int pcm_hw_params(struct snd_pcm_substream *substream, ...@@ -231,9 +231,11 @@ 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 frames_per_period = params_period_size(hw_params);
mutex_lock(&efw->mutex); mutex_lock(&efw->mutex);
err = snd_efw_stream_reserve_duplex(efw, rate); err = snd_efw_stream_reserve_duplex(efw, rate,
frames_per_period);
if (err >= 0) if (err >= 0)
++efw->substreams_counter; ++efw->substreams_counter;
mutex_unlock(&efw->mutex); mutex_unlock(&efw->mutex);
......
...@@ -181,7 +181,8 @@ static int keep_resources(struct snd_efw *efw, struct amdtp_stream *stream, ...@@ -181,7 +181,8 @@ static int keep_resources(struct snd_efw *efw, struct amdtp_stream *stream,
return cmp_connection_reserve(conn, amdtp_stream_get_max_payload(stream)); return cmp_connection_reserve(conn, amdtp_stream_get_max_payload(stream));
} }
int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate) int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate,
unsigned int frames_per_period)
{ {
unsigned int curr_rate; unsigned int curr_rate;
int err; int err;
...@@ -228,6 +229,14 @@ int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate) ...@@ -228,6 +229,14 @@ int snd_efw_stream_reserve_duplex(struct snd_efw *efw, unsigned int rate)
cmp_connection_release(&efw->in_conn); cmp_connection_release(&efw->in_conn);
return err; return err;
} }
err = amdtp_domain_set_events_per_period(&efw->domain,
frames_per_period);
if (err < 0) {
cmp_connection_release(&efw->in_conn);
cmp_connection_release(&efw->out_conn);
return err;
}
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment