On Tue, 17 Oct 2017, Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> wrote:
> From: Kees Cook <keescook@xxxxxxxxxxxx>
>
> 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@xxxxxxxxx>
> Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
> Cc: David Airlie <airlied@xxxxxxxx>
> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
> Cc: Oscar Mateo <oscar.mateo@xxxxxxxxx>
> Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Failed to mention I pushed this yesterday. Thanks for the patch and
review.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/i915_sw_fence.c | 8 +++-----
> drivers/gpu/drm/i915/intel_breadcrumbs.c | 18 ++++++++----------
> drivers/gpu/drm/i915/selftests/mock_engine.c | 8 +++-----
> 3 files changed, 14 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c
> index ca33cc08cb07..e8ca67a129d2 100644
> --- 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 29c62d481cef..48e1ba01ccf8 100644
> --- 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 fc0fd7498689..331c2b09869e 100644
> --- 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;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
