Message ID | 20426a75cba769372c2f3f12f44a477e6fc8e979.1599167414.git.robin.murphy@arm.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | a73a342a6b3cbc6a3f9f4f546bd7f796f216297a |
Delegated to: | Kieran Bingham |
Headers | show |
Series | media: rcar-fcp: Drop local dma_parms | expand |
Hi Robin, Thank you for the patch. On Thu, Sep 03, 2020 at 10:12:27PM +0100, Robin Murphy wrote: > Since commit 9495b7e92f71 ("driver core: platform: Initialize dma_parms > for platform devices"), struct platform_device already provides a > dma_parms structure, so we can save allocating another one. > > Also the DMA segment size is simply a size, not a bitmask. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> Looks good to me, I like the simplification. Should I get this upstream, or do you have other similar patches tree-wide that you plan to get merged in one go ? > --- > drivers/media/platform/rcar-fcp.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c > index 5c6b00737fe7..13a84c7e3586 100644 > --- a/drivers/media/platform/rcar-fcp.c > +++ b/drivers/media/platform/rcar-fcp.c > @@ -22,7 +22,6 @@ > struct rcar_fcp_device { > struct list_head list; > struct device *dev; > - struct device_dma_parameters dma_parms; > }; > > static LIST_HEAD(fcp_devices); > @@ -138,8 +137,7 @@ static int rcar_fcp_probe(struct platform_device *pdev) > > fcp->dev = &pdev->dev; > > - fcp->dev->dma_parms = &fcp->dma_parms; > - dma_set_max_seg_size(fcp->dev, DMA_BIT_MASK(32)); > + dma_set_max_seg_size(fcp->dev, UINT_MAX); > > pm_runtime_enable(&pdev->dev); >
On 2020-09-03 22:53, Laurent Pinchart wrote: > Hi Robin, > > Thank you for the patch. > > On Thu, Sep 03, 2020 at 10:12:27PM +0100, Robin Murphy wrote: >> Since commit 9495b7e92f71 ("driver core: platform: Initialize dma_parms >> for platform devices"), struct platform_device already provides a >> dma_parms structure, so we can save allocating another one. >> >> Also the DMA segment size is simply a size, not a bitmask. >> >> Signed-off-by: Robin Murphy <robin.murphy@arm.com> > > Looks good to me, I like the simplification. > > Should I get this upstream, or do you have other similar patches > tree-wide that you plan to get merged in one go ? No, there's no dependency here - I did these as individual per-driver patches so that they can be applied however, please go ahead :) Thanks, Robin. >> --- >> drivers/media/platform/rcar-fcp.c | 4 +--- >> 1 file changed, 1 insertion(+), 3 deletions(-) >> >> diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c >> index 5c6b00737fe7..13a84c7e3586 100644 >> --- a/drivers/media/platform/rcar-fcp.c >> +++ b/drivers/media/platform/rcar-fcp.c >> @@ -22,7 +22,6 @@ >> struct rcar_fcp_device { >> struct list_head list; >> struct device *dev; >> - struct device_dma_parameters dma_parms; >> }; >> >> static LIST_HEAD(fcp_devices); >> @@ -138,8 +137,7 @@ static int rcar_fcp_probe(struct platform_device *pdev) >> >> fcp->dev = &pdev->dev; >> >> - fcp->dev->dma_parms = &fcp->dma_parms; >> - dma_set_max_seg_size(fcp->dev, DMA_BIT_MASK(32)); >> + dma_set_max_seg_size(fcp->dev, UINT_MAX); >> >> pm_runtime_enable(&pdev->dev); >> >
Hi Robin, On 03/09/2020 22:12, Robin Murphy wrote: > Since commit 9495b7e92f71 ("driver core: platform: Initialize dma_parms > for platform devices"), struct platform_device already provides a > dma_parms structure, so we can save allocating another one. > > Also the DMA segment size is simply a size, not a bitmask. I recall following some precedence here. But I'm happy with this update, I assume you'll update the other usages of this? git grep dma_set_max_seg_size | grep DMA_BIT_MASK shows: > drivers/gpu/drm/arm/display/komeda/komeda_dev.c: dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); > drivers/gpu/drm/exynos/exynos_drm_dma.c: dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); > drivers/gpu/drm/mediatek/mtk_drm_drv.c: ret = dma_set_max_seg_size(dma_dev, (unsigned int)DMA_BIT_MASK(32)); > drivers/gpu/drm/msm/msm_drv.c: dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); > drivers/media/platform/qcom/venus/core.c: dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); > drivers/media/platform/rcar-fcp.c: dma_set_max_seg_size(fcp->dev, DMA_BIT_MASK(32)); > Signed-off-by: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > drivers/media/platform/rcar-fcp.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c > index 5c6b00737fe7..13a84c7e3586 100644 > --- a/drivers/media/platform/rcar-fcp.c > +++ b/drivers/media/platform/rcar-fcp.c > @@ -22,7 +22,6 @@ > struct rcar_fcp_device { > struct list_head list; > struct device *dev; > - struct device_dma_parameters dma_parms; > }; > > static LIST_HEAD(fcp_devices); > @@ -138,8 +137,7 @@ static int rcar_fcp_probe(struct platform_device *pdev) > > fcp->dev = &pdev->dev; > > - fcp->dev->dma_parms = &fcp->dma_parms; > - dma_set_max_seg_size(fcp->dev, DMA_BIT_MASK(32)); > + dma_set_max_seg_size(fcp->dev, UINT_MAX); > > pm_runtime_enable(&pdev->dev); > >
diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c index 5c6b00737fe7..13a84c7e3586 100644 --- a/drivers/media/platform/rcar-fcp.c +++ b/drivers/media/platform/rcar-fcp.c @@ -22,7 +22,6 @@ struct rcar_fcp_device { struct list_head list; struct device *dev; - struct device_dma_parameters dma_parms; }; static LIST_HEAD(fcp_devices); @@ -138,8 +137,7 @@ static int rcar_fcp_probe(struct platform_device *pdev) fcp->dev = &pdev->dev; - fcp->dev->dma_parms = &fcp->dma_parms; - dma_set_max_seg_size(fcp->dev, DMA_BIT_MASK(32)); + dma_set_max_seg_size(fcp->dev, UINT_MAX); pm_runtime_enable(&pdev->dev);
Since commit 9495b7e92f71 ("driver core: platform: Initialize dma_parms for platform devices"), struct platform_device already provides a dma_parms structure, so we can save allocating another one. Also the DMA segment size is simply a size, not a bitmask. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/media/platform/rcar-fcp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)