nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Use long for timeout in semaphores

Browse Source 
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
This commit is contained in:
Terje Bergstrom
2014-11-07 11:50:49 +02:00
committed by Dan Willemsen
parent ef575c5a2a
commit 3fc88e50b8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/nvgpu/gk20a/fence_gk20a.c
View File

@@ -31,7 +31,7 @@
#endif
struct gk20a_fence_ops {
int (*wait)(struct gk20a_fence *, int timeout);
int (*wait)(struct gk20a_fence *, long timeout);
bool (*is_expired)(struct gk20a_fence *);
void *(*free)(struct kref *);
};
@@ -108,9 +108,9 @@ static struct gk20a_fence *alloc_fence(const struct gk20a_fence_ops *ops,
/* Fences that are backed by GPU semaphores: */
static int gk20a_semaphore_fence_wait(struct gk20a_fence *f, int timeout)
static int gk20a_semaphore_fence_wait(struct gk20a_fence *f, long timeout)
{
int remain;
long remain;
if (!gk20a_semaphore_is_acquired(f->semaphore))
return 0;
@@ -170,11 +170,11 @@ struct gk20a_fence *gk20a_fence_from_semaphore(
#ifdef CONFIG_TEGRA_GK20A
/* Fences that are backed by host1x syncpoints: */
static int gk20a_syncpt_fence_wait(struct gk20a_fence *f, int timeout)
static int gk20a_syncpt_fence_wait(struct gk20a_fence *f, long timeout)
{
return nvhost_syncpt_wait_timeout_ext(
f->host1x_pdev, f->syncpt_id, f->syncpt_value,
timeout, NULL, NULL);
(u32)timeout, NULL, NULL);
}
static bool gk20a_syncpt_fence_is_expired(struct gk20a_fence *f)