diff options
author | Mikko Perttunen <mperttunen@nvidia.com> | 2017-09-24 05:04:53 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2017-10-20 08:19:51 -0400 |
commit | 2fb0dceb69ce957f01bdb6fddf7baf4c4b9cbc0d (patch) | |
tree | 0e2eb20ed43f268538df932921aefacb0c67495d | |
parent | 6e44b9ad22f82d4d10b707bcad6b7c701ed11641 (diff) |
gpu: host1x: Call of_dma_configure() after setting bus
of_dma_configure() now checks the device's bus before configuring it, so
we need to set the device's bus before calling.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | drivers/gpu/host1x/bus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/host1x/bus.c b/drivers/gpu/host1x/bus.c index f9cde03030fd..66ea5acee820 100644 --- a/drivers/gpu/host1x/bus.c +++ b/drivers/gpu/host1x/bus.c | |||
@@ -403,12 +403,13 @@ static int host1x_device_add(struct host1x *host1x, | |||
403 | device->dev.coherent_dma_mask = host1x->dev->coherent_dma_mask; | 403 | device->dev.coherent_dma_mask = host1x->dev->coherent_dma_mask; |
404 | device->dev.dma_mask = &device->dev.coherent_dma_mask; | 404 | device->dev.dma_mask = &device->dev.coherent_dma_mask; |
405 | dev_set_name(&device->dev, "%s", driver->driver.name); | 405 | dev_set_name(&device->dev, "%s", driver->driver.name); |
406 | of_dma_configure(&device->dev, host1x->dev->of_node); | ||
407 | device->dev.release = host1x_device_release; | 406 | device->dev.release = host1x_device_release; |
408 | device->dev.of_node = host1x->dev->of_node; | 407 | device->dev.of_node = host1x->dev->of_node; |
409 | device->dev.bus = &host1x_bus_type; | 408 | device->dev.bus = &host1x_bus_type; |
410 | device->dev.parent = host1x->dev; | 409 | device->dev.parent = host1x->dev; |
411 | 410 | ||
411 | of_dma_configure(&device->dev, host1x->dev->of_node); | ||
412 | |||
412 | err = host1x_device_parse_dt(device, driver); | 413 | err = host1x_device_parse_dt(device, driver); |
413 | if (err < 0) { | 414 | if (err < 0) { |
414 | kfree(device); | 415 | kfree(device); |