mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-30 15:43:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: stm32: dcmi: perform dmaengine_slave_config at probe

Browse Source 
Perform the dma channel configuration at probe time right after
the channel allocation since this is fixed for the whole lifetime
of the driver.

Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Alain Volmat
2026-01-06 12:34:30 +01:00
committed by Mauro Carvalho Chehab
parent 9ab2bd7760
commit bc901885fa
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/media/platform/st/stm32/stm32-dcmi.c
View File

@@ -301,23 +301,6 @@ static int dcmi_start_dma(struct stm32_dcmi *dcmi,
struct dcmi_buf *buf)
{
struct dma_async_tx_descriptor *desc = NULL;
struct dma_slave_config config;
int ret;
memset(&config, 0, sizeof(config));
config.src_addr = (dma_addr_t)dcmi->res->start + DCMI_DR;
config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
config.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
config.dst_maxburst = 4;
/* Configure DMA channel */
ret = dmaengine_slave_config(dcmi->dma_chan, &config);
if (ret < 0) {
dev_err(dcmi->dev, "%s: DMA channel config failed (%d)\n",
__func__, ret);
return ret;
}
/*
* Avoid call of dmaengine_terminate_sync() between
@@ -1888,6 +1871,7 @@ static int dcmi_probe(struct platform_device *pdev)
struct vb2_queue *q;
struct dma_chan *chan;
struct dma_slave_caps caps;
struct dma_slave_config dma_config;
struct clk *mclk;
int ret = 0;
@@ -1954,6 +1938,19 @@ static int dcmi_probe(struct platform_device *pdev)
if (!ret && caps.max_sg_burst)
dcmi->dma_max_burst = caps.max_sg_burst * DMA_SLAVE_BUSWIDTH_4_BYTES;
memset(&dma_config, 0, sizeof(dma_config));
dma_config.src_addr = (dma_addr_t)dcmi->res->start + DCMI_DR;
dma_config.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
/* Configure DMA channel */
ret = dmaengine_slave_config(chan, &dma_config);
if (ret < 0) {
dev_err(dcmi->dev, "%s: DMA channel config failed (%d)\n",
__func__, ret);
goto err_dma_slave_config;
}
spin_lock_init(&dcmi->irqlock);
mutex_init(&dcmi->lock);
mutex_init(&dcmi->dma_lock);
@@ -2072,6 +2069,7 @@ static int dcmi_probe(struct platform_device *pdev)
v4l2_device_unregister(&dcmi->v4l2_dev);
err_media_device_cleanup:
media_device_cleanup(&dcmi->mdev);
err_dma_slave_config:
dma_release_channel(dcmi->dma_chan);
return ret;