diff options
Diffstat (limited to 'drivers/video/tegra/host/t30')
| -rw-r--r-- | drivers/video/tegra/host/t30/t30.c | 28 | ||||
| -rw-r--r-- | drivers/video/tegra/host/t30/t30.h | 9 |
2 files changed, 21 insertions, 16 deletions
diff --git a/drivers/video/tegra/host/t30/t30.c b/drivers/video/tegra/host/t30/t30.c index 01009a708d19..6e9b0afe9e43 100644 --- a/drivers/video/tegra/host/t30/t30.c +++ b/drivers/video/tegra/host/t30/t30.c @@ -201,17 +201,18 @@ static int t30_channel_init(struct nvhost_channel *ch, return t30_nvhost_hwctx_handler_init(ch); } -int nvhost_init_t30_channel_support(struct nvhost_master *host) +int nvhost_init_t30_channel_support(struct nvhost_master *host, + struct nvhost_chip_support *op) { - int result = nvhost_init_t20_channel_support(host); - host->op.channel.init = t30_channel_init; + int result = nvhost_init_t20_channel_support(host, op); + op->channel.init = t30_channel_init; return result; } -int nvhost_init_t30_debug_support(struct nvhost_master *host) +int nvhost_init_t30_debug_support(struct nvhost_chip_support *op) { - nvhost_init_t20_debug_support(host); - host->op.debug.debug_init = nvhost_scale3d_debug_init; + nvhost_init_t20_debug_support(op); + op->debug.debug_init = nvhost_scale3d_debug_init; return 0; } @@ -229,26 +230,27 @@ struct nvhost_device *t30_get_nvhost_device(struct nvhost_master *host, return NULL; } -int nvhost_init_t30_support(struct nvhost_master *host) +int nvhost_init_t30_support(struct nvhost_master *host, + struct nvhost_chip_support *op) { int err; /* don't worry about cleaning up on failure... "remove" does it. */ - err = nvhost_init_t30_channel_support(host); + err = nvhost_init_t30_channel_support(host, op); if (err) return err; - err = host1x_init_cdma_support(host); + err = host1x_init_cdma_support(op); if (err) return err; - err = nvhost_init_t30_debug_support(host); + err = nvhost_init_t30_debug_support(op); if (err) return err; - err = host1x_init_syncpt_support(host); + err = host1x_init_syncpt_support(host, op); if (err) return err; - err = nvhost_init_t20_intr_support(host); + err = nvhost_init_t20_intr_support(op); if (err) return err; - host->op.nvhost_dev.get_nvhost_device = t30_get_nvhost_device; + op->nvhost_dev.get_nvhost_device = t30_get_nvhost_device; return 0; } diff --git a/drivers/video/tegra/host/t30/t30.h b/drivers/video/tegra/host/t30/t30.h index 0446dbd19b39..e4db97b5613d 100644 --- a/drivers/video/tegra/host/t30/t30.h +++ b/drivers/video/tegra/host/t30/t30.h @@ -21,9 +21,12 @@ #define _NVHOST_T30_H_ struct nvhost_master; +struct nvhost_chip_support; -int nvhost_init_t30_channel_support(struct nvhost_master *); -int nvhost_init_t30_debug_support(struct nvhost_master *); -int nvhost_init_t30_support(struct nvhost_master *host); +int nvhost_init_t30_channel_support(struct nvhost_master *, + struct nvhost_chip_support *); +int nvhost_init_t30_debug_support(struct nvhost_chip_support *); +int nvhost_init_t30_support(struct nvhost_master *host, + struct nvhost_chip_support *); #endif /* _NVHOST_T30_H_ */ |