Attachment 83882 Details for Bug 66177 – [PATCH 4/5] drm/nouveau/timer: add a way to cancel alarms

[patch] [PATCH 4/5] drm/nouveau/timer: add a way to cancel alarms

0004-drm-nouveau-timer-add-a-way-to-cancel-alarms.patch (text/plain), 3.55 KB, created by Martin Peres on 2013-08-09 08:08:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Peres

Created: 2013-08-09 08:08:39 UTC

Size: 3.55 KB

patch

obsolete

>From 9ed6f8c69f6a7f2e6cb9ba3354c8b30cb694b27a Mon Sep 17 00:00:00 2001
>From: Martin Peres <martin.peres@labri.fr>
>Date: Fri, 9 Aug 2013 02:24:14 -0400
>Subject: [PATCH 4/5] drm/nouveau/timer: add a way to cancel alarms
>
>Since alarms don't play well with suspend, it is important every alarm user
>cancels his tasks before suspending. The task should be rescheduled on resume.
>
>Signed-off-by: Martin Peres <martin.peres@labri.fr>
>---
> drivers/gpu/drm/nouveau/core/include/subdev/timer.h |  2 ++
> drivers/gpu/drm/nouveau/core/subdev/timer/base.c    |  7 +++++++
> drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c    | 20 ++++++++++++++++++++
> 3 files changed, 29 insertions(+)
>
>diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/timer.h b/drivers/gpu/drm/nouveau/core/include/subdev/timer.h
>index e465d15..9ab70df 100644
>--- a/drivers/gpu/drm/nouveau/core/include/subdev/timer.h
>+++ b/drivers/gpu/drm/nouveau/core/include/subdev/timer.h
>@@ -22,6 +22,7 @@ bool nouveau_timer_wait_eq(void *, u64 nsec, u32 addr, u32 mask, u32 data);
> bool nouveau_timer_wait_ne(void *, u64 nsec, u32 addr, u32 mask, u32 data);
> bool nouveau_timer_wait_cb(void *, u64 nsec, bool (*func)(void *), void *data);
> void nouveau_timer_alarm(void *, u32 nsec, struct nouveau_alarm *);
>+void nouveau_timer_alarm_cancel(void *, struct nouveau_alarm *);
> 
> #define NV_WAIT_DEFAULT 2000000000ULL
> #define nv_wait(o,a,m,v)                                                       \
>@@ -35,6 +36,7 @@ struct nouveau_timer {
> 	struct nouveau_subdev base;
> 	u64  (*read)(struct nouveau_timer *);
> 	void (*alarm)(struct nouveau_timer *, u64 time, struct nouveau_alarm *);
>+	void (*alarm_cancel)(struct nouveau_timer *, struct nouveau_alarm *);
> };
> 
> static inline struct nouveau_timer *
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/timer/base.c b/drivers/gpu/drm/nouveau/core/subdev/timer/base.c
>index 5d417cc..cf8a0e0 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/timer/base.c
>+++ b/drivers/gpu/drm/nouveau/core/subdev/timer/base.c
>@@ -85,3 +85,10 @@ nouveau_timer_alarm(void *obj, u32 nsec, struct nouveau_alarm *alarm)
> 	struct nouveau_timer *ptimer = nouveau_timer(obj);
> 	ptimer->alarm(ptimer, nsec, alarm);
> }
>+
>+void
>+nouveau_timer_alarm_cancel(void *obj, struct nouveau_alarm *alarm)
>+{
>+	struct nouveau_timer *ptimer = nouveau_timer(obj);
>+	ptimer->alarm_cancel(ptimer, alarm);
>+}
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
>index 8c72da6..e0d4fd1 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
>+++ b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c
>@@ -114,6 +114,25 @@ nv04_timer_alarm(struct nouveau_timer *ptimer, u64 time,
> }
> 
> static void
>+nv04_timer_alarm_cancel(struct nouveau_timer *ptimer,
>+			struct nouveau_alarm *alarm)
>+{
>+	struct nv04_timer_priv *priv = (void *)ptimer;
>+	unsigned long flags;
>+
>+	/* avoid deleting an entry while the alarm intr is running */
>+	spin_lock_irqsave(&priv->lock, flags);
>+
>+	/* delete the alarm from the list */
>+	list_del(&alarm->head);
>+
>+	/* reset the head so as list_empty returns 1 */
>+	INIT_LIST_HEAD(&alarm->head);
>+
>+	spin_unlock_irqrestore(&priv->lock, flags);
>+}
>+
>+static void
> nv04_timer_intr(struct nouveau_subdev *subdev)
> {
> 	struct nv04_timer_priv *priv = (void *)subdev;
>@@ -147,6 +166,7 @@ nv04_timer_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
> 	priv->base.base.intr = nv04_timer_intr;
> 	priv->base.read = nv04_timer_read;
> 	priv->base.alarm = nv04_timer_alarm;
>+	priv->base.alarm_cancel = nv04_timer_alarm_cancel;
> 	priv->suspend_time = 0;
> 
> 	INIT_LIST_HEAD(&priv->alarms);
>-- 
>1.8.3.4
>

Actions: View | Splinter Review

Attachments on bug 66177: 81430 | 81431 | 83879 | 83880 | 83881 | 83882 | 83883

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.