diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-11-07 04:50:49 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:12:12 -0400 |
commit | 3fc88e50b84d13ff1e6ddaa910105d7e2f247c38 (patch) | |
tree | a15bddcf60bcff020d4cad22812286b6de2c58f2 /drivers/gpu/nvgpu | |
parent | ef575c5a2aa230070a7d9926f921fd7c43454af1 (diff) |
gpu: nvgpu: Use long for timeout in semaphores
Semaphore fences use int for timeout. It should be long instead.
Bug 1567274
Change-Id: Ia2b2c5ceeb03b4d09c1d8933ce33310356dd7e01
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/595980
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c index 32c66037..1c34d803 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | struct gk20a_fence_ops { | 33 | struct gk20a_fence_ops { |
34 | int (*wait)(struct gk20a_fence *, int timeout); | 34 | int (*wait)(struct gk20a_fence *, long timeout); |
35 | bool (*is_expired)(struct gk20a_fence *); | 35 | bool (*is_expired)(struct gk20a_fence *); |
36 | void *(*free)(struct kref *); | 36 | void *(*free)(struct kref *); |
37 | }; | 37 | }; |
@@ -108,9 +108,9 @@ static struct gk20a_fence *alloc_fence(const struct gk20a_fence_ops *ops, | |||
108 | 108 | ||
109 | /* Fences that are backed by GPU semaphores: */ | 109 | /* Fences that are backed by GPU semaphores: */ |
110 | 110 | ||
111 | static int gk20a_semaphore_fence_wait(struct gk20a_fence *f, int timeout) | 111 | static int gk20a_semaphore_fence_wait(struct gk20a_fence *f, long timeout) |
112 | { | 112 | { |
113 | int remain; | 113 | long remain; |
114 | 114 | ||
115 | if (!gk20a_semaphore_is_acquired(f->semaphore)) | 115 | if (!gk20a_semaphore_is_acquired(f->semaphore)) |
116 | return 0; | 116 | return 0; |
@@ -170,11 +170,11 @@ struct gk20a_fence *gk20a_fence_from_semaphore( | |||
170 | #ifdef CONFIG_TEGRA_GK20A | 170 | #ifdef CONFIG_TEGRA_GK20A |
171 | /* Fences that are backed by host1x syncpoints: */ | 171 | /* Fences that are backed by host1x syncpoints: */ |
172 | 172 | ||
173 | static int gk20a_syncpt_fence_wait(struct gk20a_fence *f, int timeout) | 173 | static int gk20a_syncpt_fence_wait(struct gk20a_fence *f, long timeout) |
174 | { | 174 | { |
175 | return nvhost_syncpt_wait_timeout_ext( | 175 | return nvhost_syncpt_wait_timeout_ext( |
176 | f->host1x_pdev, f->syncpt_id, f->syncpt_value, | 176 | f->host1x_pdev, f->syncpt_id, f->syncpt_value, |
177 | timeout, NULL, NULL); | 177 | (u32)timeout, NULL, NULL); |
178 | } | 178 | } |
179 | 179 | ||
180 | static bool gk20a_syncpt_fence_is_expired(struct gk20a_fence *f) | 180 | static bool gk20a_syncpt_fence_is_expired(struct gk20a_fence *f) |