Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02a1ca45 authored by Chris Wilson's avatar Chris Wilson
Browse files

Revert "drm/i915/selftests: Convert timers to use timer_setup()" 



This reverts commit 6d0dbd30.

timer_setup_on_stack() does not yet exist:

In file included from drivers/gpu/drm/i915/i915_sw_fence.c:517:0:
drivers/gpu/drm/i915/selftests/lib_sw_fence.c: In function ‘timed_fence_init’:
drivers/gpu/drm/i915/selftests/lib_sw_fence.c:63:2: error: implicit declaration of function ‘timer_setup_on_stack’; did you mean ‘hrtimer_init_on_stack’? [-Werror=implicit-function-declaration]
  timer_setup_on_stack(&tf->timer, timed_fence_wake, 0);

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171025131336.2584-1-chris@chris-wilson.co.uk


Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 6d0dbd30

drivers/gpu/drm/i915/selftests/lib_sw_fence.c

+3 −3
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ void onstack_fence_fini(struct i915_sw_fence *fence) 
	i915_sw_fence_fini(fence);

}



static void timed_fence_wake(struct timer_list *t)

static void timed_fence_wake(unsigned long data)

{

	struct timed_fence *tf = from_timer(tf, t, timer);

	struct timed_fence *tf = (struct timed_fence *)data;



	i915_sw_fence_commit(&tf->fence);

}
@@ -60,7 +60,7 @@ void timed_fence_init(struct timed_fence *tf, unsigned long expires) 
{

	onstack_fence_init(&tf->fence);



	timer_setup_on_stack(&tf->timer, timed_fence_wake, 0);

	setup_timer_on_stack(&tf->timer, timed_fence_wake, (unsigned long)tf);



	if (time_after(expires, jiffies))

		mod_timer(&tf->timer, expires);