diff options
| author | Terje Bergstrom <tbergstrom@nvidia.com> | 2011-12-29 16:03:51 +0200 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-01-12 09:56:22 -0800 |
| commit | 10c8828c7b2bf26ab6ec9feee860fc5cc8eb2ce7 (patch) | |
| tree | 6e1c0b97ddd63f64eee95c313f46fb49940edc25 /drivers/video/tegra/host/nvhost_syncpt.c | |
| parent | 6bc2684e40093d8859b90d96c0d9957e1472c5c9 (diff) | |
video: tegra: host: Move device data to nvhost_device
Move all device data from nvhost_channeldesc, nvhost_moduledesc and
nvhost_module to nvhost_device. nvhost_devices are also assigned into
a hierarchy to prepare for implementation of runtime power management.
Change-Id: I1e18daae8fe538086cd1f453d316e0f73e9d7d92
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/72844
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Reviewed-on: http://git-master/r/74560
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/host/nvhost_syncpt.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_syncpt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/tegra/host/nvhost_syncpt.c b/drivers/video/tegra/host/nvhost_syncpt.c index 0fa6d3e1ce20..f212e618f950 100644 --- a/drivers/video/tegra/host/nvhost_syncpt.c +++ b/drivers/video/tegra/host/nvhost_syncpt.c @@ -77,9 +77,9 @@ u32 nvhost_syncpt_read(struct nvhost_syncpt *sp, u32 id) { u32 val; BUG_ON(!syncpt_op(sp).update_min); - nvhost_module_busy(&syncpt_to_dev(sp)->mod); + nvhost_module_busy(syncpt_to_dev(sp)->dev); val = syncpt_op(sp).update_min(sp, id); - nvhost_module_idle(&syncpt_to_dev(sp)->mod); + nvhost_module_idle(syncpt_to_dev(sp)->dev); return val; } @@ -90,10 +90,10 @@ u32 nvhost_syncpt_read_wait_base(struct nvhost_syncpt *sp, u32 id) { u32 val; BUG_ON(!syncpt_op(sp).read_wait_base); - nvhost_module_busy(&syncpt_to_dev(sp)->mod); + nvhost_module_busy(syncpt_to_dev(sp)->dev); syncpt_op(sp).read_wait_base(sp, id); val = sp->base_val[id]; - nvhost_module_idle(&syncpt_to_dev(sp)->mod); + nvhost_module_idle(syncpt_to_dev(sp)->dev); return val; } @@ -113,9 +113,9 @@ void nvhost_syncpt_cpu_incr(struct nvhost_syncpt *sp, u32 id) void nvhost_syncpt_incr(struct nvhost_syncpt *sp, u32 id) { nvhost_syncpt_incr_max(sp, id, 1); - nvhost_module_busy(&syncpt_to_dev(sp)->mod); + nvhost_module_busy(syncpt_to_dev(sp)->dev); nvhost_syncpt_cpu_incr(sp, id); - nvhost_module_idle(&syncpt_to_dev(sp)->mod); + nvhost_module_idle(syncpt_to_dev(sp)->dev); } /** @@ -150,7 +150,7 @@ int nvhost_syncpt_wait_timeout(struct nvhost_syncpt *sp, u32 id, } /* keep host alive */ - nvhost_module_busy(&syncpt_to_dev(sp)->mod); + nvhost_module_busy(syncpt_to_dev(sp)->dev); if (client_managed(id) || !nvhost_syncpt_min_eq_max(sp, id)) { /* try to read from register */ @@ -226,7 +226,7 @@ int nvhost_syncpt_wait_timeout(struct nvhost_syncpt *sp, u32 id, nvhost_intr_put_ref(&(syncpt_to_dev(sp)->intr), ref); done: - nvhost_module_idle(&syncpt_to_dev(sp)->mod); + nvhost_module_idle(syncpt_to_dev(sp)->dev); return err; } |