diff options
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/timers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/timers.h b/drivers/gpu/nvgpu/include/nvgpu/timers.h index 5265437e..482f92b7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/timers.h +++ b/drivers/gpu/nvgpu/include/nvgpu/timers.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -52,8 +52,8 @@ struct nvgpu_timeout { | |||
52 | union { | 52 | union { |
53 | s64 time; | 53 | s64 time; |
54 | struct { | 54 | struct { |
55 | int max; | 55 | u32 max; |
56 | int attempted; | 56 | u32 attempted; |
57 | } retries; | 57 | } retries; |
58 | }; | 58 | }; |
59 | }; | 59 | }; |
@@ -75,7 +75,7 @@ struct nvgpu_timeout { | |||
75 | NVGPU_TIMER_SILENT_TIMEOUT) | 75 | NVGPU_TIMER_SILENT_TIMEOUT) |
76 | 76 | ||
77 | int nvgpu_timeout_init(struct gk20a *g, struct nvgpu_timeout *timeout, | 77 | int nvgpu_timeout_init(struct gk20a *g, struct nvgpu_timeout *timeout, |
78 | int duration, unsigned long flags); | 78 | u32 duration, unsigned long flags); |
79 | int nvgpu_timeout_peek_expired(struct nvgpu_timeout *timeout); | 79 | int nvgpu_timeout_peek_expired(struct nvgpu_timeout *timeout); |
80 | 80 | ||
81 | #define nvgpu_timeout_expired(__timeout) \ | 81 | #define nvgpu_timeout_expired(__timeout) \ |