Attachment 131704 Details for Bug 101184 – test fix

[patch] test fix

test.patch (text/plain), 1.36 KB, created by Ben Skeggs on 2017-06-05 07:27:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Skeggs

Created: 2017-06-05 07:27:14 UTC

Size: 1.36 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
>index 6a567fe347b3..820a4805916f 100644
>--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
>+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/timer.h
>@@ -4,6 +4,7 @@
> 
> struct nvkm_alarm {
> 	struct list_head head;
>+	struct list_head exec;
> 	u64 timestamp;
> 	void (*func)(struct nvkm_alarm *);
> };
>diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
>index f2a86eae0a0d..2437f7d41ca2 100644
>--- a/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
>+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c
>@@ -50,7 +50,8 @@ nvkm_timer_alarm_trigger(struct nvkm_timer *tmr)
> 		/* Move to completed list.  We'll drop the lock before
> 		 * executing the callback so it can reschedule itself.
> 		 */
>-		list_move_tail(&alarm->head, &exec);
>+		list_del_init(&alarm->head);
>+		list_add(&alarm->exec, &exec);
> 	}
> 
> 	/* Shut down interrupt if no more pending alarms. */
>@@ -59,8 +60,8 @@ nvkm_timer_alarm_trigger(struct nvkm_timer *tmr)
> 	spin_unlock_irqrestore(&tmr->lock, flags);
> 
> 	/* Execute completed callbacks. */
>-	list_for_each_entry_safe(alarm, atemp, &exec, head) {
>-		list_del_init(&alarm->head);
>+	list_for_each_entry_safe(alarm, atemp, &exec, exec) {
>+		list_del(&alarm->exec);
> 		alarm->func(alarm);
> 	}
> }

Actions: View | Splinter Review

Attachments on bug 101184: 131503 | 131504 | 131565 | 131704

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.