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

Commit 39cbf2aa authored by Kees Cook's avatar Kees Cook Committed by Jani Nikula
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171017065304.3358-1-joonas.lahtinen@linux.intel.com
parent 8e9f8ab4

drivers/gpu/drm/i915/i915_sw_fence.c

+3 −5
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/intel_breadcrumbs.c

+8 −10
Original line number Diff line number Diff line
@@ -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

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

+3 −5
Original line number Diff line number Diff line
@@ -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;