diff options
author | Arto Merilainen <amerilainen@nvidia.com> | 2013-10-14 08:21:53 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2013-10-31 04:55:48 -0400 |
commit | f5a954fed9b3eb04973ede72c50c66157fa9e15b (patch) | |
tree | d9d6faeb5b2bafbc5a4143feb10e27d975ec1da4 /drivers/gpu/host1x/hw/channel_hw.c | |
parent | 8736fe81532182ba0086a371fae0708ea42a2cdf (diff) |
gpu: host1x: Add syncpoint base support
This patch adds support for hardware syncpoint bases. This creates
a simple mechanism to stall the command FIFO until an operation is
completed.
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x/hw/channel_hw.c')
-rw-r--r-- | drivers/gpu/host1x/hw/channel_hw.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c index 3be0cd296d3a..4608257ab656 100644 --- a/drivers/gpu/host1x/hw/channel_hw.c +++ b/drivers/gpu/host1x/hw/channel_hw.c | |||
@@ -67,6 +67,22 @@ static void submit_gathers(struct host1x_job *job) | |||
67 | } | 67 | } |
68 | } | 68 | } |
69 | 69 | ||
70 | static inline void synchronize_syncpt_base(struct host1x_job *job) | ||
71 | { | ||
72 | struct host1x *host = dev_get_drvdata(job->channel->dev->parent); | ||
73 | struct host1x_syncpt *sp = host->syncpt + job->syncpt_id; | ||
74 | u32 id, value; | ||
75 | |||
76 | value = host1x_syncpt_read_max(sp); | ||
77 | id = sp->base->id; | ||
78 | |||
79 | host1x_cdma_push(&job->channel->cdma, | ||
80 | host1x_opcode_setclass(HOST1X_CLASS_HOST1X, | ||
81 | HOST1X_UCLASS_LOAD_SYNCPT_BASE, 1), | ||
82 | HOST1X_UCLASS_LOAD_SYNCPT_BASE_BASE_INDX_F(id) | | ||
83 | HOST1X_UCLASS_LOAD_SYNCPT_BASE_VALUE_F(value)); | ||
84 | } | ||
85 | |||
70 | static int channel_submit(struct host1x_job *job) | 86 | static int channel_submit(struct host1x_job *job) |
71 | { | 87 | { |
72 | struct host1x_channel *ch = job->channel; | 88 | struct host1x_channel *ch = job->channel; |
@@ -118,6 +134,10 @@ static int channel_submit(struct host1x_job *job) | |||
118 | host1x_syncpt_read_max(sp))); | 134 | host1x_syncpt_read_max(sp))); |
119 | } | 135 | } |
120 | 136 | ||
137 | /* Synchronize base register to allow using it for relative waiting */ | ||
138 | if (sp->base) | ||
139 | synchronize_syncpt_base(job); | ||
140 | |||
121 | syncval = host1x_syncpt_incr_max(sp, user_syncpt_incrs); | 141 | syncval = host1x_syncpt_incr_max(sp, user_syncpt_incrs); |
122 | 142 | ||
123 | job->syncpt_end = syncval; | 143 | job->syncpt_end = syncval; |