Unverified Commit 3e958226 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ALSA: hda: Interrupt servicing and BDL setup for compress streams 



Account for compress streams when receiving and servicing buffer
completed interrupts. In case of compress stream enlisting hdac_stream
for data transfer, setup BDL entries much like it is the case for PCM
streams.

Signed-off-by: default avatarDivya Prakash <divya1.prakash@intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20221202152841.672536-4-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f6b12546

sound/hda/hdac_controller.c

+2 −2
Original line number Diff line number Diff line
@@ -578,8 +578,8 @@ int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status, 
			sd_status = snd_hdac_stream_readb(azx_dev, SD_STS);

			snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK);

			handled |= 1 << azx_dev->index;

			if (!azx_dev->substream || !azx_dev->running ||

			    !(sd_status & SD_INT_COMPLETE))

			if ((!azx_dev->substream && !azx_dev->cstream) ||

			    !azx_dev->running || !(sd_status & SD_INT_COMPLETE))

				continue;

			if (ack)

				ack(bus, azx_dev);

sound/hda/hdac_stream.c

+20 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/delay.h>

#include <linux/export.h>

#include <linux/clocksource.h>

#include <sound/compress_driver.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/hdaudio.h>
@@ -487,14 +488,19 @@ int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev) 
{

	struct hdac_bus *bus = azx_dev->bus;

	struct snd_pcm_substream *substream = azx_dev->substream;

	struct snd_pcm_runtime *runtime;

	struct snd_compr_stream *cstream = azx_dev->cstream;

	struct snd_pcm_runtime *runtime = NULL;

	struct snd_dma_buffer *dmab;

	__le32 *bdl;

	int i, ofs, periods, period_bytes;

	int pos_adj, pos_align;



	if (substream) {

		runtime = substream->runtime;

		dmab = snd_pcm_get_dma_buf(substream);

	} else if (cstream) {

		dmab = snd_pcm_get_dma_buf(cstream);

	}



	/* reset BDL address */

	snd_hdac_stream_writel(azx_dev, SD_BDLPL, 0);
@@ -562,15 +568,22 @@ int snd_hdac_stream_set_params(struct hdac_stream *azx_dev, 
				 unsigned int format_val)

{

	struct snd_pcm_substream *substream = azx_dev->substream;

	struct snd_compr_stream *cstream = azx_dev->cstream;

	unsigned int bufsize, period_bytes;

	unsigned int no_period_wakeup;

	int err;



	if (!substream)

		return -EINVAL;

	if (substream) {

		bufsize = snd_pcm_lib_buffer_bytes(substream);

		period_bytes = snd_pcm_lib_period_bytes(substream);

		no_period_wakeup = substream->runtime->no_period_wakeup;

	} else if (cstream) {

		bufsize = cstream->runtime->buffer_size;

		period_bytes = cstream->runtime->fragment_size;

		no_period_wakeup = 0;

	} else {

		return -EINVAL;

	}



	if (bufsize != azx_dev->bufsize ||

	    period_bytes != azx_dev->period_bytes ||