| Message ID | 20200313114121.32182-12-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/16] media: ti-vpe: cal: fix use of wrong macro | expand |
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 --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; }
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(+)