diff options
| -rw-r--r-- | drivers/video/tegra/host/host1x/host1x_channel.c | 12 | ||||
| -rw-r--r-- | drivers/video/tegra/host/t20/t20.c | 1 | ||||
| -rw-r--r-- | drivers/video/tegra/host/t30/t30.c | 1 | ||||
| -rw-r--r-- | include/linux/nvhost.h | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/drivers/video/tegra/host/host1x/host1x_channel.c b/drivers/video/tegra/host/host1x/host1x_channel.c index 98af5758df56..9e9fc25dc966 100644 --- a/drivers/video/tegra/host/host1x/host1x_channel.c +++ b/drivers/video/tegra/host/host1x/host1x_channel.c @@ -251,6 +251,18 @@ static int host1x_channel_submit(struct nvhost_job *job) goto error; } + if (ch->dev->serialize) { + /* Force serialization by inserting a host wait for the + * previous job to finish before this one can commence. */ + nvhost_cdma_push(&ch->cdma, + nvhost_opcode_setclass(NV_HOST1X_CLASS_ID, + host1x_uclass_wait_syncpt_r(), + 1), + nvhost_class_host_wait_syncpt(job->syncpt_id, + nvhost_syncpt_read_max(sp, + job->syncpt_id))); + } + submit_ctxsave(job, ctxsave_waiter, ch->cur_ctx); submit_ctxrestore(job); ch->cur_ctx = job->hwctx; diff --git a/drivers/video/tegra/host/t20/t20.c b/drivers/video/tegra/host/t20/t20.c index 00c1e2825920..71ed7334e714 100644 --- a/drivers/video/tegra/host/t20/t20.c +++ b/drivers/video/tegra/host/t20/t20.c @@ -140,6 +140,7 @@ static struct nvhost_device tegra_gr2d01_device = { NVHOST_MODULE_NO_POWERGATE_IDS, .clockgate_delay = 0, .moduleid = NVHOST_MODULE_NONE, + .serialize = true, }; static struct resource isp_resources_t20[] = { diff --git a/drivers/video/tegra/host/t30/t30.c b/drivers/video/tegra/host/t30/t30.c index 88a489244b48..4d042a985fe1 100644 --- a/drivers/video/tegra/host/t30/t30.c +++ b/drivers/video/tegra/host/t30/t30.c @@ -148,6 +148,7 @@ static struct nvhost_device tegra_gr2d02_device = { NVHOST_MODULE_NO_POWERGATE_IDS, .clockgate_delay = 0, .moduleid = NVHOST_MODULE_NONE, + .serialize = true, }; static struct resource isp_resources_t20[] = { diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h index f84749a75df9..cde63fa6abb7 100644 --- a/include/linux/nvhost.h +++ b/include/linux/nvhost.h @@ -100,6 +100,7 @@ struct nvhost_device { bool keepalive; /* Do not power gate when opened */ bool waitbasesync; /* Force sync of wait bases */ bool powerup_reset; /* Do a reset after power un-gating */ + bool serialize; /* Serialize submits in the channel */ int powergate_ids[NVHOST_MODULE_MAX_POWERGATE_IDS]; bool can_powergate; /* True if module can be power gated */ |