drm/i915: Convert timers to use timer_setup()
Subsystems (2)
Joonas Lahtinen
maintainerFrom: Kees Cook <[email protected]>
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.
--- 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(-)
drivers/gpu/drm/i915/i915_sw_fence.c +3 -5
@@ -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
@@ -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
@@ -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;
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Convert timers to use timer_setup()
== Series Details ==
== Series Details ==
Series: drm/i915: Convert timers to use timer_setup()
URL : https://patchwork.freedesktop.org/series/32082/
State : success
== Summary ==
Series 32082v1 drm/i915: Convert timers to use timer_setup()
https://patchwork.freedesktop.org/api/1.0/series/32082/revisions/1/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-byt-n2820) fdo#101705
pass -> INCOMPLETE (fi-kbl-r) fdo#102846fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fdo#102846 https://bugs.freedesktop.org/show_bug.cgi?id=102846
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:438s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:454s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:370s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:523s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:262s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:492s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:495s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:490s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:473s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:416s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:256s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:576s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:428s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:432s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:485s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:457s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:490s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:571s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:478s fi-kbl-r total:246 pass:221 dwarn:0 dfail:0 fail:0 skip:24 fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:546s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:455s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:646s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:521s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:498s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:462s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:557s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:421s
ba1af442e4884a1148422a7f92ae2f978cfb26a1 drm-tip: 2017y-10m-17d-00h-18m-03s UTC integration manifest c0b567fed6f5 drm/i915: Convert timers to use timer_setup()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6063/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Convert timers to use timer_setup()
In reply to Joonas Lahtinen== Series Details ==
== Series Details ==
Series: drm/i915: Convert timers to use timer_setup()
URL : https://patchwork.freedesktop.org/series/32082/
State : success
== Summary ==
shard-hsw total:2553 pass:1439 dwarn:0 dfail:0 fail:11 skip:1103 time:9224s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6063/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerQuoted 6 lines · Joonas Lahtinen
From: Kees Cook <[email protected]>
In preparation for unconditionally passing the struct
timer_listpointer to all timer callbacks, switch to using the newtimer_setup()andfrom_timer()to pass the timer pointer explicitly.
Quoted 11 lines
Cc Daniel Vetter <[email protected]>Cc Jani Nikula <[email protected]>Cc David Airlie <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Oscar Mateo <[email protected]>Signed-off-by Kees Cook <[email protected]>Reviewed-by Joonas Lahtinen <[email protected]>
Failed to mention I pushed this yesterday. Thanks for the patch and review.
BR,
Jani.
Quoted 105 lines
--- 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(-)drivers/gpu/drm/i915/i915_sw_fence.c +3
-5@@ -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@@ -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@@ -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;
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx