diff mbox

[v4,2/2] gpu: host1x: Set DMA ops on device creation

Message ID 1456477613-24995-2-git-send-email-acourbot@nvidia.com
State Accepted
Headers show

Commit Message

Alexandre Courbot Feb. 26, 2016, 9:06 a.m. UTC
Currently host1x-instanciated devices have their dma_ops left to NULL,
which makes any DMA operation (like buffer import) on ARM64 fallback
to the dummy_dma_ops and fail with an error.

This patch calls of_dma_configure() with the host1x node when creating
such a device, so the proper DMA operations are set.

Suggested-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
 drivers/gpu/host1x/bus.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Thierry Reding March 2, 2016, 5:08 p.m. UTC | #1
On Fri, Feb 26, 2016 at 06:06:53PM +0900, Alexandre Courbot wrote:
> Currently host1x-instanciated devices have their dma_ops left to NULL,
> which makes any DMA operation (like buffer import) on ARM64 fallback
> to the dummy_dma_ops and fail with an error.
> 
> This patch calls of_dma_configure() with the host1x node when creating
> such a device, so the proper DMA operations are set.
> 
> Suggested-by: Thierry Reding <thierry.reding@gmail.com>
> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
> ---
>  drivers/gpu/host1x/bus.c | 2 ++
>  1 file changed, 2 insertions(+)

Applied, thanks.

Thierry
diff mbox

Patch

diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c
index c2e7fba370bb..c27858ae0552 100644
--- a/drivers/gpu/host1x/bus.c
+++ b/drivers/gpu/host1x/bus.c
@@ -18,6 +18,7 @@ 
 #include <linux/host1x.h>
 #include <linux/of.h>
 #include <linux/slab.h>
+#include <linux/of_device.h>
 
 #include "bus.h"
 #include "dev.h"
@@ -396,6 +397,7 @@  static int host1x_device_add(struct host1x *host1x,
 	device->dev.coherent_dma_mask = host1x->dev->coherent_dma_mask;
 	device->dev.dma_mask = &device->dev.coherent_dma_mask;
 	dev_set_name(&device->dev, "%s", driver->driver.name);
+	of_dma_configure(&device->dev, host1x->dev->of_node);
 	device->dev.release = host1x_device_release;
 	device->dev.bus = &host1x_bus_type;
 	device->dev.parent = host1x->dev;