From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5F572C7EE29 for ; Tue, 13 Jun 2023 07:40:17 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 23420836; Tue, 13 Jun 2023 09:39:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 23420836 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1686642015; bh=hkq0/09sf2B/Ulk8caBtd6JH6taIrKM7A89YbE1GMMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=qZgSfa95r+3Ut2H9IjB7AM8vAXXV17jx+bnbI9GJ9YLaRzu7/L5RdziLlRX0PjhHJ Y+M+gmmToePVGQ6VWBbwkDLEx6ChXEGwliSBVLW1uHO2dDcW4IKeoYZd5GatDQYSga iUhGo9UHMBTZHK7CIXl0cB2TbEkovOANdeky+NQw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C622DF80563; Tue, 13 Jun 2023 09:38:43 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 4F63AF8055C; Tue, 13 Jun 2023 09:38:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 09F26F8055C; Tue, 13 Jun 2023 09:38:40 +0200 (CEST) Received: from bluemchen.kde.org (bluemchen.kde.org [IPv6:2001:470:142:8::100]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AB99BF80149 for ; Tue, 13 Jun 2023 09:38:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AB99BF80149 Received: from ugly.fritz.box (localhost [127.0.0.1]) by bluemchen.kde.org (Postfix) with ESMTP id 991732427E; Tue, 13 Jun 2023 03:38:22 -0400 (EDT) Received: by ugly.fritz.box (masqmail 0.3.4, from userid 1000) id 1q8ybe-dS7-00; Tue, 13 Jun 2023 09:38:22 +0200 From: Oswald Buddenhagen To: alsa-devel@alsa-project.org Cc: Takashi Iwai , Jaroslav Kysela Subject: [PATCH 8/8] ALSA: emu10k1: add high-rate playback in E-MU D.A.S. mode Date: Tue, 13 Jun 2023 09:38:22 +0200 Message-Id: <20230613073822.1343234-9-oswald.buddenhagen@gmx.de> X-Mailer: git-send-email 2.40.0.152.g15d061e6df In-Reply-To: <20230613073822.1343234-1-oswald.buddenhagen@gmx.de> References: <20230613073822.1343234-1-oswald.buddenhagen@gmx.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: BZT3CDRNEJ3SODGOBV5JWULAH2GS2Z7Z X-Message-ID-Hash: BZT3CDRNEJ3SODGOBV5JWULAH2GS2Z7Z X-MailFrom: ossi@kde.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This mode does not offer mmapped I/O, as we need to copy the buffer anyway to reshuffle it. A limitation is that we'll refuse writes which aren't a multiple of 2/4 frames, but that's unlikely to be significant. But if one really wanted to make it work, this could be done either locally, or by reviving (and fixing) snd_pcm_sw_params.xfer_align, which was obsoleted in commit d948035a92 ("Remove PCM xfer_align sw params"). Signed-off-by: Oswald Buddenhagen --- sound/pci/emu10k1/emufx.c | 7 +- sound/pci/emu10k1/emumixer.c | 59 ++++---- sound/pci/emu10k1/emupcm.c | 257 ++++++++++++++++++++++++++++------- sound/pci/emu10k1/voice.c | 6 + 4 files changed, 247 insertions(+), 82 deletions(-) diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 62fcc1d27848..bc669f35f643 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c @@ -1327,7 +1327,7 @@ static int _snd_emu10k1_das_init_efx(struct snd_emu10k1 *emu) if (emu->card_capabilities->ca0108_chip) { int num_cap = emu->card_capabilities->emu_in_32 ? 32 : 16; - for (int z = 0; z < 16; z++) { + for (int z = 0; z < 32; z++) { A_OP(icode, &ptr, iMAC0, A_GPR(tmp), A_C_00000000, A_FXBUS(z * 2), A_C_00010000); // >> 15 A_OP(icode, &ptr, iMACINT0, A_GPR(tmp + 1), A_C_00000000, A_FXBUS(z * 2 + 1), A_C_00000002); // << 1 A_OP(icode, &ptr, iANDXOR, A3_EMU32OUT(z), A_GPR(tmp), A_GPR(lowword_mask), A_GPR(tmp + 1)); @@ -1349,6 +1349,11 @@ static int _snd_emu10k1_das_init_efx(struct snd_emu10k1 *emu) A_OP(icode, &ptr, iMACINT0, A_GPR(tmp + 1), A_C_00000000, A_FXBUS(z * 2 + 1), A_C_00000002); // << 1 A_OP(icode, &ptr, iANDXOR, A_EMU32OUTL(z), A_GPR(tmp), A_GPR(lowword_mask), A_GPR(tmp + 1)); } + for (int z = 0; z < 16; z++) { + A_OP(icode, &ptr, iMAC0, A_GPR(tmp), A_C_00000000, A_FXBUS(z * 2 + 32), A_C_00010000); // >> 15 + A_OP(icode, &ptr, iMACINT0, A_GPR(tmp + 1), A_C_00000000, A_FXBUS(z * 2 + 33), A_C_00000002); // << 1 + A_OP(icode, &ptr, iANDXOR, A_EMU32OUTH(z), A_GPR(tmp), A_GPR(lowword_mask), A_GPR(tmp + 1)); + } /* Note that the Alice2 DSPs have 6 I2S inputs which we don't use. */ snd_emu10k1_audigy_dsp_convert_32_to_2x16( diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 387a0ad895c3..63f7f702c8a2 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c @@ -126,14 +126,15 @@ static int snd_emu10k1_spdif_get_mask(struct snd_kcontrol *kcontrol, "DSP 16", "DSP 17", "DSP 18", "DSP 19", "DSP 20", "DSP 21", "DSP 22", "DSP 23", \ "DSP 24", "DSP 25", "DSP 26", "DSP 27", "DSP 28", "DSP 29", "DSP 30", "DSP 31" -#define PB_TEXTS \ +#define PB_4x_TEXTS \ "PbChn 00", "PbChn 01", "PbChn 02", "PbChn 03", \ - "PbChn 04", "PbChn 05", "PbChn 06", "PbChn 07", \ + "PbChn 04", "PbChn 05", "PbChn 06", "PbChn 07" + +#define PB_TEXTS \ + PB_4x_TEXTS, \ "PbChn 08", "PbChn 09", "PbChn 10", "PbChn 11", \ "PbChn 12", "PbChn 13", "PbChn 14", "PbChn 15" -#define PB_4x_TEXTS PB_TEXTS // Only 1x playback for now - #define PAIR_TEXTS(base, one, two) PAIR_PS(base, one, two, "") #define LR_TEXTS(base) LR_PS(base, "") #define ADAT_TEXTS(pfx) ADAT_PS(pfx, "") @@ -177,26 +178,33 @@ static int snd_emu10k1_spdif_get_mask(struct snd_kcontrol *kcontrol, EMU_SRC_ALICE_EMU32B+0xe, \ EMU_SRC_ALICE_EMU32B+0xf -// Only 1x playback for now #define EMU32_2x_SRC_REGS \ - { EMU_SRC_ALICE_EMU32A }, \ - { EMU_SRC_ALICE_EMU32A+1 }, \ - { EMU_SRC_ALICE_EMU32A+2 }, \ - { EMU_SRC_ALICE_EMU32A+3 }, \ - { EMU_SRC_ALICE_EMU32A+4 }, \ - { EMU_SRC_ALICE_EMU32A+5 }, \ - { EMU_SRC_ALICE_EMU32A+6 }, \ - { EMU_SRC_ALICE_EMU32A+7 }, \ - { EMU_SRC_ALICE_EMU32A+8 }, \ - { EMU_SRC_ALICE_EMU32A+9 }, \ - { EMU_SRC_ALICE_EMU32A+0xa }, \ - { EMU_SRC_ALICE_EMU32A+0xb }, \ - { EMU_SRC_ALICE_EMU32A+0xc }, \ - { EMU_SRC_ALICE_EMU32A+0xd }, \ - { EMU_SRC_ALICE_EMU32A+0xe }, \ - { EMU_SRC_ALICE_EMU32A+0xf } + { EMU_SRC_ALICE_EMU32A+0x0, EMU_SRC_ALICE_EMU32A+0x1 }, \ + { EMU_SRC_ALICE_EMU32A+0x2, EMU_SRC_ALICE_EMU32A+0x3 }, \ + { EMU_SRC_ALICE_EMU32A+0x4, EMU_SRC_ALICE_EMU32A+0x5 }, \ + { EMU_SRC_ALICE_EMU32A+0x6, EMU_SRC_ALICE_EMU32A+0x7 }, \ + { EMU_SRC_ALICE_EMU32A+0x8, EMU_SRC_ALICE_EMU32A+0x9 }, \ + { EMU_SRC_ALICE_EMU32A+0xa, EMU_SRC_ALICE_EMU32A+0xb }, \ + { EMU_SRC_ALICE_EMU32A+0xc, EMU_SRC_ALICE_EMU32A+0xd }, \ + { EMU_SRC_ALICE_EMU32A+0xe, EMU_SRC_ALICE_EMU32A+0xf }, \ + { EMU_SRC_ALICE_EMU32B+0x0, EMU_SRC_ALICE_EMU32B+0x1 }, \ + { EMU_SRC_ALICE_EMU32B+0x2, EMU_SRC_ALICE_EMU32B+0x3 }, \ + { EMU_SRC_ALICE_EMU32B+0x4, EMU_SRC_ALICE_EMU32B+0x5 }, \ + { EMU_SRC_ALICE_EMU32B+0x6, EMU_SRC_ALICE_EMU32B+0x7 }, \ + { EMU_SRC_ALICE_EMU32B+0x8, EMU_SRC_ALICE_EMU32B+0x9 }, \ + { EMU_SRC_ALICE_EMU32B+0xa, EMU_SRC_ALICE_EMU32B+0xb }, \ + { EMU_SRC_ALICE_EMU32B+0xc, EMU_SRC_ALICE_EMU32B+0xd }, \ + { EMU_SRC_ALICE_EMU32B+0xe, EMU_SRC_ALICE_EMU32B+0xf } -#define EMU32_4x_SRC_REGS EMU32_2x_SRC_REGS +#define EMU32_4x_SRC_REGS \ + { EMU_SRC_ALICE_EMU32A+0x0, EMU_SRC_ALICE_EMU32A+0x1, EMU_SRC_ALICE_EMU32A+0x2, EMU_SRC_ALICE_EMU32A+0x3 }, \ + { EMU_SRC_ALICE_EMU32A+0x4, EMU_SRC_ALICE_EMU32A+0x5, EMU_SRC_ALICE_EMU32A+0x6, EMU_SRC_ALICE_EMU32A+0x7 }, \ + { EMU_SRC_ALICE_EMU32A+0x8, EMU_SRC_ALICE_EMU32A+0x9, EMU_SRC_ALICE_EMU32A+0xa, EMU_SRC_ALICE_EMU32A+0xb }, \ + { EMU_SRC_ALICE_EMU32A+0xc, EMU_SRC_ALICE_EMU32A+0xd, EMU_SRC_ALICE_EMU32A+0xe, EMU_SRC_ALICE_EMU32A+0xf }, \ + { EMU_SRC_ALICE_EMU32B+0x0, EMU_SRC_ALICE_EMU32B+0x1, EMU_SRC_ALICE_EMU32B+0x2, EMU_SRC_ALICE_EMU32B+0x3 }, \ + { EMU_SRC_ALICE_EMU32B+0x4, EMU_SRC_ALICE_EMU32B+0x5, EMU_SRC_ALICE_EMU32B+0x6, EMU_SRC_ALICE_EMU32B+0x7 }, \ + { EMU_SRC_ALICE_EMU32B+0x8, EMU_SRC_ALICE_EMU32B+0x9, EMU_SRC_ALICE_EMU32B+0xa, EMU_SRC_ALICE_EMU32B+0xb }, \ + { EMU_SRC_ALICE_EMU32B+0xc, EMU_SRC_ALICE_EMU32B+0xd, EMU_SRC_ALICE_EMU32B+0xe, EMU_SRC_ALICE_EMU32B+0xf } /* 1010 rev1 */ @@ -1086,13 +1094,6 @@ static void snd_emu1010_source_apply(struct snd_emu10k1 *emu, unsigned shift, const unsigned short *regs, const unsigned short *vals) { - unsigned short avals[4]; - - if ((vals[0] & 0x700) == 0x300) { // EMU32x - // Only 1x playback for now - avals[0] = avals[1] = avals[2] = avals[3] = vals[0]; - vals = avals; - } switch (shift) { case 2: snd_emu1010_fpga_link_dst_src_write(emu, regs[3], vals[3]); diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 037ca92dee98..90dad6f4fd70 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -228,16 +228,6 @@ static void snd_emu1010_constrain_efx_rate(struct snd_emu10k1 *emu, { int rate; - rate = emu->emu1010.word_clock; - runtime->hw.rate_min = runtime->hw.rate_max = rate; - runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate); -} - -static void snd_emu1010_constrain_efx_capture_rate(struct snd_emu10k1 *emu, - struct snd_pcm_runtime *runtime) -{ - int rate; - rate = emu->emu1010.word_clock << emu->emu1010.clock_shift; runtime->hw.rate_min = runtime->hw.rate_max = rate; runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate); @@ -419,7 +409,7 @@ static int snd_emu10k1_playback_hw_params(struct snd_pcm_substream *substream, } else { type = EMU10K1_EFX; channels = params_channels(hw_params); - count = 1 + emu->das_mode; + count = (1 + emu->das_mode) << emu->emu1010.clock_shift; } err = snd_emu10k1_pcm_channel_alloc(epcm, type, count, channels); if (err < 0) @@ -508,28 +498,32 @@ static int snd_emu10k1_efx_playback_prepare(struct snd_pcm_substream *substream) struct snd_pcm_runtime *runtime = substream->runtime; struct snd_emu10k1_pcm *epcm = runtime->private_data; bool das_mode = emu->das_mode; + unsigned int shift = emu->emu1010.clock_shift; unsigned int start_addr; unsigned int extra_size, channel_size; - unsigned int i; + unsigned int i, j; epcm->pitch_target = PITCH_48000; start_addr = epcm->start_addr >> 1; // 16-bit voices - extra_size = runtime->period_size; - channel_size = runtime->buffer_size; + extra_size = runtime->period_size >> shift; + channel_size = runtime->buffer_size >> shift; snd_emu10k1_pcm_init_extra_voice(emu, epcm->extra, true, start_addr, start_addr + extra_size); if (das_mode) { + unsigned count = 1 << shift; start_addr >>= 1; epcm->ccca_start_addr = start_addr; for (i = 0; i < runtime->channels; i++) { - snd_emu10k1_pcm_init_das_voices(emu, epcm->voices[i], - start_addr, start_addr + channel_size, - i * 2); - start_addr += channel_size; + for (j = 0; j < count; j++) { + snd_emu10k1_pcm_init_das_voices(emu, epcm->voices[i] + j * 2, + start_addr, start_addr + channel_size, + (i * count + j) * 2); + start_addr += channel_size; + } } } else { epcm->ccca_start_addr = start_addr; @@ -669,26 +663,29 @@ static void snd_emu10k1_playback_fill_cache(struct snd_emu10k1 *emu, static void snd_emu10k1_playback_prepare_voices(struct snd_emu10k1 *emu, struct snd_emu10k1_pcm *epcm, bool w_16, bool stereo, - int channels) + int shift, int channels) { struct snd_pcm_substream *substream = epcm->substream; struct snd_pcm_runtime *runtime = substream->runtime; unsigned eloop_start = epcm->start_addr >> w_16; unsigned loop_start = eloop_start >> stereo; - unsigned eloop_size = runtime->period_size; - unsigned loop_size = runtime->buffer_size; + unsigned eloop_size = runtime->period_size >> shift; + unsigned loop_size = runtime->buffer_size >> shift; u32 sample = w_16 ? 0 : 0x80808080; + int count = 1 << shift; // To make the playback actually start at the 1st frame, // we need to compensate for two circumstances: // - The actual position is delayed by the cache size (64 frames) // - The interpolator is centered around the 4th frame loop_start += (epcm->resume_pos + 64 - 3) % loop_size; for (int i = 0; i < channels; i++) { unsigned voice = epcm->voices[i]->number; - snd_emu10k1_ptr_write(emu, CCCA_CURRADDR, voice, loop_start); - loop_start += loop_size; - snd_emu10k1_playback_fill_cache(emu, voice, sample, stereo); + for (int j = 0; j < count; j++, voice += 2) { + snd_emu10k1_ptr_write(emu, CCCA_CURRADDR, voice, loop_start); + loop_start += loop_size; + snd_emu10k1_playback_fill_cache(emu, voice, sample, stereo); + } } // The interrupt is triggered when CCCA_CURRADDR (CA) wraps around, @@ -831,7 +828,7 @@ static int snd_emu10k1_playback_trigger(struct snd_pcm_substream *substream, spin_lock(&emu->reg_lock); switch (cmd) { case SNDRV_PCM_TRIGGER_START: - snd_emu10k1_playback_prepare_voices(emu, epcm, w_16, stereo, 1); + snd_emu10k1_playback_prepare_voices(emu, epcm, w_16, stereo, 0, 1); fallthrough; case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_RESUME: @@ -935,6 +932,7 @@ static snd_pcm_uframes_t snd_emu10k1_playback_pointer(struct snd_pcm_substream * struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_emu10k1_pcm *epcm = runtime->private_data; + int shift = emu->emu1010.clock_shift; int ptr; if (!epcm->running) @@ -954,42 +952,45 @@ static snd_pcm_uframes_t snd_emu10k1_playback_pointer(struct snd_pcm_substream * // ptr -= 64 - 3; if (ptr < 0) - ptr += runtime->buffer_size; + ptr += runtime->buffer_size >> shift; /* dev_dbg(emu->card->dev, "ptr = 0x%lx, buffer_size = 0x%lx, period_size = 0x%lx\n", (long)ptr, (long)runtime->buffer_size, (long)runtime->period_size); */ - return ptr; + + return ptr << shift; } static u64 snd_emu10k1_efx_playback_voice_mask(struct snd_emu10k1_pcm *epcm, - bool stereo, int channels) + bool stereo, int count, int channels) { u64 mask = 0; - u64 mask0 = (1 << (1 << stereo)) - 1; + u64 mask0 = (1 << (count << stereo)) - 1; for (int i = 0; i < channels; i++) { int voice = epcm->voices[i]->number; mask |= mask0 << voice; } return mask; } static void snd_emu10k1_efx_playback_freeze_voices(struct snd_emu10k1 *emu, struct snd_emu10k1_pcm *epcm, - bool stereo, int channels) + bool stereo, int count, int channels) { for (int i = 0; i < channels; i++) { int voice = epcm->voices[i]->number; - snd_emu10k1_ptr_write(emu, CPF_STOP, voice, 1); - if (stereo) { - // Weirdly enough, the stereo slave needs to be stopped separately - snd_emu10k1_ptr_write(emu, CPF_STOP, voice + 1, 1); + for (int j = 0; j < count; j++, voice += 2) { + snd_emu10k1_ptr_write(emu, CPF_STOP, voice, 1); + if (stereo) { + // Weirdly enough, the stereo slave needs to be stopped separately + snd_emu10k1_ptr_write(emu, CPF_STOP, voice + 1, 1); + } + snd_emu10k1_playback_commit_pitch(emu, voice, PITCH_48000 << 16); } - snd_emu10k1_playback_commit_pitch(emu, voice, PITCH_48000 << 16); } } @@ -1004,57 +1005,63 @@ static void snd_emu10k1_efx_playback_unmute_voices(struct snd_emu10k1 *emu, static void snd_emu10k1_efx_playback_unmute_das_voices(struct snd_emu10k1 *emu, struct snd_emu10k1_pcm *epcm, - int channels) + int count, int channels) { for (int i = 0; i < channels; i++) - snd_emu10k1_playback_unmute_das_voices(emu, epcm->voices[i]); + for (int j = 0; j < count; j++) + snd_emu10k1_playback_unmute_das_voices(emu, epcm->voices[i] + j * 2); } static void snd_emu10k1_efx_playback_stop_voices(struct snd_emu10k1 *emu, struct snd_emu10k1_pcm *epcm, - bool stereo, int channels) + bool stereo, int count, int channels) { for (int i = 0; i < channels; i++) - snd_emu10k1_playback_stop_voice(emu, epcm->voices[i]); + for (int j = 0; j < count; j++) + snd_emu10k1_playback_stop_voice(emu, epcm->voices[i] + j * 2); snd_emu10k1_playback_set_stopped(emu, epcm); for (int i = 0; i < channels; i++) - snd_emu10k1_playback_mute_voices(emu, epcm->voices[i], stereo); + for (int j = 0; j < count; j++) + snd_emu10k1_playback_mute_voices( + emu, epcm->voices[i] + j * 2, stereo); } static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_emu10k1_pcm *epcm = runtime->private_data; + unsigned shift = emu->emu1010.clock_shift; + unsigned count = 1U << shift; bool das_mode = emu->das_mode; u64 mask; int result = 0; spin_lock(&emu->reg_lock); switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_RESUME: mask = snd_emu10k1_efx_playback_voice_mask( - epcm, das_mode, runtime->channels); + epcm, das_mode, count, runtime->channels); for (int i = 0; i < 10; i++) { // Note that the freeze is not interruptible, so we make no // effort to reset the bits outside the error handling here. snd_emu10k1_voice_set_loop_stop_multiple(emu, mask); snd_emu10k1_efx_playback_freeze_voices( - emu, epcm, das_mode, runtime->channels); + emu, epcm, das_mode, count, runtime->channels); snd_emu10k1_playback_prepare_voices( - emu, epcm, true, das_mode, runtime->channels); + emu, epcm, true, das_mode, shift, runtime->channels); // It might seem to make more sense to unmute the voices only after // they have been started, to potentially avoid torturing the speakers // if something goes wrong. However, we cannot unmute atomically, // which means that we'd get some mild artifacts in the regular case. if (das_mode) snd_emu10k1_efx_playback_unmute_das_voices( - emu, epcm, runtime->channels); + emu, epcm, count, runtime->channels); else snd_emu10k1_efx_playback_unmute_voices( emu, epcm, runtime->channels); @@ -1068,7 +1075,7 @@ static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream, } snd_emu10k1_efx_playback_stop_voices( - emu, epcm, das_mode, runtime->channels); + emu, epcm, das_mode, count, runtime->channels); if (result != -EAGAIN) break; @@ -1081,7 +1088,7 @@ static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream, case SNDRV_PCM_TRIGGER_PAUSE_PUSH: snd_emu10k1_playback_stop_voice(emu, epcm->extra); snd_emu10k1_efx_playback_stop_voices( - emu, epcm, das_mode, runtime->channels); + emu, epcm, das_mode, count, runtime->channels); epcm->resume_pos = snd_emu10k1_playback_pointer(substream); break; @@ -1094,6 +1101,129 @@ static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream, return result; } +static void *get_dma_ptr(struct snd_pcm_runtime *runtime, + int channel, unsigned long hwoff) +{ + return runtime->dma_area + hwoff + + channel * (runtime->dma_bytes / runtime->channels); +} + +static void *get_dma_ptr_x(struct snd_pcm_runtime *runtime, + int shift, int channel, int subch, unsigned long hwoff) +{ + return runtime->dma_area + hwoff + + ((channel << shift) + subch) * + (runtime->dma_bytes / (runtime->channels << shift)); +} + +static int snd_emu10k1_efx_playback_silence(struct snd_pcm_substream *substream, + int channel, unsigned long hwoff, + unsigned long bytes) +{ + struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + unsigned shift = emu->emu1010.clock_shift; + unsigned i, j, channels, subchans, voices; + + if (!shift) { + // Non-interleaved buffer is assumed + memset(get_dma_ptr(runtime, channel, hwoff), 0, bytes); + } else { + // Interleaved buffer is assumed, which isn't actually the case + channels = runtime->channels; + subchans = 1 << shift; + voices = channels << shift; + hwoff /= voices; + if (bytes % (voices << 2)) // See *_copy_user() below. + return -EIO; + bytes /= voices; + for (i = 0; i < channels; i++) + for (j = 0; j < subchans; j++) + memset(get_dma_ptr_x(runtime, shift, i, j, hwoff), 0, bytes); + } + return 0; +} + +static int snd_emu10k1_efx_playback_copy_user(struct snd_pcm_substream *substream, + int channel, unsigned long hwoff, + void __user *buf, unsigned long bytes) +{ + struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + unsigned shift = emu->emu1010.clock_shift; + unsigned i, j, k, channels, subchans, voices, frame_size, frames; + + if (!shift) { + // Non-interleaved source + if (copy_from_user(get_dma_ptr(runtime, channel, hwoff), buf, bytes)) + return -EFAULT; + } else { + // Interleaved source + channels = runtime->channels; + subchans = 1 << shift; + voices = channels << shift; + frame_size = voices << 2; + // It is recommended that writes are period-sized, and it appears + // unlikely that someone would actually use a period size which + // is not divisible by four, so don't bother making it work. + // This check should also prevent that hwoff becomes unaligned. + // Ideally, snd_pcm_sw_params.xfer_align would handle this ... + if (bytes % frame_size) + return -EIO; + frames = bytes / frame_size; + hwoff /= voices; + if (!user_access_begin(buf, bytes)) + return -EFAULT; + for (i = 0; i < channels; i++) { + for (j = 0; j < subchans; j++) { + u32 *dst = get_dma_ptr_x(runtime, shift, i, j, hwoff); + u32 *src = (u32 *)buf + j * channels + i; + for (k = 0; k < frames; k++, dst++, src += voices) + unsafe_get_user(*dst, src, faulted); + } + } + user_access_end(); + } + return 0; + +faulted: + user_access_end(); + return -EFAULT; +} + +static int snd_emu10k1_efx_playback_copy_kernel(struct snd_pcm_substream *substream, + int channel, unsigned long hwoff, + void *buf, unsigned long bytes) +{ + struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + unsigned shift = emu->emu1010.clock_shift; + unsigned i, j, k, channels, subchans, voices, frame_size, frames; + + if (!shift) { + // Non-interleaved source + memcpy(get_dma_ptr(runtime, channel, hwoff), buf, bytes); + } else { + // Interleaved source + channels = runtime->channels; + subchans = 1 << shift; + voices = channels << shift; + frame_size = voices << 2; + if (bytes % frame_size) // See *_copy_user() above. + return -EIO; + frames = bytes / frame_size; + hwoff /= voices; + for (i = 0; i < channels; i++) { + for (j = 0; j < subchans; j++) { + u32 *dst = get_dma_ptr_x(runtime, shift, i, j, hwoff); + u32 *src = (u32 *)buf + j * channels + i; + for (k = 0; k < frames; k++, dst++, src += voices) + *dst = *src; + } + } + } + return 0; +} static snd_pcm_uframes_t snd_emu10k1_capture_pointer(struct snd_pcm_substream *substream) { @@ -1256,19 +1386,21 @@ static int snd_emu10k1_efx_playback_close(struct snd_pcm_substream *substream) return 0; } -static int snd_emu10k1_playback_set_constraints(struct snd_pcm_runtime *runtime) +static int snd_emu10k1_playback_set_constraints(struct snd_emu10k1 *emu, + struct snd_pcm_runtime *runtime) { int err; // The buffer size must be a multiple of the period size, to avoid a // mismatch between the extra voice and the regular voices. err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); if (err < 0) return err; // The hardware is typically the cache's size of 64 frames ahead. // Leave enough time for actually filling up the buffer. err = snd_pcm_hw_constraint_minmax( - runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 128, UINT_MAX); + runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, + 128 << emu->emu1010.clock_shift, UINT_MAX); return err; } @@ -1292,10 +1424,28 @@ static int snd_emu10k1_efx_playback_open(struct snd_pcm_substream *substream) runtime->hw = snd_emu10k1_efx_playback; if (emu->card_capabilities->emu_model) { snd_emu1010_constrain_efx_rate(emu, runtime); - if (emu->das_mode) + if (emu->das_mode) { + unsigned shift = emu->emu1010.clock_shift; + if (shift) { + runtime->hw.info = + // No SNDRV_PCM_INFO_MMAP; doable without SNDRV_PCM_INFO_MMAP_VALID + SNDRV_PCM_INFO_INTERLEAVED | // Unlike in 1x mode + SNDRV_PCM_INFO_BLOCK_TRANSFER | + SNDRV_PCM_INFO_RESUME | + SNDRV_PCM_INFO_PAUSE; + if (shift == 2) + runtime->hw.channels_max = 7; // FIXME: should be 8, but extra voice ... + err = snd_pcm_hw_constraint_step( + runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 1 << shift); + if (err < 0) { + kfree(epcm); + return err; + } + } runtime->hw.formats = SNDRV_PCM_FMTBIT_S32_LE; + } } - err = snd_emu10k1_playback_set_constraints(runtime); + err = snd_emu10k1_playback_set_constraints(emu, runtime); if (err < 0) { kfree(epcm); return err; @@ -1336,7 +1486,7 @@ static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream) runtime->private_data = epcm; runtime->private_free = snd_emu10k1_pcm_free_substream; runtime->hw = snd_emu10k1_playback; - err = snd_emu10k1_playback_set_constraints(runtime); + err = snd_emu10k1_playback_set_constraints(emu, runtime); if (err < 0) { kfree(epcm); return err; @@ -1470,7 +1620,7 @@ static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream) substream->runtime->private_free = snd_emu10k1_pcm_free_substream; runtime->hw = snd_emu10k1_capture_efx; if (emu->card_capabilities->emu_model) { - snd_emu1010_constrain_efx_capture_rate(emu, runtime); + snd_emu1010_constrain_efx_rate(emu, runtime); /* * There are 32 mono channels of 16bits each. * 24bit Audio uses 2x channels over 16bit, @@ -1560,6 +1710,9 @@ static const struct snd_pcm_ops snd_emu10k1_efx_playback_ops = { .prepare = snd_emu10k1_efx_playback_prepare, .trigger = snd_emu10k1_efx_playback_trigger, .pointer = snd_emu10k1_playback_pointer, + .copy_user = snd_emu10k1_efx_playback_copy_user, + .copy_kernel = snd_emu10k1_efx_playback_copy_kernel, + .fill_silence = snd_emu10k1_efx_playback_silence, }; int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device) diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c index 6939498e26f0..7545915a033f 100644 --- a/sound/pci/emu10k1/voice.c +++ b/sound/pci/emu10k1/voice.c @@ -45,6 +45,12 @@ static int voice_alloc(struct snd_emu10k1 *emu, int type, int number, continue; } + // The voices must be consecutive without wrap-around + if (i + number > NUM_G) { + skip = NUM_G - i; + continue; + } + for (k = 0; k < number; k++) { voice = &emu->voices[i + k]; if (voice->use) { -- 2.40.0.152.g15d061e6df