Skip to contentSkip to conversation

drm/bridge: dw-hdmi: PCM API updates

PATCH In review Takashi Iwai 3 participants 6 messages Dec 10, 2019 – Jan 9, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover drm/bridge: dw-hdmi: PCM API updates

Hi,

this is a patch set for updating ALSA PCM API usages in dw-hdmi driver. I already tried to "fix" the driver some time ago but it was utterly wrong. So this is a combination of the revised patch and another cleanup patch.

The first one is to change the buffer allocation mechanism in the driver to the manual allocation of the h/w buffer and the automatic allocation of PCM stream buffers via the new standard API. The significant change is that size of the h/w buffer isn't no longer controlled via ALSA preallocation proc file but rather via the new module option (if any).

The second one is a oneliner patch just to remove the superfluous PCM ops.

Both need the ALSA PCM core changes in 5.5-rc1, so please apply them on top of 5.5-rc1 or later. Or, just let me know if I should apply them through sound git tree.

thanks,

Takashi

===

Takashi Iwai (2):
drm/bridge: dw-hdmi: Follow the standard ALSA memalloc way drm/bridge: dw-hdmi: Drop superfluous ioctl PCM ops

 .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c    | 49 ++++++++++++----------
 1 file changed, 26 insertions(+), 23 deletions(-)
Signature · 6 lines
2.16.4

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#1 lore raw

PATCH 1/2 drm/bridge: dw-hdmi: Follow the standard ALSA memalloc way

The driver manages actually two different buffers: the internal buffer that is pre-allocated at the probe time and the vmalloc buffer for PCM streams allocated at each stream open time. The problem of the current code is that the PCM core rather expects other way round, i.e. the the vmalloc buffer is declared as preallocator (although not actually pre-allocating pages at the probe time). Then the whole rest buffer allocation and release can be managed inside PCM core and we can drop the allocation/free call in the driver.

For achieving that, this patch changes the buffer management in the following way:
- The intermediate buffer is allocated manually instead of snd_pcm_lib_preallocate*() helper, kept in the own record, released in the card private_free call
- The size of internal buffer is specified by the new module option, buffer_size
- The normal stream buffer is set up via the new snd_pcm_set_managed_buffer*() helper
- The hw_params and hw_free callbacks are removed as they become superfluous with the new API

Also the hw_constraint call is corrected to point to the right unit (bytes) instead of the frame size.

---
 .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c    | 48 ++++++++++++----------
 1 file changed, 26 insertions(+), 22 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c +26 -22
index 2b7539701b42..ab8d16b3b78d 100644
@@ -7,6 +7,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <drm/bridge/dw_hdmi.h>
 #include <drm/drm_edid.h>
@@ -22,6 +23,10 @@
 
 #define DRIVER_NAME "dw-hdmi-ahb-audio"
 
+static unsigned int hw_buffer_size = 128 * 1024;
+module_param_named(buffer_size, hw_buffer_size, uint, 0444);
+MODULE_PARM_DESC(buffer_size, "Hardware buffer size to preallocate");
+
 /* Provide some bits rather than bit offsets */
 enum {
 	HDMI_AHB_DMA_CONF0_SW_FIFO_RST = BIT(7),
@@ -119,6 +124,7 @@ struct snd_dw_hdmi {
 	spinlock_t lock;
 	struct dw_hdmi_audio_data data;
 	struct snd_pcm_substream *substream;
+	struct snd_dma_buffer hw_buffer;
 	void (*reformat)(struct snd_dw_hdmi *, size_t, size_t);
 	void *buf_src;
 	void *buf_dst;
@@ -339,8 +345,8 @@ static int dw_hdmi_open(struct snd_pcm_substream *substream)
 
 	/* Limit the buffer size to the size of the preallocated buffer */
 	ret = snd_pcm_hw_constraint_minmax(runtime,
-					   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-					   0, substream->dma_buffer.bytes);
+					   SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
+					   0, dw->hw_buffer.bytes);
 	if (ret < 0)
 		return ret;
 
@@ -382,19 +388,6 @@ static int dw_hdmi_close(struct snd_pcm_substream *substream)
 	return 0;
 }
 
-static int dw_hdmi_hw_free(struct snd_pcm_substream *substream)
-{
-	return snd_pcm_lib_free_vmalloc_buffer(substream);
-}
-
-static int dw_hdmi_hw_params(struct snd_pcm_substream *substream,
-	struct snd_pcm_hw_params *params)
-{
-	/* Allocate the PCM runtime buffer, which is exposed to userspace. */
-	return snd_pcm_lib_alloc_vmalloc_buffer(substream,
-						params_buffer_bytes(params));
-}
-
 static int dw_hdmi_prepare(struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
@@ -449,8 +442,8 @@ static int dw_hdmi_prepare(struct snd_pcm_substream *substream)
 	dw->iec_offset = 0;
 	dw->channels = runtime->channels;
 	dw->buf_src  = runtime->dma_area;
-	dw->buf_dst  = substream->dma_buffer.area;
-	dw->buf_addr = substream->dma_buffer.addr;
+	dw->buf_dst  = dw->hw_buffer.area;
+	dw->buf_addr = dw->hw_buffer.addr;
 	dw->buf_period = snd_pcm_lib_period_bytes(substream);
 	dw->buf_size = snd_pcm_lib_buffer_bytes(substream);
 
@@ -506,14 +499,19 @@ static const struct snd_pcm_ops snd_dw_hdmi_ops = {
 	.open = dw_hdmi_open,
 	.close = dw_hdmi_close,
 	.ioctl = snd_pcm_lib_ioctl,
-	.hw_params = dw_hdmi_hw_params,
-	.hw_free = dw_hdmi_hw_free,
 	.prepare = dw_hdmi_prepare,
 	.trigger = dw_hdmi_trigger,
 	.pointer = dw_hdmi_pointer,
-	.page = snd_pcm_lib_get_vmalloc_page,
 };
 
+static void snd_dw_hdmi_free(struct snd_card *card)
+{
+	struct snd_dw_hdmi *dw = card->private_data;
+
+	if (dw->hw_buffer.bytes)
+		snd_dma_free_pages(&dw->hw_buffer);
+}
+
 static int snd_dw_hdmi_probe(struct platform_device *pdev)
 {
 	const struct dw_hdmi_audio_data *data = pdev->dev.platform_data;
@@ -548,6 +546,7 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev)
 	dw->card = card;
 	dw->data = *data;
 	dw->revision = revision;
+	card->private_free = snd_dw_hdmi_free;
 
 	spin_lock_init(&dw->lock);
 
@@ -559,13 +558,18 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev)
 	pcm->private_data = dw;
 	strlcpy(pcm->name, DRIVER_NAME, sizeof(pcm->name));
 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_dw_hdmi_ops);
+	snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC, dev, 0, 0);
 
 	/*
 	 * To support 8-channel 96kHz audio reliably, we need 512k
 	 * to satisfy alsa with our restricted period (ERR004323).
 	 */
-	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-			dev, 128 * 1024, 1024 * 1024);
+	if (hw_buffer_size > 1024 * 1024)
+		hw_buffer_size = 1024 * 1024;
+	ret  = snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, dev,
+					    hw_buffer_size, &dw->hw_buffer);
+	if (ret < 0)
+		goto err;
 
 	ret = snd_card_register(card);
 	if (ret < 0)
Signature · 6 lines
2.16.4

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#2 lore raw

PATCH 2/2 drm/bridge: dw-hdmi: Drop superfluous ioctl PCM ops

In reply to Takashi Iwai

PCM core deals the empty ioctl field now as default. Let's kill the redundant lines.

---
 drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c +0 -1
index ab8d16b3b78d..4bb365cd24f0 100644
@@ -498,7 +498,6 @@ static snd_pcm_uframes_t dw_hdmi_pointer(struct snd_pcm_substream *substream)
 static const struct snd_pcm_ops snd_dw_hdmi_ops = {
 	.open = dw_hdmi_open,
 	.close = dw_hdmi_close,
-	.ioctl = snd_pcm_lib_ioctl,
 	.prepare = dw_hdmi_prepare,
 	.trigger = dw_hdmi_trigger,
 	.pointer = dw_hdmi_pointer,
Signature · 6 lines
2.16.4

_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#3 lore raw
In reply to Takashi Iwai
Quoted 25 lines · Takashi Iwai

Hi,

this is a patch set for updating ALSA PCM API usages in dw-hdmi driver. I already tried to "fix" the driver some time ago but it was utterly wrong. So this is a combination of the revised patch and another cleanup patch.

The first one is to change the buffer allocation mechanism in the driver to the manual allocation of the h/w buffer and the automatic allocation of PCM stream buffers via the new standard API. The significant change is that size of the h/w buffer isn't no longer controlled via ALSA preallocation proc file but rather via the new module option (if any).

The second one is a oneliner patch just to remove the superfluous PCM ops.

Both need the ALSA PCM core changes in 5.5-rc1, so please apply them on top of 5.5-rc1 or later. Or, just let me know if I should apply them through sound git tree.

thanks,

Quoted 7 lines

Takashi

===

Takashi Iwai (2):
drm/bridge: dw-hdmi: Follow the standard ALSA memalloc way drm/bridge: dw-hdmi: Drop superfluous ioctl PCM ops

Any chance for reviewing these patches?

Since this driver is the only one who is still using the old ALSA vmalloc API, I'd like to change it and drop the old API in 5.6.

thanks,

Takashi
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw

Hi,

Quoted 31 lines · Takashi Iwai
Quoted 29 lines · Takashi Iwai

Hi,

this is a patch set for updating ALSA PCM API usages in dw-hdmi driver. I already tried to "fix" the driver some time ago but it was utterly wrong. So this is a combination of the revised patch and another cleanup patch.

The first one is to change the buffer allocation mechanism in the driver to the manual allocation of the h/w buffer and the automatic allocation of PCM stream buffers via the new standard API. The significant change is that size of the h/w buffer isn't no longer controlled via ALSA preallocation proc file but rather via the new module option (if any).

The second one is a oneliner patch just to remove the superfluous PCM ops.

Both need the ALSA PCM core changes in 5.5-rc1, so please apply them on top of 5.5-rc1 or later. Or, just let me know if I should apply them through sound git tree.

thanks,

Takashi

===

Quoted 8 lines
Quoted 3 lines

Takashi Iwai (2):
drm/bridge: dw-hdmi: Follow the standard ALSA memalloc way drm/bridge: dw-hdmi: Drop superfluous ioctl PCM ops

Any chance for reviewing these patches?

Since this driver is the only one who is still using the old ALSA vmalloc API, I'd like to change it and drop the old API in 5.6.

Ping Russel since you reviewed the previous attempt.

Neil

Quoted 6 lines

thanks,

Takashi

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw
In reply to Takashi Iwai
Quoted 31 lines · Takashi Iwai
Quoted 29 lines · Takashi Iwai

Hi,

this is a patch set for updating ALSA PCM API usages in dw-hdmi driver. I already tried to "fix" the driver some time ago but it was utterly wrong. So this is a combination of the revised patch and another cleanup patch.

The first one is to change the buffer allocation mechanism in the driver to the manual allocation of the h/w buffer and the automatic allocation of PCM stream buffers via the new standard API. The significant change is that size of the h/w buffer isn't no longer controlled via ALSA preallocation proc file but rather via the new module option (if any).

The second one is a oneliner patch just to remove the superfluous PCM ops.

Both need the ALSA PCM core changes in 5.5-rc1, so please apply them on top of 5.5-rc1 or later. Or, just let me know if I should apply them through sound git tree.

thanks,

Takashi

===

Quoted 8 lines
Quoted 3 lines

Takashi Iwai (2):
drm/bridge: dw-hdmi: Follow the standard ALSA memalloc way drm/bridge: dw-hdmi: Drop superfluous ioctl PCM ops

Any chance for reviewing these patches?

Since this driver is the only one who is still using the old ALSA vmalloc API, I'd like to change it and drop the old API in 5.6.

It isn't something I can even test at the moment; I have the platforms but no TV to connect them to.

Signature · 7 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up
According to speedtest.net: 11.9Mbps down 500kbps up
_______________________________________________
Alsa-devel mailing list
[email protected]
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel