diff options
author | Martin Peres <martin.peres@labri.fr> | 2012-10-07 14:53:23 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-08 23:55:22 -0400 |
commit | 11573aa78858598cabedc472538998474b2e8efd (patch) | |
tree | 2f1f1291f3660c6ffc799af3cf75b953f1904415 | |
parent | bbebb4ebc86e723a2c38c651dbfe54017333d307 (diff) |
drm/nouveau/timer: bump ptimer's alarm delay from u32 to u64
This is needed for automatic fan management where some delays
can be over 0xffffffff ns.
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/core/include/subdev/timer.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/timer.h b/drivers/gpu/drm/nouveau/core/include/subdev/timer.h index 49bff901544c..c24ec8ab3db4 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/timer.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/timer.h | |||
@@ -26,7 +26,7 @@ void nouveau_timer_alarm(void *, u32 nsec, struct nouveau_alarm *); | |||
26 | struct nouveau_timer { | 26 | struct nouveau_timer { |
27 | struct nouveau_subdev base; | 27 | struct nouveau_subdev base; |
28 | u64 (*read)(struct nouveau_timer *); | 28 | u64 (*read)(struct nouveau_timer *); |
29 | void (*alarm)(struct nouveau_timer *, u32 time, struct nouveau_alarm *); | 29 | void (*alarm)(struct nouveau_timer *, u64 time, struct nouveau_alarm *); |
30 | }; | 30 | }; |
31 | 31 | ||
32 | static inline struct nouveau_timer * | 32 | static inline struct nouveau_timer * |
diff --git a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c index 49976be4d73b..c26ca9bef671 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c +++ b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | |||
@@ -85,7 +85,7 @@ nv04_timer_alarm_trigger(struct nouveau_timer *ptimer) | |||
85 | } | 85 | } |
86 | 86 | ||
87 | static void | 87 | static void |
88 | nv04_timer_alarm(struct nouveau_timer *ptimer, u32 time, | 88 | nv04_timer_alarm(struct nouveau_timer *ptimer, u64 time, |
89 | struct nouveau_alarm *alarm) | 89 | struct nouveau_alarm *alarm) |
90 | { | 90 | { |
91 | struct nv04_timer_priv *priv = (void *)ptimer; | 91 | struct nv04_timer_priv *priv = (void *)ptimer; |