drm/i915: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Oscar Mateo <oscar.mateo@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171017065304.3358-1-joonas.lahtinen@linux.intel.com

diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
index ca33cc08cb07026130f6b6ea2dd95f5cfea4ebdb..e8ca67a129d28da6ef5b9d1de9d8357f7dc02f7e 100644 (file)
--- a/drivers/gpu/drm/i915/i915_sw_fence.c
+++ b/drivers/gpu/drm/i915/i915_sw_fence.c
@@ -369,9 +369,9 @@ struct i915_sw_dma_fence_cb {
        struct irq_work work;
 };
 
-static void timer_i915_sw_fence_wake(unsigned long data)
+static void timer_i915_sw_fence_wake(struct timer_list *t)
 {
-       struct i915_sw_dma_fence_cb *cb = (struct i915_sw_dma_fence_cb *)data;
+       struct i915_sw_dma_fence_cb *cb = from_timer(cb, t, timer);
        struct i915_sw_fence *fence;
 
        fence = xchg(&cb->fence, NULL);
@@ -434,9 +434,7 @@ int i915_sw_fence_await_dma_fence(struct i915_sw_fence *fence,
        i915_sw_fence_await(fence);
 
        cb->dma = NULL;
-       __setup_timer(&cb->timer,
-                     timer_i915_sw_fence_wake, (unsigned long)cb,
-                     TIMER_IRQSAFE);
+       timer_setup(&cb->timer, timer_i915_sw_fence_wake, TIMER_IRQSAFE);
        init_irq_work(&cb->work, irq_i915_sw_fence_work);
        if (timeout) {
                cb->dma = dma_fence_get(dma);

diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
index 29c62d481cef5964107edb6ab2adad681b91fcd1..48e1ba01ccf88dba097a9e62e06c77907f01a9ce 100644 (file)
--- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
+++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
@@ -74,9 +74,10 @@ static noinline void missed_breadcrumb(struct intel_engine_cs *engine)
        set_bit(engine->id, &engine->i915->gpu_error.missed_irq_rings);
 }
 
-static void intel_breadcrumbs_hangcheck(unsigned long data)
+static void intel_breadcrumbs_hangcheck(struct timer_list *t)
 {
-       struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
+       struct intel_engine_cs *engine = from_timer(engine, t,
+                                                   breadcrumbs.hangcheck);
        struct intel_breadcrumbs *b = &engine->breadcrumbs;
 
        if (!b->irq_armed)
@@ -108,9 +109,10 @@ static void intel_breadcrumbs_hangcheck(unsigned long data)
        }
 }
 
-static void intel_breadcrumbs_fake_irq(unsigned long data)
+static void intel_breadcrumbs_fake_irq(struct timer_list *t)
 {
-       struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
+       struct intel_engine_cs *engine = from_timer(engine, t,
+                                                   breadcrumbs.fake_irq);
        struct intel_breadcrumbs *b = &engine->breadcrumbs;
 
        /* The timer persists in case we cannot enable interrupts,
@@ -787,12 +789,8 @@ int intel_engine_init_breadcrumbs(struct intel_engine_cs *engine)
        spin_lock_init(&b->rb_lock);
        spin_lock_init(&b->irq_lock);
 
-       setup_timer(&b->fake_irq,
-                   intel_breadcrumbs_fake_irq,
-                   (unsigned long)engine);
-       setup_timer(&b->hangcheck,
-                   intel_breadcrumbs_hangcheck,
-                   (unsigned long)engine);
+       timer_setup(&b->fake_irq, intel_breadcrumbs_fake_irq, 0);
+       timer_setup(&b->hangcheck, intel_breadcrumbs_hangcheck, 0);
 
        /* Spawn a thread to provide a common bottom-half for all signals.
         * As this is an asynchronous interface we cannot steal the current

diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c
index fc0fd7498689dc38626241140f944aba117ab436..331c2b09869ee0f5838ab53fe1811b7c431902c0 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_engine.c
+++ b/drivers/gpu/drm/i915/selftests/mock_engine.c
@@ -32,9 +32,9 @@ static struct mock_request *first_request(struct mock_engine *engine)
                                        link);
 }
 
-static void hw_delay_complete(unsigned long data)
+static void hw_delay_complete(struct timer_list *t)
 {
-       struct mock_engine *engine = (typeof(engine))data;
+       struct mock_engine *engine = from_timer(engine, t, hw_delay);
        struct mock_request *request;
 
        spin_lock(&engine->hw_lock);
@@ -161,9 +161,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
 
        /* fake hw queue */
        spin_lock_init(&engine->hw_lock);
-       setup_timer(&engine->hw_delay,
-                   hw_delay_complete,
-                   (unsigned long)engine);
+       timer_setup(&engine->hw_delay, hw_delay_complete, 0);
        INIT_LIST_HEAD(&engine->hw_queue);
 
        return &engine->base;