leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 6d0dbd3096.

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: Chris 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: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
This commit is contained in:
Chris Wilson 2017-10-25 14:13:36 +01:00
parent 6d0dbd3096
commit 02a1ca45cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/i915/selftests/lib_sw_fence.c
View File

@ -49,9 +49,9 @@ void onstack_fence_fini(struct i915_sw_fence *fence)
i915_sw_fence_fini(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); 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); 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)) if (time_after(expires, jiffies))
mod_timer(&tf->timer, expires); mod_timer(&tf->timer, expires);