On Thu, Apr 26, 2018 at 5:16 AM Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
wrote:
> Added pte offset variable in audio_substream_data structure.
> Added Stoney related PTE offset macros in acp header file.
> Modified hw_params callback to assign the pte offset value
> based on asic_type.
> Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@xxxxxxx>
> ---
> sound/soc/amd/acp-pcm-dma.c | 26 +++++++++++++++++++-------
> sound/soc/amd/acp.h | 5 +++++
> 2 files changed, 24 insertions(+), 7 deletions(-)
> diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
> index 5f34be1..cb22653 100644
> --- a/sound/soc/amd/acp-pcm-dma.c
> +++ b/sound/soc/amd/acp-pcm-dma.c
> @@ -320,13 +320,11 @@ static void config_acp_dma(void __iomem *acp_mmio,
> struct audio_substream_data *rtd,
> u32 asic_type)
> {
> - u32 pte_offset, sram_bank;
> + u32 sram_bank;
> - if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK) {
> - pte_offset = ACP_PLAYBACK_PTE_OFFSET;
> + if (rtd->direction == SNDRV_PCM_STREAM_PLAYBACK)
> sram_bank = ACP_SHARED_RAM_BANK_1_ADDRESS;
> - } else {
> - pte_offset = ACP_CAPTURE_PTE_OFFSET;
> + else {
> switch (asic_type) {
> case CHIP_STONEY:
> sram_bank = ACP_SHARED_RAM_BANK_3_ADDRESS;
> @@ -336,10 +334,10 @@ static void config_acp_dma(void __iomem *acp_mmio,
> }
> }
> acp_pte_config(acp_mmio, rtd->pg, rtd->num_of_pages,
> - pte_offset);
> + rtd->pte_offset);
> /* Configure System memory <-> ACP SRAM DMA descriptors */
> set_acp_sysmem_dma_descriptors(acp_mmio, rtd->size,
> - rtd->direction, pte_offset,
> + rtd->direction, rtd->pte_offset,
> rtd->ch1, sram_bank,
> rtd->dma_dscr_idx_1, asic_type);
> /* Configure ACP SRAM <-> I2S DMA descriptors */
> @@ -788,6 +786,13 @@ static int acp_dma_hw_params(struct
snd_pcm_substream *substream,
> }
> if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
> + switch (adata->asic_type) {
> + case CHIP_STONEY:
> + rtd->pte_offset = ACP_ST_PLAYBACK_PTE_OFFSET;
> + break;
> + default:
> + rtd->pte_offset = ACP_PLAYBACK_PTE_OFFSET;
> + }
As in patch 2, I believe this would be better done in acp_dma_open().
Why does Stoney use a different PTE_OFFSET? Please answer this question in
the commit message.
-Dan
> rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
> rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
> rtd->destination = TO_ACP_I2S_1;
> @@ -797,6 +802,13 @@ static int acp_dma_hw_params(struct
snd_pcm_substream *substream,
> mmACP_I2S_TRANSMIT_BYTE_CNT_HIGH;
> rtd->byte_cnt_low_reg_offset =
mmACP_I2S_TRANSMIT_BYTE_CNT_LOW;
> } else {
> + switch (adata->asic_type) {
> + case CHIP_STONEY:
> + rtd->pte_offset = ACP_ST_CAPTURE_PTE_OFFSET;
> + break;
> + default:
> + rtd->pte_offset = ACP_CAPTURE_PTE_OFFSET;
> + }
> rtd->ch1 = SYSRAM_TO_ACP_CH_NUM;
> rtd->ch2 = ACP_TO_I2S_DMA_CH_NUM;
> rtd->destination = FROM_ACP_I2S_1;
> diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h
> index 82470bc..2f48d1d 100644
> --- a/sound/soc/amd/acp.h
> +++ b/sound/soc/amd/acp.h
> @@ -10,6 +10,10 @@
> #define ACP_PLAYBACK_PTE_OFFSET 10
> #define ACP_CAPTURE_PTE_OFFSET 0
> +/* Playback and Capture Offset for Stoney */
> +#define ACP_ST_PLAYBACK_PTE_OFFSET 0x04
> +#define ACP_ST_CAPTURE_PTE_OFFSET 0x00
> +
> #define ACP_GARLIC_CNTL_DEFAULT 0x00000FB4
> #define ACP_ONION_CNTL_DEFAULT 0x00000FB4
> @@ -90,6 +94,7 @@ struct audio_substream_data {
> u16 destination;
> u16 dma_dscr_idx_1;
> u16 dma_dscr_idx_2;
> + u32 pte_offset;
> u32 byte_cnt_high_reg_offset;
> u32 byte_cnt_low_reg_offset;
> uint64_t size;
> --
> 2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
