diff mbox series

[v2,15/19] media: ti-vpe: cal: set DMA max seg size

Message ID	20200319075023.22151-16-tomi.valkeinen@ti.com (mailing list archive)
State	Superseded, 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>, Hans Verkuil <hverkuil@xs4all.nl>, Tomi Valkeinen <tomi.valkeinen@ti.com> Subject: [PATCH v2 15/19] media: ti-vpe: cal: set DMA max seg size Date: Thu, 19 Mar 2020 09:50:19 +0200 Message-ID: <20200319075023.22151-16-tomi.valkeinen@ti.com> In-Reply-To: <20200319075023.22151-1-tomi.valkeinen@ti.com> References: <20200319075023.22151-1-tomi.valkeinen@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-media-owner@vger.kernel.org Precedence: bulk
Series	CAL fixes and improvements \| [v2,00/19] CAL fixes and improvements [v2,01/19] media: ti-vpe: cal: fix DMA memory corruption [v2,02/19] media: ti-vpe: cal: improve enable_irqs [v2,03/19] media: ti-vpe: cal: fix use of wrong macro [v2,04/19] media: ti-vpe: cal: use runtime_resume for errata handling [v2,05/19] media: ti-vpe: cal: drop cal_runtime_get/put [v2,06/19] media: ti-vpe: cal: catch error irqs and print errors [v2,07/19] media: ti-vpe: cal: print errors on timeouts [v2,08/19] media: ti-vpe: cal: simplify irq handling [v2,09/19] media: ti-vpe: cal: remove useless CAL_GEN_* macros [v2,10/19] media: ti-vpe: cal: remove useless IRQ defines [v2,11/19] media: ti-vpe: cal: use reg_write_field [v2,12/19] media: ti-vpe: cal: cleanup CIO power enable/disable [v2,13/19] media: ti-vpe: cal: fix dummy read to phy [v2,14/19] media: ti-vpe: cal: program number of lines properly [v2,15/19] media: ti-vpe: cal: set DMA max seg size [v2,16/19] media: ti-vpe: cal: move code to separate functions [v2,17/19] media: ti-vpe: cal: improve wait for CIO resetdone [v2,18/19] media: ti-vpe: cal: improve wait for stop-state [v2,19/19] media: ti-vpe: cal: fix stop state timeout

Commit Message

Tomi Valkeinen March 19, 2020, 7:50 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>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/platform/ti-vpe/cal.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Benoit Parrot March 19, 2020, 10:44 p.m. UTC | #1

Tomi,

Thanks for the patch.

On 3/19/20 2:50 AM, 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>
> Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Benoit Parrot <bparrot@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 a59931ba3ed7..b1b9616b12b6 100644
> --- a/drivers/media/platform/ti-vpe/cal.c
> +++ b/drivers/media/platform/ti-vpe/cal.c
> @@ -2322,6 +2322,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 = pm_runtime_get_sync(&pdev->dev);
> @@ -2336,6 +2338,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];
> @@ -2378,6 +2382,8 @@ static int cal_remove(struct platform_device *pdev)
>  	pm_runtime_put_sync(&pdev->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 a59931ba3ed7..b1b9616b12b6 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -2322,6 +2322,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 = pm_runtime_get_sync(&pdev->dev);
@@ -2336,6 +2338,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];
@@ -2378,6 +2382,8 @@  static int cal_remove(struct platform_device *pdev)
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 
+	vb2_dma_contig_clear_max_seg_size(&pdev->dev);
+
 	return 0;
 }