diff mbox series

[12/16] media: ti-vpe: cal: set DMA max seg size

Message ID	20200313114121.32182-12-tomi.valkeinen@ti.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	Hans Verkuil
Headers	From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: <linux-media@vger.kernel.org>, Benoit Parrot <bparrot@ti.com> CC: Mauro Carvalho Chehab <mchehab@kernel.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH 12/16] media: ti-vpe: cal: set DMA max seg size Date: Fri, 13 Mar 2020 13:41:17 +0200 Message-ID: <20200313114121.32182-12-tomi.valkeinen@ti.com> In-Reply-To: <20200313114121.32182-1-tomi.valkeinen@ti.com> References: <20200313114121.32182-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-media-owner@vger.kernel.org Precedence: bulk
Series	[01/16] media: ti-vpe: cal: fix use of wrong macro \| [01/16] media: ti-vpe: cal: fix use of wrong macro [02/16] media: ti-vpe: cal: use runtime_resume for errata handling [03/16] media: ti-vpe: cal: catch error irqs and print errors [04/16] media: ti-vpe: cal: print errors on timeouts [05/16] media: ti-vpe: cal: simplify irq handling [06/16] media: ti-vpe: cal: remove useless CAL_GEN_* macros [07/16] media: ti-vpe: cal: remove unused defines [08/16] media: ti-vpe: cal: use reg_write_field [09/16] media: ti-vpe: cal: cleanup CIO power enable/disable [10/16] media: ti-vpe: cal: fix dummy read to phy [11/16] media: ti-vpe: cal: program number of lines properly [12/16] media: ti-vpe: cal: set DMA max seg size [13/16] media: ti-vpe: cal: move code to separate functions [14/16] media: ti-vpe: cal: improve wait for CIO resetdone [15/16] media: ti-vpe: cal: improve wait for stop-state [16/16] media: ti-vpe: cal: fix stop state timeout

Commit Message

Tomi Valkeinen March 13, 2020, 11:41 a.m. UTC

  Set DMA max seg size correctly to get rid of warnings on 64 bit
platforms:

DMA-API: cal 6f03000.cal: mapping sg segment longer than device claims to support [len=720896] [max=65536]

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
 drivers/media/platform/ti-vpe/cal.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Laurent Pinchart March 16, 2020, 12:39 p.m. UTC | #1

On Fri, Mar 13, 2020 at 01:41:17PM +0200, Tomi Valkeinen wrote:
> Set DMA max seg size correctly to get rid of warnings on 64 bit
> platforms:
> 
> DMA-API: cal 6f03000.cal: mapping sg segment longer than device claims to support [len=720896] [max=65536]
> 
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
>  drivers/media/platform/ti-vpe/cal.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
> index 832f37ebad0d..64ea92dbfac5 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -2321,6 +2321,8 @@ static int cal_probe(struct platform_device *pdev)
>  		return -ENODEV;
>  	}
>  
> +	vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
> +
>  	pm_runtime_enable(&pdev->dev);
>  
>  	ret = cal_runtime_get(dev);
> @@ -2335,6 +2337,8 @@ static int cal_probe(struct platform_device *pdev)
>  	return 0;
>  
>  runtime_disable:
> +	vb2_dma_contig_clear_max_seg_size(&pdev->dev);
> +

It's probably time to fix this horrible DMA API that requires such
cleanups, but that's out of scope for this patch.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

>  	pm_runtime_disable(&pdev->dev);
>  	for (i = 0; i < CAL_NUM_CONTEXT; i++) {
>  		ctx = dev->ctx[i];
> @@ -2377,6 +2381,8 @@ static int cal_remove(struct platform_device *pdev)
>  	cal_runtime_put(dev);
>  	pm_runtime_disable(&pdev->dev);
>  
> +	vb2_dma_contig_clear_max_seg_size(&pdev->dev);
> +
>  	return 0;
>  }
>

diff mbox series

Patch

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 832f37ebad0d..64ea92dbfac5 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -2321,6 +2321,8 @@  static int cal_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
+	vb2_dma_contig_set_max_seg_size(&pdev->dev, DMA_BIT_MASK(32));
+
 	pm_runtime_enable(&pdev->dev);
 
 	ret = cal_runtime_get(dev);
@@ -2335,6 +2337,8 @@  static int cal_probe(struct platform_device *pdev)
 	return 0;
 
 runtime_disable:
+	vb2_dma_contig_clear_max_seg_size(&pdev->dev);
+
 	pm_runtime_disable(&pdev->dev);
 	for (i = 0; i < CAL_NUM_CONTEXT; i++) {
 		ctx = dev->ctx[i];
@@ -2377,6 +2381,8 @@  static int cal_remove(struct platform_device *pdev)
 	cal_runtime_put(dev);
 	pm_runtime_disable(&pdev->dev);
 
+	vb2_dma_contig_clear_max_seg_size(&pdev->dev);
+
 	return 0;
 }