diff options
| author | Mayuresh Kulkarni <mkulkarni@nvidia.com> | 2012-02-24 15:46:51 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-28 19:16:06 -0800 |
| commit | e3ca4aa394e90579fc34fff8565c05640a7534e5 (patch) | |
| tree | b615c8661fb0311ca48453023b11ab2e595328df /drivers/video/tegra/host/nvhost_acm.c | |
| parent | 90b79e5712300baab889772a5af348559ac95836 (diff) | |
video: tegra: host: Merge tegra_grhost and host1x devices
- tegra_grhost is a platform device that represents host1x
- nvhost has device host1x which represents the same hardware
- merge these two device structs
- as the new struct is a nvhost_device, platform_driver
is also converted into a nvhost_driver
- register nvhost device before other graphics devices.
this ensures that nvhost_probe() is called as soon as
nvhost_driver is registered with the core.
- this also ensures that nvmap is probed first, followed
by nvhost, followed by tegra-dc and nvavp (if they
are enabled).
Change-Id: Ic420a6516a9cb20d6f481692a4db10fa6053dd90
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-on: http://git-master/r/82631
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/nvhost_acm.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_acm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c index a2386a257c8f..496e38b962a2 100644 --- a/drivers/video/tegra/host/nvhost_acm.c +++ b/drivers/video/tegra/host/nvhost_acm.c @@ -400,23 +400,23 @@ static void debug_not_idle(struct nvhost_master *host) struct nvhost_device *dev = host->channels[i].dev; mutex_lock(&dev->lock); if (dev->name) - dev_warn(&host->pdev->dev, - "tegra_grhost: %s: refcnt %d\n", - dev->name, dev->refcount); + dev_warn(&host->dev->dev, + "tegra_grhost: %s: refcnt %d\n", dev->name, + dev->refcount); mutex_unlock(&dev->lock); } for (i = 0; i < host->syncpt.nb_mlocks; i++) { int c = atomic_read(&host->syncpt.lock_counts[i]); if (c) { - dev_warn(&host->pdev->dev, + dev_warn(&host->dev->dev, "tegra_grhost: lock id %d: refcnt %d\n", i, c); lock_released = false; } } if (lock_released) - dev_dbg(&host->pdev->dev, "tegra_grhost: all locks released\n"); + dev_dbg(&host->dev->dev, "tegra_grhost: all locks released\n"); } int nvhost_module_suspend(struct nvhost_device *dev, bool system_suspend) |