| Message ID | 20201023094602.5630-1-peter.ujfalusi@ti.com |
|---|---|
| State | Accepted |
| Commit | 5144eead3f8c80ac7f913c07139442fede94003e |
| Headers | show |
| Series | drm: xlnx: Use dma_request_chan for DMA channel request | expand |
Hi Peter, Thanks for the patch. On Fri, Oct 23, 2020 at 02:46:02AM -0700, Peter Ujfalusi wrote: > There is no need to use the of_dma_request_slave_channel() directly as > dma_request_chan() is going to try to get the channel via OF as well. > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> So now dma_request_chan() has sysfs / debugfs registrations, and this looks good to me. I'll commit this within next couple days and keep it posted here. Thanks, -hyun > --- > drivers/gpu/drm/xlnx/zynqmp_disp.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c > index 98bd48f13fd1..a4405d081aca 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > @@ -28,7 +28,6 @@ > #include <linux/dmaengine.h> > #include <linux/module.h> > #include <linux/of.h> > -#include <linux/of_dma.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/spinlock.h> > @@ -1316,8 +1315,7 @@ static int zynqmp_disp_layer_request_dma(struct zynqmp_disp *disp, > > snprintf(dma_channel_name, sizeof(dma_channel_name), > "%s%u", dma_names[layer->id], i); > - dma->chan = of_dma_request_slave_channel(disp->dev->of_node, > - dma_channel_name); > + dma->chan = dma_request_chan(disp->dev, dma_channel_name); > if (IS_ERR(dma->chan)) { > dev_err(disp->dev, "failed to request dma channel\n"); > ret = PTR_ERR(dma->chan); > -- > Peter > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, Oct 27, 2020 at 06:36:02PM -0700, Hyun Kwon wrote: > Hi Peter, > > Thanks for the patch. > > On Fri, Oct 23, 2020 at 02:46:02AM -0700, Peter Ujfalusi wrote: > > There is no need to use the of_dma_request_slave_channel() directly as > > dma_request_chan() is going to try to get the channel via OF as well. > > > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > > So now dma_request_chan() has sysfs / debugfs registrations, and this looks > good to me. I'll commit this within next couple days and keep it posted here. > Applied to drm-misc-next. Thanks! -hyun > Thanks, > -hyun > > > --- > > drivers/gpu/drm/xlnx/zynqmp_disp.c | 4 +--- > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c > > index 98bd48f13fd1..a4405d081aca 100644 > > --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c > > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > > @@ -28,7 +28,6 @@ > > #include <linux/dmaengine.h> > > #include <linux/module.h> > > #include <linux/of.h> > > -#include <linux/of_dma.h> > > #include <linux/platform_device.h> > > #include <linux/pm_runtime.h> > > #include <linux/spinlock.h> > > @@ -1316,8 +1315,7 @@ static int zynqmp_disp_layer_request_dma(struct zynqmp_disp *disp, > > > > snprintf(dma_channel_name, sizeof(dma_channel_name), > > "%s%u", dma_names[layer->id], i); > > - dma->chan = of_dma_request_slave_channel(disp->dev->of_node, > > - dma_channel_name); > > + dma->chan = dma_request_chan(disp->dev, dma_channel_name); > > if (IS_ERR(dma->chan)) { > > dev_err(disp->dev, "failed to request dma channel\n"); > > ret = PTR_ERR(dma->chan); > > -- > > Peter > > > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Peter. On Fri, Oct 23, 2020 at 12:46:02PM +0300, Peter Ujfalusi wrote: > There is no need to use the of_dma_request_slave_channel() directly as > dma_request_chan() is going to try to get the channel via OF as well. > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> I took a look at this and agree on your analysis. Reviewed-by: Sam Ravnborg <sam@ravnborg.org> I expect the maintainers to pick up this patch. Sam > --- > drivers/gpu/drm/xlnx/zynqmp_disp.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c > index 98bd48f13fd1..a4405d081aca 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > @@ -28,7 +28,6 @@ > #include <linux/dmaengine.h> > #include <linux/module.h> > #include <linux/of.h> > -#include <linux/of_dma.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/spinlock.h> > @@ -1316,8 +1315,7 @@ static int zynqmp_disp_layer_request_dma(struct zynqmp_disp *disp, > > snprintf(dma_channel_name, sizeof(dma_channel_name), > "%s%u", dma_names[layer->id], i); > - dma->chan = of_dma_request_slave_channel(disp->dev->of_node, > - dma_channel_name); > + dma->chan = dma_request_chan(disp->dev, dma_channel_name); > if (IS_ERR(dma->chan)) { > dev_err(disp->dev, "failed to request dma channel\n"); > ret = PTR_ERR(dma->chan); > -- > Peter > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c index 98bd48f13fd1..a4405d081aca 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -28,7 +28,6 @@ #include <linux/dmaengine.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_dma.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/spinlock.h> @@ -1316,8 +1315,7 @@ static int zynqmp_disp_layer_request_dma(struct zynqmp_disp *disp, snprintf(dma_channel_name, sizeof(dma_channel_name), "%s%u", dma_names[layer->id], i); - dma->chan = of_dma_request_slave_channel(disp->dev->of_node, - dma_channel_name); + dma->chan = dma_request_chan(disp->dev, dma_channel_name); if (IS_ERR(dma->chan)) { dev_err(disp->dev, "failed to request dma channel\n"); ret = PTR_ERR(dma->chan);
There is no need to use the of_dma_request_slave_channel() directly as dma_request_chan() is going to try to get the channel via OF as well. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- drivers/gpu/drm/xlnx/zynqmp_disp.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel