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_channel.h | |
| 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_channel.h')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_channel.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/drivers/video/tegra/host/nvhost_channel.h b/drivers/video/tegra/host/nvhost_channel.h index c6d60fbf1189..f6c22cac963d 100644 --- a/drivers/video/tegra/host/nvhost_channel.h +++ b/drivers/video/tegra/host/nvhost_channel.h @@ -38,18 +38,7 @@ struct nvhost_master; struct nvhost_waitchk; - -struct nvhost_channeldesc { - const char *name; - u32 syncpts; - u32 waitbases; - u32 modulemutexes; - u32 class; - bool exclusive; - bool keepalive; - bool waitbasesync; - struct nvhost_moduledesc module; -}; +struct nvhost_device; struct nvhost_channel_gather { u32 words; @@ -65,13 +54,11 @@ struct nvhost_channel { struct mutex reflock; struct mutex submitlock; void __iomem *aperture; - struct nvhost_master *dev; - const struct nvhost_channeldesc *desc; struct nvhost_hwctx *cur_ctx; struct device *node; + struct nvhost_device *dev; struct cdev cdev; struct nvhost_hwctx_handler ctxhandler; - struct nvhost_module mod; struct nvhost_cdma cdma; }; @@ -85,8 +72,8 @@ struct nvhost_channel *nvhost_getchannel(struct nvhost_channel *ch); void nvhost_putchannel(struct nvhost_channel *ch, struct nvhost_hwctx *ctx); int nvhost_channel_suspend(struct nvhost_channel *ch); -#define channel_cdma_op(ch) (ch->dev->op.cdma) -#define channel_op(ch) (ch->dev->op.channel) +#define channel_cdma_op(ch) (ch->dev->host->op.cdma) +#define channel_op(ch) (ch->dev->host->op.channel) #define host_channel_op(host) (host->op.channel) int nvhost_channel_drain_read_fifo(void __iomem *chan_regs, |