diff options
Diffstat (limited to 'drivers/video/tegra/host/t20/t20.c')
| -rw-r--r-- | drivers/video/tegra/host/t20/t20.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/video/tegra/host/t20/t20.c b/drivers/video/tegra/host/t20/t20.c index 3f90e6a837c9..02382cba50b7 100644 --- a/drivers/video/tegra/host/t20/t20.c +++ b/drivers/video/tegra/host/t20/t20.c @@ -186,13 +186,14 @@ static int t20_channel_init(struct nvhost_channel *ch, return t20_nvhost_hwctx_handler_init(ch); } -int nvhost_init_t20_channel_support(struct nvhost_master *host) +int nvhost_init_t20_channel_support(struct nvhost_master *host, + struct nvhost_chip_support *op) { host->nb_channels = NVHOST_NUMCHANNELS; - host->op.channel.init = t20_channel_init; - host->op.channel.submit = host1x_channel_submit; - host->op.channel.read3dreg = host1x_channel_read_3d_reg; + op->channel.init = t20_channel_init; + op->channel.submit = host1x_channel_submit; + op->channel.read3dreg = host1x_channel_read_3d_reg; return 0; } @@ -210,26 +211,27 @@ struct nvhost_device *t20_get_nvhost_device(struct nvhost_master *host, return NULL; } -int nvhost_init_t20_support(struct nvhost_master *host) +int nvhost_init_t20_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_t20_channel_support(host); + err = nvhost_init_t20_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_t20_debug_support(host); + err = nvhost_init_t20_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 = t20_get_nvhost_device; + op->nvhost_dev.get_nvhost_device = t20_get_nvhost_device; return 0; } |