From 6bf28eb0cb34c1a50a6d7277dcccb549c1c0cca9 Mon Sep 17 00:00:00 2001 From: Martin Peres Date: Sun, 7 Oct 2012 20:53:23 +0200 Subject: [PATCH] --- yaml --- r: 332995 b: refs/heads/master c: 11573aa78858598cabedc472538998474b2e8efd h: refs/heads/master i: 332993: ce4d71e87bc3407b9e3779c413c8591bda7361da 332991: 91692df8e4d27a1d12d4d0b2b8b7393a6a0f6191 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/include/subdev/timer.h | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 36fe2d39d907..37055e32daa4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbebb4ebc86e723a2c38c651dbfe54017333d307 +refs/heads/master: 11573aa78858598cabedc472538998474b2e8efd diff --git a/trunk/drivers/gpu/drm/nouveau/core/include/subdev/timer.h b/trunk/drivers/gpu/drm/nouveau/core/include/subdev/timer.h index 49bff901544c..c24ec8ab3db4 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/include/subdev/timer.h +++ b/trunk/drivers/gpu/drm/nouveau/core/include/subdev/timer.h @@ -26,7 +26,7 @@ void nouveau_timer_alarm(void *, u32 nsec, struct nouveau_alarm *); struct nouveau_timer { struct nouveau_subdev base; u64 (*read)(struct nouveau_timer *); - void (*alarm)(struct nouveau_timer *, u32 time, struct nouveau_alarm *); + void (*alarm)(struct nouveau_timer *, u64 time, struct nouveau_alarm *); }; static inline struct nouveau_timer * diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c index 49976be4d73b..c26ca9bef671 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c @@ -85,7 +85,7 @@ nv04_timer_alarm_trigger(struct nouveau_timer *ptimer) } static void -nv04_timer_alarm(struct nouveau_timer *ptimer, u32 time, +nv04_timer_alarm(struct nouveau_timer *ptimer, u64 time, struct nouveau_alarm *alarm) { struct nv04_timer_priv *priv = (void *)ptimer;