aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/host1x/hw
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2018-05-05 02:45:47 -0400
committerThierry Reding <treding@nvidia.com>2018-05-18 15:50:04 -0400
commit24c94e166dfe89839129b8e0fae208b6af60d6f1 (patch)
tree9c171fc00e813de23dabf7cf7717938644416a12 /drivers/gpu/host1x/hw
parent2f8a6da866eff746a9f8c7745790f3765baeb589 (diff)
gpu: host1x: Remove wait check support
The job submission userspace ABI doesn't support this and there are no plans to implement it, so all of this code is dead and can be removed. Reviewed-by: Dmitry Osipenko <digetx@gmail.com> Tested-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu/host1x/hw')
-rw-r--r--drivers/gpu/host1x/hw/channel_hw.c3
-rw-r--r--drivers/gpu/host1x/hw/syncpt_hw.c11
2 files changed, 1 insertions, 13 deletions
diff --git a/drivers/gpu/host1x/hw/channel_hw.c b/drivers/gpu/host1x/hw/channel_hw.c
index 9af758785a11..4c9555038a95 100644
--- a/drivers/gpu/host1x/hw/channel_hw.c
+++ b/drivers/gpu/host1x/hw/channel_hw.c
@@ -104,8 +104,7 @@ static int channel_submit(struct host1x_job *job)
104 sp = host->syncpt + job->syncpt_id; 104 sp = host->syncpt + job->syncpt_id;
105 trace_host1x_channel_submit(dev_name(ch->dev), 105 trace_host1x_channel_submit(dev_name(ch->dev),
106 job->num_gathers, job->num_relocs, 106 job->num_gathers, job->num_relocs,
107 job->num_waitchk, job->syncpt_id, 107 job->syncpt_id, job->syncpt_incrs);
108 job->syncpt_incrs);
109 108
110 /* before error checks, return current max */ 109 /* before error checks, return current max */
111 prev_max = job->syncpt_end = host1x_syncpt_read_max(sp); 110 prev_max = job->syncpt_end = host1x_syncpt_read_max(sp);
diff --git a/drivers/gpu/host1x/hw/syncpt_hw.c b/drivers/gpu/host1x/hw/syncpt_hw.c
index 7dfd47d74f89..a23bb3352d02 100644
--- a/drivers/gpu/host1x/hw/syncpt_hw.c
+++ b/drivers/gpu/host1x/hw/syncpt_hw.c
@@ -96,16 +96,6 @@ static int syncpt_cpu_incr(struct host1x_syncpt *sp)
96 return 0; 96 return 0;
97} 97}
98 98
99/* remove a wait pointed to by patch_addr */
100static int syncpt_patch_wait(struct host1x_syncpt *sp, void *patch_addr)
101{
102 u32 override = host1x_class_host_wait_syncpt(HOST1X_SYNCPT_RESERVED, 0);
103
104 *((u32 *)patch_addr) = override;
105
106 return 0;
107}
108
109/** 99/**
110 * syncpt_assign_to_channel() - Assign syncpoint to channel 100 * syncpt_assign_to_channel() - Assign syncpoint to channel
111 * @sp: syncpoint 101 * @sp: syncpoint
@@ -156,7 +146,6 @@ static const struct host1x_syncpt_ops host1x_syncpt_ops = {
156 .load_wait_base = syncpt_read_wait_base, 146 .load_wait_base = syncpt_read_wait_base,
157 .load = syncpt_load, 147 .load = syncpt_load,
158 .cpu_incr = syncpt_cpu_incr, 148 .cpu_incr = syncpt_cpu_incr,
159 .patch_wait = syncpt_patch_wait,
160 .assign_to_channel = syncpt_assign_to_channel, 149 .assign_to_channel = syncpt_assign_to_channel,
161 .enable_protection = syncpt_enable_protection, 150 .enable_protection = syncpt_enable_protection,
162}; 151};