Introduce i915_sched_engine object
Subsystems (4)
cover Introduce i915_sched_engine object
As discussed in [1] we are breaking that large series into a several smaller ones. This series is stand alone patch part of step #4 which has no other dependencies or patches relevant to it.
v2:
(Daniel Vetter):
- Split into several smaller patches
- Add kernel doc for i915_sched_engine
(Matthew Brost):
- Drop wrapper functions for tasklet as eventually tasklet will be dropped
v3:
(Jason Ekstrand)
- Address his comments, change logs in individual patches
- Squash documentation patch into previous patches as needed
(Checkpatch)
- Fix warnings
(Docs)
- Fix warnings
v4:
(Daniele)
- Update a comments / commit messages
- Set queue_priority_hint
v5:
(CI)
- Rebase and fix build error
[1] https://patchwork.freedesktop.org/series/89844/
Matthew Brost (8):
drm/i915: Move priolist to new i915_sched_engine object drm/i915: Add i915_sched_engine_is_empty function drm/i915: Reset sched_engine.no_priolist immediately after dequeue drm/i915: Move active tracking to i915_sched_engine drm/i915: Move engine->schedule to i915_sched_engine drm/i915: Add kick_backend function to i915_sched_engine drm/i915: Update i915_scheduler to operate on i915_sched_engine drm/i915: Move submission tasklet to i915_sched_engine
Documentation/gpu/i915.rst | 5 + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 4 +- drivers/gpu/drm/i915/gt/intel_engine.h | 16 - drivers/gpu/drm/i915/gt/intel_engine_cs.c | 72 ++-- .../gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 +- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 49 +-- drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- .../drm/i915/gt/intel_execlists_submission.c | 325 +++++++++++------- .../gpu/drm/i915/gt/intel_ring_submission.c | 12 +- drivers/gpu/drm/i915/gt/mock_engine.c | 17 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 34 +- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 6 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 6 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 70 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_request.c | 42 +-- drivers/gpu/drm/i915/i915_request.h | 2 +- drivers/gpu/drm/i915/i915_scheduler.c | 168 +++++---- drivers/gpu/drm/i915/i915_scheduler.h | 47 ++- drivers/gpu/drm/i915/i915_scheduler_types.h | 89 +++++ 22 files changed, 556 insertions(+), 424 deletions(-)
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/8 drm/i915: Move priolist to new i915_sched_engine object
Introduce i915_sched_engine object which is lower level data structure that i915_scheduler / generic code can operate on without touching execlist specific structures. This allows additional submission backends to be added without breaking the layering. Currently the execlists backend uses 1 of these object per each engine (physical or virtual) but future backends like the GuC will point to less instances utilizing the reference counting.
This is a bit of detour to integrating the i915 with the DRM scheduler but this object will still exist when the DRM scheduler lands in the i915. It will however look a bit different. It will encapsulate the drm_gpu_scheduler object plus and common variables (to the backends) related to scheduling. Regardless this is a step in the right direction.
This patch starts the aforementioned transition by moving the priolist into the i915_sched_engine object.
v3:
(Jason Ekstrand)
Update comment next to intel_engine_cs.virtual
Add kernel doc
(Checkpatch)
Fix double the in commit message
v4:
(Daniele)
Update comment message.
Add comment about subclass field
--- Documentation/gpu/i915.rst | 5 ++ drivers/gpu/drm/i915/gt/intel_engine_cs.c | 14 +++- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +- drivers/gpu/drm/i915/gt/intel_engine_types.h | 32 ++------ .../drm/i915/gt/intel_execlists_submission.c | 81 +++++++++++-------- drivers/gpu/drm/i915/gt/mock_engine.c | 9 ++- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 19 ++--- drivers/gpu/drm/i915/i915_scheduler.c | 53 +++++++++--- drivers/gpu/drm/i915/i915_scheduler.h | 18 +++++ drivers/gpu/drm/i915/i915_scheduler_types.h | 47 +++++++++++ 10 files changed, 192 insertions(+), 90 deletions(-)
Documentation/gpu/i915.rst +5 -0
@@ -425,6 +425,11 @@ User Batchbuffer Execution .. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c :doc: User command execution +Scheduling +---------- +.. kernel-doc:: drivers/gpu/drm/i915/i915_scheduler_types.h + :functions: i915_sched_engine + Logical Rings, Logical Ring Contexts and Execlists --------------------------------------------------
drivers/gpu/drm/i915/gt/intel_engine_cs.c +10 -4
@@ -585,9 +585,6 @@ void intel_engine_init_execlists(struct intel_engine_cs *engine)memset (execlists->pending,0 ,sizeof (execlists->pending)); execlists->active =memset (execlists->inflight,0 ,sizeof (execlists->inflight)); - - execlists->queue_priority_hint =INT_MIN ; - execlists->queue =RB_ROOT_CACHED ; }static void cleanup_status_page (struct intel_engine_cs *engine)
@@ -714,6 +711,12 @@ static int engine_setup_common(struct intel_engine_cs *engine) goto err_status; } + engine->sched_engine =i915_sched_engine_create (ENGINE_PHYSICAL ); +if (!engine->sched_engine) { + err = -ENOMEM ; + goto err_sched_engine; + } + err =intel_engine_init_cmd_parser (engine);if (err) goto err_cmd_parser;
@@ -737,6 +740,8 @@ static int engine_setup_common(struct intel_engine_cs *engine)return 0 ; err_cmd_parser: +i915_sched_engine_put (engine->sched_engine); +err_sched_engine:intel_breadcrumbs_free (engine->breadcrumbs); err_status:cleanup_status_page (engine);
@@ -960,6 +965,7 @@ void intel_engine_cleanup_common(struct intel_engine_cs *engine)GEM_BUG_ON (!list_empty (&engine->active.requests));tasklet_kill (&engine->execlists.tasklet);/* flush the callback */ +i915_sched_engine_put (engine->sched_engine);intel_breadcrumbs_free (engine->breadcrumbs);intel_engine_fini_retire (engine);
@@ -1283,7 +1289,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)intel_engine_flush_submission (engine);/* ELSP is empty, but there are ready requests? E.g. after reset */ -if (!RB_EMPTY_ROOT (&engine->execlists.queue.rb_root)) +if (!RB_EMPTY_ROOT (&engine->sched_engine->queue.rb_root))return false;/* Ring stopped? */
drivers/gpu/drm/i915/gt/intel_engine_pm.c +2 -2
@@ -275,12 +275,12 @@ static int __engine_park(struct intel_wakeref *wf)intel_breadcrumbs_park (engine->breadcrumbs);/* Must be reset upon idling, or we may miss the busy wakeup. */ -GEM_BUG_ON (engine->execlists.queue_priority_hint !=INT_MIN ); +GEM_BUG_ON (engine->sched_engine->queue_priority_hint !=INT_MIN );if (engine->park) engine->park (engine); - engine->execlists.no_priolist = false; + engine->sched_engine->no_priolist = false;/* While gt calls i915_vma_parked(), we have to break the lock cycle */ intel_gt_pm_put_async (engine->gt);
drivers/gpu/drm/i915/gt/intel_engine_types.h +6 -26
@@ -59,6 +59,7 @@ struct drm_i915_reg_table;struct i915_gem_context ;struct i915_request ;struct i915_sched_attr ; +struct i915_sched_engine ;struct intel_gt ;struct intel_ring ;struct intel_uncore ;
@@ -152,11 +153,6 @@ struct intel_engine_execlists {*/ struct timer_list preempt; -/** -* @default_priolist: priority list for I915_PRIORITY_NORMAL -*/ -struct i915_priolist default_priolist; -/** * @ccid: identifier for contexts submitted to this engine */
@@ -191,11 +187,6 @@ struct intel_engine_execlists {*/ u32 reset_ccid; -/** -* @no_priolist: priority lists disabled -*/ -bool no_priolist; -/** * @submit_reg: gen-specific execlist submission register * set to the ExecList Submission Port (elsp) register pre-Gen11 and to
@@ -238,23 +229,10 @@ struct intel_engine_execlists {unsigned int port_mask;/** -* @queue_priority_hint: Highest pending priority. -* -* When we add requests into the queue, or adjust the priority of -* executing requests, we compute the maximum priority of those -* pending requests. We can then use this value to determine if -* we need to preempt the executing requests to service the queue. -* However, since the we may have recorded the priority of an inflight -* request we wanted to preempt but since completed, at the time of -* dequeuing the priority hint may no longer may match the highest -* available request priority. +* @virtual: Queue of requets on a virtual engine, sorted by priority. +* Each RB entry is a struct i915_priolist containing a list of requests +* of the same priority. */ -int queue_priority_hint; - -/** -* @queue: queue of requests, in priority lists -*/ -struct rb_root_cached queue;struct rb_root_cached virtual;/**
@@ -332,6 +310,8 @@ struct intel_engine_cs {struct list_head hold;/* ready requests, but on hold */ } active; +struct i915_sched_engine *sched_engine; +/* keep a request in reserve for a [pm] barrier under oom */ struct i915_request *request_pool;
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +46 -35
282 lines not on this page · raw message
drivers/gpu/drm/i915/gt/mock_engine.c +8 -1
@@ -283,6 +283,7 @@ static void mock_engine_release(struct intel_engine_cs *engine)GEM_BUG_ON (timer_pending (&mock->hw_delay)); +i915_sched_engine_put (engine->sched_engine);intel_breadcrumbs_free (engine->breadcrumbs);intel_context_unpin (engine->kernel_context);
@@ -345,6 +346,10 @@ int mock_engine_init(struct intel_engine_cs *engine) {struct intel_context *ce; + engine->sched_engine =i915_sched_engine_create (ENGINE_MOCK ); +if (!engine->sched_engine) +return -ENOMEM ; +intel_engine_init_active (engine,ENGINE_MOCK );intel_engine_init_execlists (engine);intel_engine_init__pm (engine);
@@ -352,7 +357,7 @@ int mock_engine_init(struct intel_engine_cs *engine) engine->breadcrumbs =intel_breadcrumbs_create (NULL );if (!engine->breadcrumbs) -return -ENOMEM ; + goto err_schedule; ce =create_kernel_context (engine);if (IS_ERR (ce))
@@ -366,6 +371,8 @@ int mock_engine_init(struct intel_engine_cs *engine) err_breadcrumbs:intel_breadcrumbs_free (engine->breadcrumbs); +err_schedule: +i915_sched_engine_put (engine->sched_engine);return -ENOMEM ; }
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10 -9
@@ -182,6 +182,7 @@ static void schedule_out(struct i915_request *rq)static void __guc_dequeue (struct intel_engine_cs *engine) {struct intel_engine_execlists *const execlists = &engine->execlists; +struct i915_sched_engine *const sched_engine = engine->sched_engine;struct i915_request **first = execlists->inflight;struct i915_request **const last_port = first + execlists->port_mask;struct i915_request *last = first[0 ];
@@ -204,7 +205,7 @@ static void __guc_dequeue(struct intel_engine_cs *engine)* event. */ port = first; -while ((rb =rb_first_cached (&execlists->queue))) { +while ((rb =rb_first_cached (&sched_engine->queue))) {struct i915_priolist *p =to_priolist (rb);struct i915_request *rq, *rn;
@@ -224,11 +225,11 @@ static void __guc_dequeue(struct intel_engine_cs *engine) last = rq; } -rb_erase_cached (&p->node, &execlists->queue); +rb_erase_cached (&p->node, &sched_engine->queue);i915_priolist_free (p); } done: - execlists->queue_priority_hint = + sched_engine->queue_priority_hint = rb ?to_priolist (rb)->priority :INT_MIN ;if (submit) { *port =schedule_in (last, port - execlists->inflight);
@@ -338,7 +339,7 @@ static void guc_reset_rewind(struct intel_engine_cs *engine, bool stalled)static void guc_reset_cancel (struct intel_engine_cs *engine) { -struct intel_engine_execlists *const execlists = &engine->execlists; +struct i915_sched_engine *const sched_engine = engine->sched_engine;struct i915_request *rq, *rn;struct rb_node *rb;unsigned long flags;
@@ -368,7 +369,7 @@ static void guc_reset_cancel(struct intel_engine_cs *engine) }/* Flush the queued requests to the timeline list (for retiring). */ -while ((rb =rb_first_cached (&execlists->queue))) { +while ((rb =rb_first_cached (&sched_engine->queue))) {struct i915_priolist *p =to_priolist (rb);priolist_for_each_request_consume (rq, rn, p) {
@@ -378,14 +379,14 @@ static void guc_reset_cancel(struct intel_engine_cs *engine)i915_request_mark_complete (rq); } -rb_erase_cached (&p->node, &execlists->queue); +rb_erase_cached (&p->node, &sched_engine->queue);i915_priolist_free (p); }/* Remaining _unready_ requests will be nop'ed when submitted */ - execlists->queue_priority_hint =INT_MIN ; - execlists->queue =RB_ROOT_CACHED ; + sched_engine->queue_priority_hint =INT_MIN ; + sched_engine->queue =RB_ROOT_CACHED ;spin_unlock_irqrestore (&engine->active.lock, flags); }
@@ -514,7 +515,7 @@ static void guc_submit_request(struct i915_request *rq)queue_request (engine, rq,rq_prio (rq)); -GEM_BUG_ON (RB_EMPTY_ROOT (&engine->execlists.queue.rb_root)); +GEM_BUG_ON (RB_EMPTY_ROOT (&engine->sched_engine->queue.rb_root));GEM_BUG_ON (list_empty (&rq->sched.link));tasklet_hi_schedule (&engine->execlists.tasklet);
drivers/gpu/drm/i915/i915_scheduler.c +40 -13
120 lines not on this page · raw message
drivers/gpu/drm/i915/i915_scheduler.h +18 -0
@@ -48,6 +48,24 @@ static inline void i915_priolist_free(struct i915_priolist *p)__i915_priolist_free (p); } +struct i915_sched_engine * +i915_sched_engine_create (unsigned int subclass); + +void i915_sched_engine_free (struct kref *kref); + +static inline struct i915_sched_engine * +i915_sched_engine_get (struct i915_sched_engine *sched_engine) +{ +kref_get (&sched_engine->ref); +return sched_engine; +} + +static inline void +i915_sched_engine_put (struct i915_sched_engine *sched_engine) +{ +kref_put (&sched_engine->ref, i915_sched_engine_free); +} + void i915_request_show_with_schedule(struct drm_printer *m, const struct i915_request *rq, const char *prefix,
drivers/gpu/drm/i915/i915_scheduler_types.h +47 -0
51 lines not on this page · raw message
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/8 drm/i915: Add i915_sched_engine_is_empty function
In reply to Matthew BrostAdd wrapper function around RB tree to determine if i915_sched_engine is empty.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 6 +++--- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- drivers/gpu/drm/i915/i915_scheduler.h | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +1 -1
@@ -1289,7 +1289,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)intel_engine_flush_submission (engine);/* ELSP is empty, but there are ready requests? E.g. after reset */ -if (!RB_EMPTY_ROOT (&engine->sched_engine->queue.rb_root)) +if (!i915_sched_engine_is_empty (engine->sched_engine))return false;/* Ring stopped? */
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +3 -3
@@ -384,7 +384,7 @@ __unwind_incomplete_requests(struct intel_engine_cs *engine) prio =rq_prio (rq); pl =i915_sched_lookup_priolist (engine, prio); } -GEM_BUG_ON (RB_EMPTY_ROOT (&engine->sched_engine->queue.rb_root)); +GEM_BUG_ON (i915_sched_engine_is_empty (engine->sched_engine));list_move (&rq->sched.link, pl);set_bit (I915_FENCE_FLAG_PQUEUE , &rq->fence.flags);
@@ -1139,7 +1139,7 @@ static bool needs_timeslice(const struct intel_engine_cs *engine, }/* Otherwise, ELSP[0] is by itself, but may be waiting in the queue */ -if (!RB_EMPTY_ROOT (&engine->sched_engine->queue.rb_root)) { +if (!i915_sched_engine_is_empty (engine->sched_engine)) {ENGINE_TRACE (engine,"timeslice required for queue\n" );return true; }
@@ -2487,7 +2487,7 @@ static void execlists_submit_request(struct i915_request *request) }else {queue_request (engine, request); -GEM_BUG_ON (RB_EMPTY_ROOT (&engine->sched_engine->queue.rb_root)); +GEM_BUG_ON (i915_sched_engine_is_empty (engine->sched_engine));GEM_BUG_ON (list_empty (&request->sched.link));if (submit_queue (engine, request))
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -1
@@ -515,7 +515,7 @@ static void guc_submit_request(struct i915_request *rq)queue_request (engine, rq,rq_prio (rq)); -GEM_BUG_ON (RB_EMPTY_ROOT (&engine->sched_engine->queue.rb_root)); +GEM_BUG_ON (i915_sched_engine_is_empty (engine->sched_engine));GEM_BUG_ON (list_empty (&rq->sched.link));tasklet_hi_schedule (&engine->execlists.tasklet);
drivers/gpu/drm/i915/i915_scheduler.h +6 -0
@@ -66,6 +66,12 @@ i915_sched_engine_put(struct i915_sched_engine *sched_engine)kref_put (&sched_engine->ref, i915_sched_engine_free); } +static inline bool +i915_sched_engine_is_empty (struct i915_sched_engine *sched_engine) +{ +return RB_EMPTY_ROOT (&sched_engine->queue.rb_root); +} + void i915_request_show_with_schedule(struct drm_printer *m, const struct i915_request *rq, const char *prefix,
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/8 drm/i915: Reset sched_engine.no_priolist immediately after dequeue
In reply to Matthew BrostRather than touching schedule state in the generic PM code, reset the priolist allocation when empty in the submission code. Add a wrapper function to do this and update the backends to call it in the correct place.
v3:
(Jason Ekstrand)
Update patch commit message with a better description
--- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 -- drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 ++ drivers/gpu/drm/i915/i915_scheduler.h | 7 +++++++ 4 files changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_pm.c +0 -2
@@ -280,8 +280,6 @@ static int __engine_park(struct intel_wakeref *wf)if (engine->park) engine->park (engine); - engine->sched_engine->no_priolist = false; -/* While gt calls i915_vma_parked(), we have to break the lock cycle */ intel_gt_pm_put_async (engine->gt);return 0 ;
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +1 -0
@@ -1553,6 +1553,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine)* interrupt for secondary ports). */ sched_engine->queue_priority_hint =queue_prio (sched_engine); +i915_sched_engine_reset_on_empty (sched_engine);spin_unlock (&engine->active.lock);/*
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +2 -0
@@ -263,6 +263,8 @@ static void guc_submission_tasklet(struct tasklet_struct *t)__guc_dequeue (engine); +i915_sched_engine_reset_on_empty (engine->sched_engine); +spin_unlock_irqrestore (&engine->active.lock, flags); }
drivers/gpu/drm/i915/i915_scheduler.h +7 -0
@@ -72,6 +72,13 @@ i915_sched_engine_is_empty(struct i915_sched_engine *sched_engine)return RB_EMPTY_ROOT (&sched_engine->queue.rb_root); } +static inline void +i915_sched_engine_reset_on_empty (struct i915_sched_engine *sched_engine) +{ +if (i915_sched_engine_is_empty (sched_engine)) + sched_engine->no_priolist = false; +} + void i915_request_show_with_schedule(struct drm_printer *m, const struct i915_request *rq, const char *prefix,
Signature · 1 line
2.28.0
PATCH 4/8 drm/i915: Move active tracking to i915_sched_engine
In reply to Matthew BrostMove active request tracking and its lock to i915_sched_engine. This lock is also the submission lock so having it in the i915_sched_engine is the correct place.
v3:
(Jason Ekstrand)
Add kernel doc
--- drivers/gpu/drm/i915/gt/intel_engine.h | 2 - drivers/gpu/drm/i915/gt/intel_engine_cs.c | 43 +++----- drivers/gpu/drm/i915/gt/intel_engine_types.h | 6 -- .../drm/i915/gt/intel_execlists_submission.c | 98 ++++++++++--------- .../gpu/drm/i915/gt/intel_ring_submission.c | 12 +-- drivers/gpu/drm/i915/gt/mock_engine.c | 7 +- drivers/gpu/drm/i915/gt/selftest_execlists.c | 4 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 20 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- drivers/gpu/drm/i915/i915_request.c | 32 +++--- drivers/gpu/drm/i915/i915_request.h | 2 +- drivers/gpu/drm/i915/i915_scheduler.c | 30 ++++-- drivers/gpu/drm/i915/i915_scheduler_types.h | 16 +++ 13 files changed, 140 insertions(+), 136 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine.h +0 -2
@@ -257,8 +257,6 @@ intel_engine_find_active_request(struct intel_engine_cs *engine);u32 intel_engine_context_size (struct intel_gt *gt,u8 class); -void intel_engine_init_active (struct intel_engine_cs *engine, -unsigned int subclass);#define ENGINE_PHYSICAL 0#define ENGINE_MOCK 1#define ENGINE_VIRTUAL 2
drivers/gpu/drm/i915/gt/intel_engine_cs.c +11 -32
100 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_engine_types.h +0 -6
@@ -304,12 +304,6 @@ struct intel_engine_cs {struct intel_sseu sseu; -struct { -spinlock_t lock; -struct list_head requests; -struct list_head hold;/* ready requests, but on hold */ - } active; -struct i915_sched_engine *sched_engine;/* keep a request in reserve for a [pm] barrier under oom */
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +50 -48
351 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_ring_submission.c +6 -6
@@ -339,9 +339,9 @@ static void reset_rewind(struct intel_engine_cs *engine, bool stalled)u32 head; rq =NULL ; -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);rcu_read_lock (); -list_for_each_entry (pos, &engine->active.requests, sched.link) { +list_for_each_entry (pos, &engine->sched_engine->requests, sched.link) {if (!__i915_request_is_complete (pos)) { rq = pos;break ;
@@ -396,7 +396,7 @@ static void reset_rewind(struct intel_engine_cs *engine, bool stalled) } engine->legacy.ring->head =intel_ring_wrap (engine->legacy.ring, head); -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }static void reset_finish (struct intel_engine_cs *engine)
@@ -408,16 +408,16 @@ static void reset_cancel(struct intel_engine_cs *engine)struct i915_request *request;unsigned long flags; -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);/* Mark all submitted requests as skipped. */ -list_for_each_entry (request, &engine->active.requests, sched.link) +list_for_each_entry (request, &engine->sched_engine->requests, sched.link)i915_request_put (i915_request_mark_eio (request));intel_engine_signal_breadcrumbs (engine);/* Remaining _unready_ requests will be nop'ed when submitted */ -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }static void i9xx_submit_request (struct i915_request *request)
drivers/gpu/drm/i915/gt/mock_engine.c +3 -4
@@ -253,10 +253,10 @@ static void mock_reset_cancel(struct intel_engine_cs *engine)del_timer_sync (&mock->hw_delay); -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);/* Mark all submitted requests as skipped. */ -list_for_each_entry (rq, &engine->active.requests, sched.link) +list_for_each_entry (rq, &engine->sched_engine->requests, sched.link)i915_request_put (i915_request_mark_eio (rq));intel_engine_signal_breadcrumbs (engine);
@@ -269,7 +269,7 @@ static void mock_reset_cancel(struct intel_engine_cs *engine) }INIT_LIST_HEAD (&mock->hw_queue); -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }static void mock_reset_finish (struct intel_engine_cs *engine)
@@ -350,7 +350,6 @@ int mock_engine_init(struct intel_engine_cs *engine)if (!engine->sched_engine)return -ENOMEM ; -intel_engine_init_active (engine,ENGINE_MOCK );intel_engine_init_execlists (engine);intel_engine_init__pm (engine);intel_engine_init_retire (engine);
drivers/gpu/drm/i915/gt/selftest_execlists.c +2 -2
@@ -4610,9 +4610,9 @@ static int reset_virtual_engine(struct intel_gt *gt,GEM_BUG_ON (execlists_active (&engine->execlists) != rq);/* Fake a preemption event; failed of course */ -spin_lock_irq (&engine->active.lock); +spin_lock_irq (&engine->sched_engine->lock);__unwind_incomplete_requests (engine); -spin_unlock_irq (&engine->active.lock); +spin_unlock_irq (&engine->sched_engine->lock);GEM_BUG_ON (rq->engine != engine);/* Reset the engine while keeping our active request on hold */
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +10 -10
@@ -190,7 +190,7 @@ static void __guc_dequeue(struct intel_engine_cs *engine)bool submit = false;struct rb_node *rb; -lockdep_assert_held (&engine->active.lock); +lockdep_assert_held (&sched_engine->lock);if (last) {if (*++first)
@@ -247,7 +247,7 @@ static void guc_submission_tasklet(struct tasklet_struct *t)struct i915_request **port, *rq;unsigned long flags; -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);for (port = execlists->inflight; (rq = *port); port++) {if (!i915_request_completed (rq))
@@ -265,7 +265,7 @@ static void guc_submission_tasklet(struct tasklet_struct *t)i915_sched_engine_reset_on_empty (engine->sched_engine); -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }static void cs_irq_handler (struct intel_engine_cs *engine,u16 iir)
@@ -322,7 +322,7 @@ static void guc_reset_rewind(struct intel_engine_cs *engine, bool stalled)struct i915_request *rq;unsigned long flags; -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);/* Push back any incomplete requests for replay after the reset. */ rq =execlists_unwind_incomplete_requests (execlists);
@@ -336,7 +336,7 @@ static void guc_reset_rewind(struct intel_engine_cs *engine, bool stalled)guc_reset_state (rq->context, engine, rq->head, stalled); out_unlock: -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }static void guc_reset_cancel (struct intel_engine_cs *engine)
@@ -362,10 +362,10 @@ static void guc_reset_cancel(struct intel_engine_cs *engine)* submission's irq state, we also wish to remind ourselves that * it is irq state.) */ -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&sched_engine->lock, flags);/* Mark all executing requests as skipped. */ -list_for_each_entry (rq, &engine->active.requests, sched.link) { +list_for_each_entry (rq, &sched_engine->requests, sched.link) {i915_request_set_error_once (rq, -EIO );i915_request_mark_complete (rq); }
@@ -390,7 +390,7 @@ static void guc_reset_cancel(struct intel_engine_cs *engine) sched_engine->queue_priority_hint =INT_MIN ; sched_engine->queue =RB_ROOT_CACHED ; -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&sched_engine->lock, flags); }static void guc_reset_finish (struct intel_engine_cs *engine)
@@ -513,7 +513,7 @@ static void guc_submit_request(struct i915_request *rq)unsigned long flags;/* Will be called from irq-context when using foreign fences. */ -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);queue_request (engine, rq,rq_prio (rq));
@@ -522,7 +522,7 @@ static void guc_submit_request(struct i915_request *rq)tasklet_hi_schedule (&engine->execlists.tasklet); -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }static void sanitize_hwsp (struct intel_engine_cs *engine)
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -1436,12 +1436,12 @@ capture_engine(struct intel_engine_cs *engine,if (!ee)return NULL ; -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags); rq =intel_engine_find_active_request (engine);if (rq) capture =intel_engine_coredump_add_request (ee, rq,ATOMIC_MAYFAIL ); -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags);if (!capture) {kfree (ee);return NULL ;
drivers/gpu/drm/i915/i915_request.c +16 -16
@@ -272,11 +272,11 @@ i915_request_active_engine(struct i915_request *rq,* check that we have acquired the lock on the final engine. */ locked =READ_ONCE (rq->engine); -spin_lock_irq (&locked->active.lock); +spin_lock_irq (&locked->sched_engine->lock);while (unlikely (locked != (engine =READ_ONCE (rq->engine)))) { -spin_unlock (&locked->active.lock); +spin_unlock (&locked->sched_engine->lock); locked = engine; -spin_lock (&locked->active.lock); +spin_lock (&locked->sched_engine->lock); }if (i915_request_is_active (rq)) {
@@ -285,7 +285,7 @@ i915_request_active_engine(struct i915_request *rq, ret = true; } -spin_unlock_irq (&locked->active.lock); +spin_unlock_irq (&locked->sched_engine->lock);return ret; }
@@ -302,10 +302,10 @@ static void remove_from_engine(struct i915_request *rq)* check that the rq still belongs to the newly locked engine. */ locked =READ_ONCE (rq->engine); -spin_lock_irq (&locked->active.lock); +spin_lock_irq (&locked->sched_engine->lock);while (unlikely (locked != (engine =READ_ONCE (rq->engine)))) { -spin_unlock (&locked->active.lock); -spin_lock (&engine->active.lock); +spin_unlock (&locked->sched_engine->lock); +spin_lock (&engine->sched_engine->lock); locked = engine; }list_del_init (&rq->sched.link);
@@ -316,7 +316,7 @@ static void remove_from_engine(struct i915_request *rq)/* Prevent further __await_execution() registering a cb, then flush */ set_bit (I915_FENCE_FLAG_ACTIVE , &rq->fence.flags); -spin_unlock_irq (&locked->active.lock); +spin_unlock_irq (&locked->sched_engine->lock);__notify_execute_cb_imm (rq); }
@@ -637,7 +637,7 @@ bool __i915_request_submit(struct i915_request *request)RQ_TRACE (request,"\n" );GEM_BUG_ON (!irqs_disabled ()); -lockdep_assert_held (&engine->active.lock); +lockdep_assert_held (&engine->sched_engine->lock);/* * With the advent of preempt-to-busy, we frequently encounter
@@ -649,7 +649,7 @@ bool __i915_request_submit(struct i915_request *request)* * We must remove the request from the caller's priority queue, * and the caller must only call us when the request is in their -* priority queue, under the active.lock. This ensures that the +* priority queue, under the sched_engine->lock. This ensures that the * request has *not* yet been retired and we can safely move * the request into the engine->active.list where it will be * dropped upon retiring. (Otherwise if resubmit a *retired*
@@ -694,7 +694,7 @@ bool __i915_request_submit(struct i915_request *request) result = true;GEM_BUG_ON (test_bit (I915_FENCE_FLAG_ACTIVE , &request->fence.flags)); -list_move_tail (&request->sched.link, &engine->active.requests); +list_move_tail (&request->sched.link, &engine->sched_engine->requests); active:clear_bit (I915_FENCE_FLAG_PQUEUE , &request->fence.flags);set_bit (I915_FENCE_FLAG_ACTIVE , &request->fence.flags);
@@ -724,11 +724,11 @@ void i915_request_submit(struct i915_request *request)unsigned long flags;/* Will be called from irq-context when using foreign fences. */ -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);__i915_request_submit (request); -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }void __i915_request_unsubmit (struct i915_request *request)
@@ -742,7 +742,7 @@ void __i915_request_unsubmit(struct i915_request *request)RQ_TRACE (request,"\n" );GEM_BUG_ON (!irqs_disabled ()); -lockdep_assert_held (&engine->active.lock); +lockdep_assert_held (&engine->sched_engine->lock);/* * Before we remove this breadcrumb from the signal list, we have
@@ -775,11 +775,11 @@ void i915_request_unsubmit(struct i915_request *request)unsigned long flags;/* Will be called from irq-context when using foreign fences. */ -spin_lock_irqsave (&engine->active.lock, flags); +spin_lock_irqsave (&engine->sched_engine->lock, flags);__i915_request_unsubmit (request); -spin_unlock_irqrestore (&engine->active.lock, flags); +spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }static void __cancel_request (struct i915_request *rq)
drivers/gpu/drm/i915/i915_request.h +1 -1
@@ -613,7 +613,7 @@ i915_request_active_timeline(const struct i915_request *rq)* this submission. */ return rcu_dereference_protected (rq->timeline, -lockdep_is_held (&rq->engine->active.lock)); +lockdep_is_held (&rq->engine->sched_engine->lock)); } static inline u32
drivers/gpu/drm/i915/i915_scheduler.c +23 -7
@@ -68,7 +68,7 @@ i915_sched_lookup_priolist(struct intel_engine_cs *engine, int prio)struct rb_node **parent, *rb;bool first = true; -lockdep_assert_held (&engine->active.lock); +lockdep_assert_held (&engine->sched_engine->lock);assert_priolists (sched_engine);if (unlikely (sched_engine->no_priolist))
@@ -147,9 +147,9 @@ sched_lock_engine(const struct i915_sched_node *node,* check that the rq still belongs to the newly locked engine. */ while (locked != (engine =READ_ONCE (rq->engine))) { -spin_unlock (&locked->active.lock); +spin_unlock (&locked->sched_engine->lock);memset (cache,0 ,sizeof (*cache)); -spin_lock (&engine->active.lock); +spin_lock (&engine->sched_engine->lock); locked = engine; }
@@ -296,7 +296,7 @@ static void __i915_schedule(struct i915_sched_node *node,memset (&cache,0 ,sizeof (cache)); engine =node_to_request (node)->engine; -spin_lock (&engine->active.lock); +spin_lock (&engine->sched_engine->lock);/* Fifo and depth-first replacement ensure our deps execute before us */ engine =sched_lock_engine (node, engine, &cache);
@@ -305,7 +305,7 @@ static void __i915_schedule(struct i915_sched_node *node, node = dep->signaler; engine =sched_lock_engine (node, engine, &cache); -lockdep_assert_held (&engine->active.lock); +lockdep_assert_held (&engine->sched_engine->lock);/* Recheck after acquiring the engine->timeline.lock */ if (prio <= node->attr.priority ||node_signaled (node))
@@ -338,7 +338,7 @@ static void __i915_schedule(struct i915_sched_node *node,kick_submission (engine,node_to_request (node), prio); } -spin_unlock (&engine->active.lock); +spin_unlock (&engine->sched_engine->lock); }void i915_schedule (struct i915_request *rq,const struct i915_sched_attr *attr)
@@ -511,7 +511,23 @@ i915_sched_engine_create(unsigned int subclass) sched_engine->queue =RB_ROOT_CACHED ; sched_engine->queue_priority_hint =INT_MIN ; -/* subclass is used in a follow up patch */ +INIT_LIST_HEAD (&sched_engine->requests); +INIT_LIST_HEAD (&sched_engine->hold); + +spin_lock_init (&sched_engine->lock); +lockdep_set_subclass (&sched_engine->lock, subclass); + +/* +* Due to an interesting quirk in lockdep's internal debug tracking, +* after setting a subclass we must ensure the lock is used. Otherwise, +* nr_unused_locks is incremented once too often. +*/ +#ifdef CONFIG_DEBUG_LOCK_ALLOC +local_irq_disable (); +lock_map_acquire (&sched_engine->lock.dep_map); +lock_map_release (&sched_engine->lock.dep_map); +local_irq_enable (); +#endif return sched_engine; }
drivers/gpu/drm/i915/i915_scheduler_types.h +16 -0
@@ -108,6 +108,22 @@ struct i915_sched_engine {*/ struct kref ref; +/** +* @lock: protects requests in priority lists, requests, hold and +* tasklet while running +*/ +spinlock_t lock; + +/** +* @requests: list of requests inflight on this schedule engine +*/ +struct list_head requests; + +/** +* @hold: list of ready requests, but on hold +*/ +struct list_head hold; +/** * @default_priolist: priority list for I915_PRIORITY_NORMAL */
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/8 drm/i915: Move engine->schedule to i915_sched_engine
In reply to Matthew BrostThe schedule function should be in the schedule object.
v3:
(Jason Ekstrand)
Add kernel doc
--- drivers/gpu/drm/i915/gem/i915_gem_wait.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 3 --- drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_engine_types.h | 8 -------- drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- .../gpu/drm/i915/gt/intel_execlists_submission.c | 4 ++-- drivers/gpu/drm/i915/gt/selftest_execlists.c | 16 ++++++++-------- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 4 ++-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- drivers/gpu/drm/i915/i915_request.c | 10 +++++----- drivers/gpu/drm/i915/i915_scheduler_types.h | 10 ++++++++++ 11 files changed, 33 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_wait.c +2 -2
@@ -104,8 +104,8 @@ static void fence_set_priority(struct dma_fence *fence, engine = rq->engine;rcu_read_lock ();/* RCU serialisation for set-wedged protection */ -if (engine->schedule) - engine->schedule (rq, attr); +if (engine->sched_engine->schedule) + engine->sched_engine->schedule (rq, attr);rcu_read_unlock (); }
drivers/gpu/drm/i915/gt/intel_engine_cs.c +0 -3
@@ -328,9 +328,6 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)if (engine->context_size)DRIVER_CAPS (i915)->has_logical_contexts = true; -/* Nothing to do here, execute in order of dependencies */ - engine->schedule =NULL ; -ewma__engine_latency_init (&engine->latency);seqcount_init (&engine->stats.lock);
drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c +2 -2
@@ -121,7 +121,7 @@ static void heartbeat(struct work_struct *wrk)* but all other contexts, including the kernel * context are stuck waiting for the signal. */ - }else if (engine->schedule && + }else if (engine->sched_engine->schedule && rq->sched.attr.priority <I915_PRIORITY_BARRIER ) {/* * Gradually raise the priority of the heartbeat to
@@ -136,7 +136,7 @@ static void heartbeat(struct work_struct *wrk) attr.priority =I915_PRIORITY_BARRIER ;local_bh_disable (); - engine->schedule (rq, &attr); + engine->sched_engine->schedule (rq, &attr);local_bh_enable (); }else {if (IS_ENABLED (CONFIG_DRM_I915_DEBUG_GEM ))
drivers/gpu/drm/i915/gt/intel_engine_types.h +0 -8
@@ -428,14 +428,6 @@ struct intel_engine_cs {void (*bond_execute)(struct i915_request *rq,struct dma_fence *signal); -/* -* Call when the priority on a request has changed and it and its -* dependencies may need rescheduling. Note the request itself may -* not be ready to run! -*/ -void (*schedule)(struct i915_request *request, -const struct i915_sched_attr *attr); -void (*release)(struct intel_engine_cs *engine);struct intel_engine_execlists execlists;
drivers/gpu/drm/i915/gt/intel_engine_user.c +1 -1
@@ -108,7 +108,7 @@ static void set_scheduler_caps(struct drm_i915_private *i915)for_each_uabi_engine (engine, i915) {/* all engines must agree! */ int i; -if (engine->schedule) +if (engine->sched_engine->schedule) enabled |= (I915_SCHEDULER_CAP_ENABLED |I915_SCHEDULER_CAP_PRIORITY );else
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +2 -2
@@ -3119,7 +3119,7 @@ static bool can_preempt(struct intel_engine_cs *engine)static void execlists_set_default_submission (struct intel_engine_cs *engine) { engine->submit_request = execlists_submit_request; - engine->schedule = i915_schedule; + engine->sched_engine->schedule = i915_schedule; engine->execlists.tasklet.callback = execlists_submission_tasklet; }
@@ -3701,7 +3701,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, ve->base.cops = &virtual_context_ops; ve->base.request_alloc = execlists_request_alloc; - ve->base.schedule = i915_schedule; + ve->base.sched_engine->schedule = i915_schedule; ve->base.submit_request = virtual_submit_request; ve->base.bond_execute = virtual_bond_execute;
drivers/gpu/drm/i915/gt/selftest_execlists.c +8 -8
@@ -273,7 +273,7 @@ static int live_unlite_restore(struct intel_gt *gt, int prio) };/* Alternatively preempt the spinner with ce[1] */ - engine->schedule (rq[1 ], &attr); + engine->sched_engine->schedule (rq[1 ], &attr); }/* And switch back to ce[0] for good measure */
@@ -917,7 +917,7 @@ release_queue(struct intel_engine_cs *engine,i915_request_add (rq);local_bh_disable (); - engine->schedule (rq, &attr); + engine->sched_engine->schedule (rq, &attr);local_bh_enable ();/* kick tasklet */ i915_request_put (rq);
@@ -1342,7 +1342,7 @@ static int live_timeslice_queue(void *arg) err =PTR_ERR (rq); goto err_heartbeat; } - engine->schedule (rq, &attr); + engine->sched_engine->schedule (rq, &attr); err =wait_for_submit (engine, rq,HZ /2 );if (err) { pr_err("%s: Timed out trying to submit semaphores\n",
@@ -1884,7 +1884,7 @@ static int live_late_preempt(void *arg) } attr.priority =I915_PRIORITY_MAX ; - engine->schedule (rq, &attr); + engine->sched_engine->schedule (rq, &attr);if (!igt_wait_for_spinner (&spin_hi, rq)) {pr_err ("High priority context failed to preempt the low priority context\n" );
@@ -2497,7 +2497,7 @@ static int live_suppress_self_preempt(void *arg)i915_request_add (rq_b);GEM_BUG_ON (i915_request_completed (rq_a)); - engine->schedule (rq_a, &attr); + engine->sched_engine->schedule (rq_a, &attr);igt_spinner_end (&a.spin);if (!igt_wait_for_spinner (&b.spin, rq_b)) {
@@ -2629,7 +2629,7 @@ static int live_chain_preempt(void *arg)i915_request_get (rq);i915_request_add (rq); - engine->schedule (rq, &attr); + engine->sched_engine->schedule (rq, &attr);igt_spinner_end (&hi.spin);if (i915_request_wait (rq,0 ,HZ /5 ) <0 ) {
@@ -2988,7 +2988,7 @@ static int live_preempt_gang(void *arg)break ;/* Submit each spinner at increasing priority */ - engine->schedule (rq, &attr); + engine->sched_engine->schedule (rq, &attr); }while (prio <=I915_PRIORITY_MAX && !__igt_timeout (end_time,NULL )); pr_debug("%s: Preempt chain of %d requests\n",
@@ -3236,7 +3236,7 @@ static int preempt_user(struct intel_engine_cs *engine,i915_request_get (rq);i915_request_add (rq); - engine->schedule (rq, &attr); + engine->sched_engine->schedule (rq, &attr);if (i915_request_wait (rq,0 ,HZ /2 ) <0 ) err = -ETIME ;
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +2 -2
@@ -858,12 +858,12 @@ static int active_engine(void *data) rq[idx] =i915_request_get (new);i915_request_add (new); -if (engine->schedule && arg->flags &TEST_PRIORITY ) { +if (engine->sched_engine->schedule && arg->flags &TEST_PRIORITY ) {struct i915_sched_attr attr = { .priority =i915_prandom_u32_max_state (512 , &prng), }; - engine->schedule (rq[idx], &attr); + engine->sched_engine->schedule (rq[idx], &attr); } err =active_request_put (old);
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -1
@@ -615,7 +615,7 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine) engine->cops = &guc_context_ops; engine->request_alloc = guc_request_alloc; - engine->schedule = i915_schedule; + engine->sched_engine->schedule = i915_schedule; engine->reset.prepare = guc_reset_prepare; engine->reset.rewind = guc_reset_rewind;
drivers/gpu/drm/i915/i915_request.c +5 -5
@@ -1343,7 +1343,7 @@ __i915_request_await_execution(struct i915_request *to, }/* Couple the dependency tree for PI on this exposed to->fence */ -if (to->engine->schedule) { +if (to->engine->sched_engine->schedule) { err =i915_sched_node_add_dependency (&to->sched, &from->sched,I915_DEPENDENCY_WEAK );
@@ -1484,7 +1484,7 @@ i915_request_await_request(struct i915_request *to, struct i915_request *from)return 0 ; } -if (to->engine->schedule) { +if (to->engine->sched_engine->schedule) { ret =i915_sched_node_add_dependency (&to->sched, &from->sched,I915_DEPENDENCY_EXTERNAL );
@@ -1671,7 +1671,7 @@ __i915_request_add_to_timeline(struct i915_request *rq)__i915_sw_fence_await_dma_fence (&rq->submit, &prev->fence, &rq->dmaq); -if (rq->engine->schedule) +if (rq->engine->sched_engine->schedule) __i915_sched_node_add_dependency(&rq->sched, &prev->sched, &rq->dep,
@@ -1743,8 +1743,8 @@ void __i915_request_queue(struct i915_request *rq,* decide whether to preempt the entire chain so that it is ready to * run at the earliest possible convenience. */ -if (attr && rq->engine->schedule) - rq->engine->schedule (rq, attr); +if (attr && rq->engine->sched_engine->schedule) + rq->engine->sched_engine->schedule (rq, attr);local_bh_disable ();__i915_request_queue_bh (rq);
drivers/gpu/drm/i915/i915_scheduler_types.h +10 -0
@@ -152,6 +152,16 @@ struct i915_sched_engine {* @no_priolist: priority lists disabled */ bool no_priolist; + +/** +* @schedule: adjust priority of request +* +* Call when the priority on a request has changed and it and its +* dependencies may need rescheduling. Note the request itself may +* not be ready to run! +*/ +void (*schedule)(struct i915_request *request, + const struct i915_sched_attr *attr); };#endif /* _I915_SCHEDULER_TYPES_H_ */
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/8 drm/i915: Add kick_backend function to i915_sched_engine
In reply to Matthew BrostNot all back-ends require a kick after a scheduling update, so make the kick a call-back function that the back-end can opt-in to. Also move the current kick function from the scheduler to the execlists file as it is specific to that back-end.
--- .../drm/i915/gt/intel_execlists_submission.c | 52 ++++++++++++++++ drivers/gpu/drm/i915/i915_scheduler.c | 62 +------------------ drivers/gpu/drm/i915/i915_scheduler_types.h | 6 ++ 3 files changed, 60 insertions(+), 60 deletions(-)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +52 -0
@@ -3116,10 +3116,61 @@ static bool can_preempt(struct intel_engine_cs *engine)return engine->class !=RENDER_CLASS ; } +static void kick_execlists (const struct i915_request *rq,int prio) +{ +struct intel_engine_cs *engine = rq->engine; +struct i915_sched_engine *sched_engine = engine->sched_engine; +const struct i915_request *inflight; + +/* +* We only need to kick the tasklet once for the high priority +* new context we add into the queue. +*/ +if (prio <= sched_engine->queue_priority_hint) +return ; + +rcu_read_lock (); + +/* Nothing currently active? We're overdue for a submission! */ + inflight =execlists_active (&engine->execlists); +if (!inflight) + goto unlock; + +/* +* If we are already the currently executing context, don't +* bother evaluating if we should preempt ourselves. +*/ +if (inflight->context == rq->context) + goto unlock; + +ENGINE_TRACE (engine, +"bumping queue-priority-hint:%d for rq:%llx:%lld, inflight:%llx:%lld prio %d\n" , + prio, + rq->fence.context, rq->fence.seqno, + inflight->fence.context, inflight->fence.seqno, + inflight->sched.attr.priority); + + sched_engine->queue_priority_hint = prio; + +/* +* Allow preemption of low -> normal -> high, but we do +* not allow low priority tasks to preempt other low priority +* tasks under the impression that latency for low priority +* tasks does not matter (as much as background throughput), +* so kiss. +*/ +if (prio >=max (I915_PRIORITY_NORMAL ,rq_prio (inflight))) +tasklet_hi_schedule (&engine->execlists.tasklet); + +unlock: +rcu_read_unlock (); +} +static void execlists_set_default_submission (struct intel_engine_cs *engine) { engine->submit_request = execlists_submit_request; engine->sched_engine->schedule = i915_schedule; + engine->sched_engine->kick_backend = kick_execlists; engine->execlists.tasklet.callback = execlists_submission_tasklet; }
@@ -3702,6 +3753,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, ve->base.request_alloc = execlists_request_alloc; ve->base.sched_engine->schedule = i915_schedule; + ve->base.sched_engine->kick_backend = kick_execlists; ve->base.submit_request = virtual_submit_request; ve->base.bond_execute = virtual_bond_execute;
drivers/gpu/drm/i915/i915_scheduler.c +2 -60
74 lines not on this page · raw message
drivers/gpu/drm/i915/i915_scheduler_types.h +6 -0
@@ -153,6 +153,12 @@ struct i915_sched_engine {*/ bool no_priolist; +/** +* @kick_backend: kick backend after a request's priority has changed +*/ +void (*kick_backend)(const struct i915_request *rq, +int prio); +/** * @schedule: adjust priority of request *
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/8 drm/i915: Update i915_scheduler to operate on i915_sched_engine
In reply to Matthew BrostRather passing around an intel_engine_cs in the scheduling code, pass around a i915_sched_engine.
v3:
(Jason Ekstrand)
Add READ_ONCE around rq->engine in lock_sched_engine
--- .../drm/i915/gt/intel_execlists_submission.c | 11 +++-- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- drivers/gpu/drm/i915/i915_scheduler.c | 46 +++++++++---------- drivers/gpu/drm/i915/i915_scheduler.h | 2 +- 4 files changed, 32 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +7 -4
@@ -382,7 +382,8 @@ __unwind_incomplete_requests(struct intel_engine_cs *engine)GEM_BUG_ON (rq_prio (rq) ==I915_PRIORITY_INVALID );if (rq_prio (rq) != prio) { prio =rq_prio (rq); - pl =i915_sched_lookup_priolist (engine, prio); + pl =i915_sched_lookup_priolist (engine->sched_engine, + prio); }GEM_BUG_ON (i915_sched_engine_is_empty (engine->sched_engine));
@@ -1096,7 +1097,8 @@ static void defer_active(struct intel_engine_cs *engine)if (!rq)return ; -defer_request (rq,i915_sched_lookup_priolist (engine,rq_prio (rq))); +defer_request (rq,i915_sched_lookup_priolist (engine->sched_engine, +rq_prio (rq))); } static bool
@@ -2083,7 +2085,7 @@ static void __execlists_unhold(struct i915_request *rq)i915_request_clear_hold (rq);list_move_tail (&rq->sched.link, -i915_sched_lookup_priolist (rq->engine, +i915_sched_lookup_priolist (rq->engine->sched_engine,rq_prio (rq)));set_bit (I915_FENCE_FLAG_PQUEUE , &rq->fence.flags);
@@ -2452,7 +2454,8 @@ static void queue_request(struct intel_engine_cs *engine, {GEM_BUG_ON (!list_empty (&rq->sched.link));list_add_tail (&rq->sched.link, -i915_sched_lookup_priolist (engine,rq_prio (rq))); +i915_sched_lookup_priolist (engine->sched_engine, +rq_prio (rq)));set_bit (I915_FENCE_FLAG_PQUEUE , &rq->fence.flags); }
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 -1
@@ -503,7 +503,7 @@ static inline void queue_request(struct intel_engine_cs *engine, {GEM_BUG_ON (!list_empty (&rq->sched.link));list_add_tail (&rq->sched.link, -i915_sched_lookup_priolist (engine, prio)); +i915_sched_lookup_priolist (engine->sched_engine, prio));set_bit (I915_FENCE_FLAG_PQUEUE , &rq->fence.flags); }
drivers/gpu/drm/i915/i915_scheduler.c +23 -23
111 lines not on this page · raw message
drivers/gpu/drm/i915/i915_scheduler.h +1 -1
@@ -39,7 +39,7 @@ void i915_schedule(struct i915_request *request, const struct i915_sched_attr *attr);struct list_head * -i915_sched_lookup_priolist (struct intel_engine_cs *engine,int prio); +i915_sched_lookup_priolist (struct i915_sched_engine *sched_engine,int prio);void __i915_priolist_free (struct i915_priolist *p);static inline void i915_priolist_free (struct i915_priolist *p)
Signature · 6 lines
2.28.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/8 drm/i915: Move submission tasklet to i915_sched_engine
In reply to Matthew BrostThe submission tasklet operates on i915_sched_engine, thus it is the correct place for it.
v3:
(Jason Ekstrand)
Change sched_engine->engine to a void* private data pointer Add kernel doc
v4:
(Daniele)
Update private_data comment
Set queue_priority_hint in kick_execlists
v5:
(CI)
Rebase and fix build error
--- drivers/gpu/drm/i915/gt/intel_engine.h | 14 ---- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 12 +-- drivers/gpu/drm/i915/gt/intel_engine_types.h | 5 -- .../drm/i915/gt/intel_execlists_submission.c | 84 ++++++++++--------- drivers/gpu/drm/i915/gt/mock_engine.c | 1 + drivers/gpu/drm/i915/gt/selftest_execlists.c | 14 ++-- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 6 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 25 +++--- drivers/gpu/drm/i915/i915_scheduler.c | 1 + drivers/gpu/drm/i915/i915_scheduler.h | 14 ++++ drivers/gpu/drm/i915/i915_scheduler_types.h | 10 +++ 13 files changed, 100 insertions(+), 90 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine.h +0 -14
@@ -123,20 +123,6 @@ execlists_active(const struct intel_engine_execlists *execlists)return active; } -static inline void -execlists_active_lock_bh (struct intel_engine_execlists *execlists) -{ -local_bh_disable ();/* prevent local softirq and lock recursion */ -tasklet_lock (&execlists->tasklet); -} - -static inline void -execlists_active_unlock_bh (struct intel_engine_execlists *execlists) -{ -tasklet_unlock (&execlists->tasklet); -local_bh_enable ();/* restore softirq, and kick ksoftirqd! */ -} -struct i915_request *execlists_unwind_incomplete_requests (struct intel_engine_execlists *execlists);
drivers/gpu/drm/i915/gt/intel_engine_cs.c +6 -6
@@ -713,6 +713,7 @@ static int engine_setup_common(struct intel_engine_cs *engine) err = -ENOMEM ; goto err_sched_engine; } + engine->sched_engine->private_data = engine; err =intel_engine_init_cmd_parser (engine);if (err)
@@ -937,7 +938,6 @@ int intel_engines_init(struct intel_gt *gt)void intel_engine_cleanup_common (struct intel_engine_cs *engine) {GEM_BUG_ON (!list_empty (&engine->sched_engine->requests)); -tasklet_kill (&engine->execlists.tasklet);/* flush the callback */ i915_sched_engine_put (engine->sched_engine);intel_breadcrumbs_free (engine->breadcrumbs);
@@ -1223,7 +1223,7 @@ static bool ring_is_idle(struct intel_engine_cs *engine)void __intel_engine_flush_submission (struct intel_engine_cs *engine,bool sync) { -struct tasklet_struct *t = &engine->execlists.tasklet; +struct tasklet_struct *t = &engine->sched_engine->tasklet;if (!t->callback)return ;
@@ -1484,8 +1484,8 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,drm_printf (m,"\tExeclist tasklet queued? %s (%s), preempt? %s, timeslice? %s\n" ,yesno (test_bit (TASKLET_STATE_SCHED , - &engine->execlists.tasklet.state)), -enableddisabled (!atomic_read (&engine->execlists.tasklet.count)), + &engine->sched_engine->tasklet.state)), +enableddisabled (!atomic_read (&engine->sched_engine->tasklet.count)),repr_timer (&engine->execlists.preempt),repr_timer (&engine->execlists.timer));
@@ -1509,7 +1509,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine, idx, hws[idx * 2], hws[idx * 2 + 1]); } -execlists_active_lock_bh (execlists); +i915_sched_engine_active_lock_bh (engine->sched_engine);rcu_read_lock ();for (port = execlists->active; (rq = *port); port++) {char hdr[160 ];
@@ -1540,7 +1540,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,i915_request_show (m, rq, hdr,0 ); }rcu_read_unlock (); -execlists_active_unlock_bh (execlists); +i915_sched_engine_active_unlock_bh (engine->sched_engine); }else if (GRAPHICS_VER (dev_priv) >6 ) {drm_printf (m,"\tPP_DIR_BASE: 0x%08x\n" ,ENGINE_READ (engine,RING_PP_DIR_BASE ));
drivers/gpu/drm/i915/gt/intel_engine_types.h +0 -5
@@ -138,11 +138,6 @@ struct st_preempt_hang {* driver and the hardware state for execlist mode of submission. */ struct intel_engine_execlists { -/** -* @tasklet: softirq tasklet for bottom handler -*/ -struct tasklet_struct tasklet; -/** * @timer: kick the current context if its timeslice expires */
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +45 -39
263 lines not on this page · raw message
drivers/gpu/drm/i915/gt/mock_engine.c +1 -0
@@ -349,6 +349,7 @@ int mock_engine_init(struct intel_engine_cs *engine) engine->sched_engine =i915_sched_engine_create (ENGINE_MOCK );if (!engine->sched_engine)return -ENOMEM ; + engine->sched_engine->private_data = engine;intel_engine_init_execlists (engine);intel_engine_init__pm (engine);
drivers/gpu/drm/i915/gt/selftest_execlists.c +7 -7
@@ -43,7 +43,7 @@ static int wait_for_submit(struct intel_engine_cs *engine, unsigned long timeout) {/* Ignore our own attempts to suppress excess tasklets */ -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); timeout += jiffies; do {
@@ -553,13 +553,13 @@ static int live_pin_rewind(void *arg)static int engine_lock_reset_tasklet (struct intel_engine_cs *engine) { -tasklet_disable (&engine->execlists.tasklet); +tasklet_disable (&engine->sched_engine->tasklet);local_bh_disable ();if (test_and_set_bit (I915_RESET_ENGINE + engine->id, &engine->gt->reset.flags)) {local_bh_enable (); -tasklet_enable (&engine->execlists.tasklet); +tasklet_enable (&engine->sched_engine->tasklet);intel_gt_set_wedged (engine->gt);return -EBUSY ;
@@ -574,7 +574,7 @@ static void engine_unlock_reset_tasklet(struct intel_engine_cs *engine) &engine->gt->reset.flags);local_bh_enable (); -tasklet_enable (&engine->execlists.tasklet); +tasklet_enable (&engine->sched_engine->tasklet); }static int live_hold_reset (void *arg)
@@ -628,7 +628,7 @@ static int live_hold_reset(void *arg)if (err) goto out; - engine->execlists.tasklet.callback (&engine->execlists.tasklet); + engine->sched_engine->tasklet.callback (&engine->sched_engine->tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);i915_request_get (rq);
@@ -1200,7 +1200,7 @@ static int live_timeslice_rewind(void *arg)while (i915_request_is_active (rq[A2 ])) {/* semaphore yield! */ /* Wait for the timeslice to kick in */ del_timer (&engine->execlists.timer); -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet);intel_engine_flush_submission (engine); }/* -> ELSP[] = { { A:rq1 }, { B:rq1 } } */
@@ -4606,7 +4606,7 @@ static int reset_virtual_engine(struct intel_gt *gt,if (err) goto out_heartbeat; - engine->execlists.tasklet.callback (&engine->execlists.tasklet); + engine->sched_engine->tasklet.callback (&engine->sched_engine->tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);/* Fake a preemption event; failed of course */
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1 -1
@@ -1702,7 +1702,7 @@ static int __igt_atomic_reset_engine(struct intel_engine_cs *engine,const struct igt_atomic_section *p, const char *mode) { - struct tasklet_struct * const t = &engine->execlists.tasklet; + struct tasklet_struct * const t = &engine->sched_engine->tasklet;int err; GEM_TRACE("i915_reset_engine(%s:%s) under %s\n",
drivers/gpu/drm/i915/gt/selftest_lrc.c +3 -3
@@ -49,7 +49,7 @@ static int wait_for_submit(struct intel_engine_cs *engine, unsigned long timeout) {/* Ignore our own attempts to suppress excess tasklets */ -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); timeout += jiffies; do {
@@ -1613,12 +1613,12 @@ static void garbage_reset(struct intel_engine_cs *engine,local_bh_disable ();if (!test_and_set_bit (bit, lock)) { -tasklet_disable (&engine->execlists.tasklet); +tasklet_disable (&engine->sched_engine->tasklet);if (!rq->fence.error)__intel_engine_reset_bh (engine,NULL ); -tasklet_enable (&engine->execlists.tasklet); +tasklet_enable (&engine->sched_engine->tasklet);clear_and_wake_up_bit (bit, lock); }local_bh_enable ();
drivers/gpu/drm/i915/gt/selftest_reset.c +1 -1
@@ -321,7 +321,7 @@ static int igt_atomic_engine_reset(void *arg) goto out_unlock;for_each_engine (engine, gt, id) { -struct tasklet_struct *t = &engine->execlists.tasklet; +struct tasklet_struct *t = &engine->sched_engine->tasklet;if (t->func)tasklet_disable (t);
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +11 -14
@@ -241,8 +241,9 @@ static void __guc_dequeue(struct intel_engine_cs *engine)static void guc_submission_tasklet (struct tasklet_struct *t) { -struct intel_engine_cs *const engine = -from_tasklet (engine, t, execlists.tasklet); +struct i915_sched_engine *sched_engine = +from_tasklet (sched_engine, t, tasklet); +struct intel_engine_cs *const engine = sched_engine->private_data;struct intel_engine_execlists *const execlists = &engine->execlists;struct i915_request **port, *rq;unsigned long flags;
@@ -272,14 +273,12 @@ static void cs_irq_handler(struct intel_engine_cs *engine, u16 iir) {if (iir >_RENDER_USER_INTERRUPT ) {intel_engine_signal_breadcrumbs (engine); -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); } }static void guc_reset_prepare (struct intel_engine_cs *engine) { -struct intel_engine_execlists *const execlists = &engine->execlists; -ENGINE_TRACE (engine,"\n" );/*
@@ -291,7 +290,7 @@ static void guc_reset_prepare(struct intel_engine_cs *engine)* Turning off the execlists->tasklet until the reset is over * prevents the race. */ -__tasklet_disable_sync_once (&execlists->tasklet); +__tasklet_disable_sync_once (&engine->sched_engine->tasklet); } static void guc_reset_state(struct intel_context *ce,
@@ -395,14 +394,12 @@ static void guc_reset_cancel(struct intel_engine_cs *engine)static void guc_reset_finish (struct intel_engine_cs *engine) { -struct intel_engine_execlists *const execlists = &engine->execlists; - -if (__tasklet_enable (&execlists->tasklet)) +if (__tasklet_enable (&engine->sched_engine->tasklet))/* And kick in case we missed a new request submission. */ -tasklet_hi_schedule (&execlists->tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet);ENGINE_TRACE (engine,"depth->%d\n" , -atomic_read (&execlists->tasklet.count)); +atomic_read (&engine->sched_engine->tasklet.count)); }/*
@@ -520,7 +517,7 @@ static void guc_submit_request(struct i915_request *rq)GEM_BUG_ON (i915_sched_engine_is_empty (engine->sched_engine));GEM_BUG_ON (list_empty (&rq->sched.link)); -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet);spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }
@@ -600,7 +597,7 @@ static void guc_release(struct intel_engine_cs *engine) { engine->sanitize =NULL ;/* no longer in control, nothing to sanitize */ -tasklet_kill (&engine->execlists.tasklet); +tasklet_kill (&engine->sched_engine->tasklet);intel_engine_cleanup_common (engine);lrc_fini_wa_ctx (engine);
@@ -679,7 +676,7 @@ int intel_guc_submission_setup(struct intel_engine_cs *engine)*/ GEM_BUG_ON (GRAPHICS_VER (i915) <11 ); -tasklet_setup (&engine->execlists.tasklet, guc_submission_tasklet); +tasklet_setup (&engine->sched_engine->tasklet, guc_submission_tasklet);guc_default_vfuncs (engine);guc_default_irqs (engine);
drivers/gpu/drm/i915/i915_scheduler.c +1 -0
@@ -436,6 +436,7 @@ void i915_sched_engine_free(struct kref *kref)struct i915_sched_engine *sched_engine =container_of (kref,typeof (*sched_engine), ref); +tasklet_kill (&sched_engine->tasklet);/* flush the callback */ kfree (sched_engine); }
drivers/gpu/drm/i915/i915_scheduler.h +14 -0
@@ -79,6 +79,20 @@ i915_sched_engine_reset_on_empty(struct i915_sched_engine *sched_engine) sched_engine->no_priolist = false; } +static inline void +i915_sched_engine_active_lock_bh (struct i915_sched_engine *sched_engine) +{ +local_bh_disable ();/* prevent local softirq and lock recursion */ +tasklet_lock (&sched_engine->tasklet); +} + +static inline void +i915_sched_engine_active_unlock_bh (struct i915_sched_engine *sched_engine) +{ +tasklet_unlock (&sched_engine->tasklet); +local_bh_enable ();/* restore softirq, and kick ksoftirqd! */ +} + void i915_request_show_with_schedule(struct drm_printer *m, const struct i915_request *rq, const char *prefix,
drivers/gpu/drm/i915/i915_scheduler_types.h +10 -0
@@ -124,6 +124,11 @@ struct i915_sched_engine {*/ struct list_head hold; +/** +* @tasklet: softirq tasklet for submission +*/ +struct tasklet_struct tasklet; +/** * @default_priolist: priority list for I915_PRIORITY_NORMAL */
@@ -153,6 +158,11 @@ struct i915_sched_engine {*/ bool no_priolist; +/** +* @private_data: private data of the submission backend +*/ +void *private_data; +/** * @kick_backend: kick backend after a request's priority has changed */
Signature · 1 line
2.28.0
Re: [PATCH 8/8] drm/i915: Move submission tasklet to i915_sched_engine
Quoted 15 lines · Matthew Brost
The submission tasklet operates on
i915_sched_engine, thus it is the correct place for it.v3:
(Jason Ekstrand)
Changesched_engine->engineto a void* private data pointer Add kernel doc
v4:
(Daniele)
Updateprivate_datacomment
Setqueue_priority_hintinkick_execlists
v5:
(CI)
Rebase and fix build error
Quoted 1 line
Signed-off-by Matthew Brost <[email protected]>
Daniele
Quoted 680 lines
--- drivers/gpu/drm/i915/gt/intel_engine.h | 14 ---- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 12 +-- drivers/gpu/drm/i915/gt/intel_engine_types.h | 5 -- .../drm/i915/gt/intel_execlists_submission.c | 84 ++++++++++--------- drivers/gpu/drm/i915/gt/mock_engine.c | 1 + drivers/gpu/drm/i915/gt/selftest_execlists.c | 14 ++-- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 6 +- drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 25 +++--- drivers/gpu/drm/i915/i915_scheduler.c | 1 + drivers/gpu/drm/i915/i915_scheduler.h | 14 ++++ drivers/gpu/drm/i915/i915_scheduler_types.h | 10 +++ 13 files changed, 100 insertions(+), 90 deletions(-)drivers/gpu/drm/i915/gt/intel_engine.h +0
-14@@ -123,20 +123,6 @@ execlists_active(const struct intel_engine_execlists *execlists)return active; } -static inline void -execlists_active_lock_bh (struct intel_engine_execlists *execlists) -{ -local_bh_disable ();/* prevent local softirq and lock recursion */ -tasklet_lock (&execlists->tasklet); -} - -static inline void -execlists_active_unlock_bh (struct intel_engine_execlists *execlists) -{ -tasklet_unlock (&execlists->tasklet); -local_bh_enable ();/* restore softirq, and kick ksoftirqd! */ -} -struct i915_request *execlists_unwind_incomplete_requests (struct intel_engine_execlists *execlists);drivers/gpu/drm/i915/gt/intel_engine_cs.c +6
-6@@ -713,6 +713,7 @@ static int engine_setup_common(struct intel_engine_cs *engine) err = -ENOMEM ; goto err_sched_engine; } + engine->sched_engine->private_data = engine; err =intel_engine_init_cmd_parser (engine);if (err)@@ -937,7 +938,6 @@ int intel_engines_init(struct intel_gt *gt)void intel_engine_cleanup_common (struct intel_engine_cs *engine) {GEM_BUG_ON (!list_empty (&engine->sched_engine->requests)); -tasklet_kill (&engine->execlists.tasklet);/* flush the callback */ i915_sched_engine_put (engine->sched_engine);intel_breadcrumbs_free (engine->breadcrumbs);@@ -1223,7 +1223,7 @@ static bool ring_is_idle(struct intel_engine_cs *engine)void __intel_engine_flush_submission (struct intel_engine_cs *engine,bool sync) { -struct tasklet_struct *t = &engine->execlists.tasklet; +struct tasklet_struct *t = &engine->sched_engine->tasklet;if (!t->callback)return ;@@ -1484,8 +1484,8 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,drm_printf (m,"\tExeclist tasklet queued? %s (%s), preempt? %s, timeslice? %s\n" ,yesno (test_bit (TASKLET_STATE_SCHED , - &engine->execlists.tasklet.state)), -enableddisabled (!atomic_read (&engine->execlists.tasklet.count)), + &engine->sched_engine->tasklet.state)), +enableddisabled (!atomic_read (&engine->sched_engine->tasklet.count)),repr_timer (&engine->execlists.preempt),repr_timer (&engine->execlists.timer));@@ -1509,7 +1509,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine, idx, hws[idx * 2], hws[idx * 2 + 1]); } -execlists_active_lock_bh (execlists); +i915_sched_engine_active_lock_bh (engine->sched_engine);rcu_read_lock ();for (port = execlists->active; (rq = *port); port++) {char hdr[160 ];@@ -1540,7 +1540,7 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,i915_request_show (m, rq, hdr,0 ); }rcu_read_unlock (); -execlists_active_unlock_bh (execlists); +i915_sched_engine_active_unlock_bh (engine->sched_engine); }else if (GRAPHICS_VER (dev_priv) >6 ) {drm_printf (m,"\tPP_DIR_BASE: 0x%08x\n" ,ENGINE_READ (engine,RING_PP_DIR_BASE ));drivers/gpu/drm/i915/gt/intel_engine_types.h +0
-5@@ -138,11 +138,6 @@ struct st_preempt_hang {* driver and the hardware state for execlist mode of submission. */ struct intel_engine_execlists { -/** -* @tasklet: softirq tasklet for bottom handler -*/ -struct tasklet_struct tasklet; -/** * @timer: kick the current context if its timeslice expires */ drivers/gpu/drm/i915/gt/intel_execlists_submission.c +45
-39@@ -570,7 +570,7 @@ static void kick_siblings(struct i915_request *rq, struct intel_context *ce)resubmit_virtual_request (rq, ve);if (READ_ONCE (ve->request)) -tasklet_hi_schedule (&ve->base.execlists.tasklet); +tasklet_hi_schedule (&ve->base.sched_engine->tasklet); } static void __execlists_schedule_out(struct i915_request * const rq,@@ -739,9 +739,9 @@ trace_ports(const struct intel_engine_execlists *execlists, }static bool -reset_in_progress (const struct intel_engine_execlists *execlists) +reset_in_progress (const struct intel_engine_cs *engine) { -return unlikely (!__tasklet_is_enabled (&execlists->tasklet)); +return unlikely (!__tasklet_is_enabled (&engine->sched_engine->tasklet)); }static __maybe_unused noinline bool@@ -757,7 +757,7 @@ assert_pending_valid(const struct intel_engine_execlists *execlists,trace_ports (execlists, msg, execlists->pending);/* We may be messing around with the lists during reset, lalala */ -if (reset_in_progress (execlists)) +if (reset_in_progress (engine))return true;if (!execlists->pending[0 ]) {@@ -1190,7 +1190,7 @@ static void start_timeslice(struct intel_engine_cs *engine)* its timeslice, so recheck. */ if (!timer_pending (&el->timer)) -tasklet_hi_schedule (&el->tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet);return ; }@@ -1772,8 +1772,8 @@ process_csb(struct intel_engine_cs *engine, struct i915_request **inactive)* access. Either we are inside the tasklet, or the tasklet is disabled * and we assume that is only inside the reset paths and so serialised. */ -GEM_BUG_ON (!tasklet_is_locked (&execlists->tasklet) && - !reset_in_progress (execlists)); +GEM_BUG_ON (!tasklet_is_locked (&engine->sched_engine->tasklet) && + !reset_in_progress (engine));/* * Note that csb_write, csb_status may be either in HWSP or mmio. @@ -2131,7 +2131,7 @@ static void execlists_unhold(struct intel_engine_cs *engine,if (rq_prio (rq) > engine->sched_engine->queue_priority_hint) { engine->sched_engine->queue_priority_hint =rq_prio (rq); -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); }spin_unlock_irq (&engine->sched_engine->lock);@@ -2322,13 +2322,13 @@ static void execlists_reset(struct intel_engine_cs *engine, const char *msg)ENGINE_TRACE (engine,"reset for %s\n" , msg);/* Mark this tasklet as disabled to avoid waiting for it to complete */ -tasklet_disable_nosync (&engine->execlists.tasklet); +tasklet_disable_nosync (&engine->sched_engine->tasklet);ring_set_paused (engine,1 );/* Freeze the current request in place */ execlists_capture (engine);intel_engine_reset (engine, msg); -tasklet_enable (&engine->execlists.tasklet); +tasklet_enable (&engine->sched_engine->tasklet);clear_and_wake_up_bit (bit, lock); }@@ -2351,8 +2351,9 @@ static bool preempt_timeout(const struct intel_engine_cs *const engine)*/ static void execlists_submission_tasklet (struct tasklet_struct *t) { -struct intel_engine_cs *const engine = -from_tasklet (engine, t, execlists.tasklet); +struct i915_sched_engine *sched_engine = +from_tasklet (sched_engine, t, tasklet); +struct intel_engine_cs *const engine = sched_engine->private_data;struct i915_request *post[2 *EXECLIST_MAX_PORTS ];struct i915_request **inactive;@@ -2427,13 +2428,16 @@ static void execlists_irq_handler(struct intel_engine_cs *engine, u16 iir)intel_engine_signal_breadcrumbs (engine);if (tasklet) -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); }static void __execlists_kick (struct intel_engine_execlists *execlists) { +struct intel_engine_cs *engine = +container_of (execlists,typeof (*engine), execlists); +/* Kick the tasklet for some interrupt coalescing and reset handling */ -tasklet_hi_schedule (&execlists->tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); }#define execlists_kick (t, member) \@@ -2808,10 +2812,8 @@ static int execlists_resume(struct intel_engine_cs *engine)static void execlists_reset_prepare (struct intel_engine_cs *engine) { -struct intel_engine_execlists *const execlists = &engine->execlists; -ENGINE_TRACE (engine,"depth<-%d\n" , -atomic_read (&execlists->tasklet.count)); +atomic_read (&engine->sched_engine->tasklet.count));/* * Prevent request submission to the hardware until we have @@ -2822,8 +2824,8 @@ static void execlists_reset_prepare(struct intel_engine_cs *engine)* Turning off the execlists->tasklet until the reset is over * prevents the race. */ -__tasklet_disable_sync_once (&execlists->tasklet); -GEM_BUG_ON (!reset_in_progress (execlists)); +__tasklet_disable_sync_once (&engine->sched_engine->tasklet); +GEM_BUG_ON (!reset_in_progress (engine));/* * We stop engines, otherwise we might get failed reset and a @@ -2973,8 +2975,9 @@ static void execlists_reset_rewind(struct intel_engine_cs *engine, bool stalled)static void nop_submission_tasklet (struct tasklet_struct *t) { -struct intel_engine_cs *const engine = -from_tasklet (engine, t, execlists.tasklet); +struct i915_sched_engine *sched_engine = +from_tasklet (sched_engine, t, tasklet); +struct intel_engine_cs *const engine = sched_engine->private_data;/* The driver is wedged; don't process any more events. */ WRITE_ONCE (engine->sched_engine->queue_priority_hint,INT_MIN );@@ -3061,8 +3064,8 @@ static void execlists_reset_cancel(struct intel_engine_cs *engine) sched_engine->queue_priority_hint =INT_MIN ; sched_engine->queue =RB_ROOT_CACHED ; -GEM_BUG_ON (__tasklet_is_enabled (&execlists->tasklet)); - execlists->tasklet.callback = nop_submission_tasklet; +GEM_BUG_ON (__tasklet_is_enabled (&engine->sched_engine->tasklet)); + engine->sched_engine->tasklet.callback = nop_submission_tasklet;spin_unlock_irqrestore (&engine->sched_engine->lock, flags);rcu_read_unlock ();@@ -3082,14 +3085,14 @@ static void execlists_reset_finish(struct intel_engine_cs *engine)* reset as the next level of recovery, and as a final resort we * will declare the device wedged. */ -GEM_BUG_ON (!reset_in_progress (execlists)); +GEM_BUG_ON (!reset_in_progress (engine));/* And kick in case we missed a new request submission. */ -if (__tasklet_enable (&execlists->tasklet)) +if (__tasklet_enable (&engine->sched_engine->tasklet))__execlists_kick (execlists);ENGINE_TRACE (engine,"depth->%d\n" , -atomic_read (&execlists->tasklet.count)); +atomic_read (&engine->sched_engine->tasklet.count)); }static void gen8_logical_ring_enable_irq (struct intel_engine_cs *engine)@@ -3163,7 +3166,7 @@ static void kick_execlists(const struct i915_request *rq, int prio)* so kiss. */ if (prio >=max (I915_PRIORITY_NORMAL ,rq_prio (inflight))) -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&sched_engine->tasklet); unlock:rcu_read_unlock ();@@ -3174,7 +3177,7 @@ static void execlists_set_default_submission(struct intel_engine_cs *engine) engine->submit_request = execlists_submit_request; engine->sched_engine->schedule = i915_schedule; engine->sched_engine->kick_backend = kick_execlists; - engine->execlists.tasklet.callback = execlists_submission_tasklet; + engine->sched_engine->tasklet.callback = execlists_submission_tasklet; }static void execlists_shutdown (struct intel_engine_cs *engine)@@ -3182,7 +3185,7 @@ static void execlists_shutdown(struct intel_engine_cs *engine)/* Synchronise with residual timers and any softirq they raise */ del_timer_sync (&engine->execlists.timer);del_timer_sync (&engine->execlists.preempt); -tasklet_kill (&engine->execlists.tasklet); +tasklet_kill (&engine->sched_engine->tasklet); }static void execlists_release (struct intel_engine_cs *engine)@@ -3298,7 +3301,7 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)struct intel_uncore *uncore = engine->uncore;u32 base = engine->mmio_base; -tasklet_setup (&engine->execlists.tasklet, execlists_submission_tasklet); +tasklet_setup (&engine->sched_engine->tasklet, execlists_submission_tasklet);timer_setup (&engine->execlists.timer, execlists_timeslice,0 );timer_setup (&engine->execlists.preempt, execlists_preempt,0 );@@ -3380,7 +3383,7 @@ static void rcu_virtual_context_destroy(struct work_struct *wrk)* rbtrees as in the case it is running in parallel, it may reinsert * the rb_node into a sibling. */ -tasklet_kill (&ve->base.execlists.tasklet); +tasklet_kill (&ve->base.sched_engine->tasklet);/* Decouple ourselves from the siblings, no more access allowed. */ for (n =0 ; n < ve->num_siblings; n++) {@@ -3392,13 +3395,13 @@ static void rcu_virtual_context_destroy(struct work_struct *wrk)spin_lock_irq (&sibling->sched_engine->lock); -/* Detachment is lazily performed in the execlists tasklet */ +/* Detachment is lazily performed in the sched_engine->tasklet */ if (!RB_EMPTY_NODE (node))rb_erase_cached (node, &sibling->execlists.virtual);spin_unlock_irq (&sibling->sched_engine->lock); } -GEM_BUG_ON (__tasklet_is_scheduled (&ve->base.execlists.tasklet)); +GEM_BUG_ON (__tasklet_is_scheduled (&ve->base.sched_engine->tasklet));GEM_BUG_ON (!list_empty (virtual_queue (ve)));lrc_fini (&ve->context);@@ -3545,9 +3548,11 @@ static intel_engine_mask_t virtual_submission_mask(struct virtual_engine *ve)static void virtual_submission_tasklet (struct tasklet_struct *t) { +struct i915_sched_engine *sched_engine = +from_tasklet (sched_engine, t, tasklet);struct virtual_engine *const ve = -from_tasklet (ve, t, base.execlists.tasklet); -const int prio =READ_ONCE (ve->base.sched_engine->queue_priority_hint); + (struct virtual_engine *)sched_engine->private_data; +const int prio =READ_ONCE (sched_engine->queue_priority_hint);intel_engine_mask_t mask;unsigned int n;@@ -3616,7 +3621,7 @@ static void virtual_submission_tasklet(struct tasklet_struct *t)GEM_BUG_ON (RB_EMPTY_NODE (&node->rb)); node->prio = prio;if (first && prio > sibling->sched_engine->queue_priority_hint) -tasklet_hi_schedule (&sibling->execlists.tasklet); +tasklet_hi_schedule (&sibling->sched_engine->tasklet); unlock_engine:spin_unlock_irq (&sibling->sched_engine->lock);@@ -3657,7 +3662,7 @@ static void virtual_submit_request(struct i915_request *rq)GEM_BUG_ON (!list_empty (virtual_queue (ve)));list_move_tail (&rq->sched.link,virtual_queue (ve)); -tasklet_hi_schedule (&ve->base.execlists.tasklet); +tasklet_hi_schedule (&ve->base.sched_engine->tasklet); unlock:spin_unlock_irqrestore (&ve->base.sched_engine->lock, flags);@@ -3751,6 +3756,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, err = -ENOMEM ; goto err_put; } + ve->base.sched_engine->private_data = &ve->base; ve->base.cops = &virtual_context_ops; ve->base.request_alloc = execlists_request_alloc;@@ -3761,7 +3767,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings, ve->base.bond_execute = virtual_bond_execute;INIT_LIST_HEAD (virtual_queue (ve)); -tasklet_setup (&ve->base.execlists.tasklet, virtual_submission_tasklet); +tasklet_setup (&ve->base.sched_engine->tasklet, virtual_submission_tasklet);intel_context_init (&ve->context, &ve->base);@@ -3789,7 +3795,7 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings,* layering if we handle cloning of the requests and * submitting a copy into each backend. */ -if (sibling->execlists.tasklet.callback != +if (sibling->sched_engine->tasklet.callback != execlists_submission_tasklet) { err = -ENODEV ; goto err_put;drivers/gpu/drm/i915/gt/mock_engine.c +1
-0@@ -349,6 +349,7 @@ int mock_engine_init(struct intel_engine_cs *engine) engine->sched_engine =i915_sched_engine_create (ENGINE_MOCK );if (!engine->sched_engine)return -ENOMEM ; + engine->sched_engine->private_data = engine;intel_engine_init_execlists (engine);intel_engine_init__pm (engine);drivers/gpu/drm/i915/gt/selftest_execlists.c +7
-7@@ -43,7 +43,7 @@ static int wait_for_submit(struct intel_engine_cs *engine, unsigned long timeout) {/* Ignore our own attempts to suppress excess tasklets */ -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); timeout += jiffies; do {@@ -553,13 +553,13 @@ static int live_pin_rewind(void *arg)static int engine_lock_reset_tasklet (struct intel_engine_cs *engine) { -tasklet_disable (&engine->execlists.tasklet); +tasklet_disable (&engine->sched_engine->tasklet);local_bh_disable ();if (test_and_set_bit (I915_RESET_ENGINE + engine->id, &engine->gt->reset.flags)) {local_bh_enable (); -tasklet_enable (&engine->execlists.tasklet); +tasklet_enable (&engine->sched_engine->tasklet);intel_gt_set_wedged (engine->gt);return -EBUSY ;@@ -574,7 +574,7 @@ static void engine_unlock_reset_tasklet(struct intel_engine_cs *engine) &engine->gt->reset.flags);local_bh_enable (); -tasklet_enable (&engine->execlists.tasklet); +tasklet_enable (&engine->sched_engine->tasklet); }static int live_hold_reset (void *arg)@@ -628,7 +628,7 @@ static int live_hold_reset(void *arg)if (err) goto out; - engine->execlists.tasklet.callback (&engine->execlists.tasklet); + engine->sched_engine->tasklet.callback (&engine->sched_engine->tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);i915_request_get (rq);@@ -1200,7 +1200,7 @@ static int live_timeslice_rewind(void *arg)while (i915_request_is_active (rq[A2 ])) {/* semaphore yield! */ /* Wait for the timeslice to kick in */ del_timer (&engine->execlists.timer); -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet);intel_engine_flush_submission (engine); }/* -> ELSP[] = { { A:rq1 }, { B:rq1 } } */ @@ -4606,7 +4606,7 @@ static int reset_virtual_engine(struct intel_gt *gt,if (err) goto out_heartbeat; - engine->execlists.tasklet.callback (&engine->execlists.tasklet); + engine->sched_engine->tasklet.callback (&engine->sched_engine->tasklet);GEM_BUG_ON (execlists_active (&engine->execlists) != rq);/* Fake a preemption event; failed of course */ drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1
-1@@ -1702,7 +1702,7 @@ static int __igt_atomic_reset_engine(struct intel_engine_cs *engine,const struct igt_atomic_section *p, const char *mode) { - struct tasklet_struct * const t = &engine->execlists.tasklet; + struct tasklet_struct * const t = &engine->sched_engine->tasklet;int err; GEM_TRACE("i915_reset_engine(%s:%s) under %s\n",drivers/gpu/drm/i915/gt/selftest_lrc.c +3
-3@@ -49,7 +49,7 @@ static int wait_for_submit(struct intel_engine_cs *engine, unsigned long timeout) {/* Ignore our own attempts to suppress excess tasklets */ -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); timeout += jiffies; do {@@ -1613,12 +1613,12 @@ static void garbage_reset(struct intel_engine_cs *engine,local_bh_disable ();if (!test_and_set_bit (bit, lock)) { -tasklet_disable (&engine->execlists.tasklet); +tasklet_disable (&engine->sched_engine->tasklet);if (!rq->fence.error)__intel_engine_reset_bh (engine,NULL ); -tasklet_enable (&engine->execlists.tasklet); +tasklet_enable (&engine->sched_engine->tasklet);clear_and_wake_up_bit (bit, lock); }local_bh_enable ();drivers/gpu/drm/i915/gt/selftest_reset.c +1
-1@@ -321,7 +321,7 @@ static int igt_atomic_engine_reset(void *arg) goto out_unlock;for_each_engine (engine, gt, id) { -struct tasklet_struct *t = &engine->execlists.tasklet; +struct tasklet_struct *t = &engine->sched_engine->tasklet;if (t->func)tasklet_disable (t);drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +11
-14@@ -241,8 +241,9 @@ static void __guc_dequeue(struct intel_engine_cs *engine)static void guc_submission_tasklet (struct tasklet_struct *t) { -struct intel_engine_cs *const engine = -from_tasklet (engine, t, execlists.tasklet); +struct i915_sched_engine *sched_engine = +from_tasklet (sched_engine, t, tasklet); +struct intel_engine_cs *const engine = sched_engine->private_data;struct intel_engine_execlists *const execlists = &engine->execlists;struct i915_request **port, *rq;unsigned long flags;@@ -272,14 +273,12 @@ static void cs_irq_handler(struct intel_engine_cs *engine, u16 iir) {if (iir >_RENDER_USER_INTERRUPT ) {intel_engine_signal_breadcrumbs (engine); -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet); } }static void guc_reset_prepare (struct intel_engine_cs *engine) { -struct intel_engine_execlists *const execlists = &engine->execlists; -ENGINE_TRACE (engine,"\n" );/* @@ -291,7 +290,7 @@ static void guc_reset_prepare(struct intel_engine_cs *engine)* Turning off the execlists->tasklet until the reset is over * prevents the race. */ -__tasklet_disable_sync_once (&execlists->tasklet); +__tasklet_disable_sync_once (&engine->sched_engine->tasklet); } static void guc_reset_state(struct intel_context *ce,@@ -395,14 +394,12 @@ static void guc_reset_cancel(struct intel_engine_cs *engine)static void guc_reset_finish (struct intel_engine_cs *engine) { -struct intel_engine_execlists *const execlists = &engine->execlists; - -if (__tasklet_enable (&execlists->tasklet)) +if (__tasklet_enable (&engine->sched_engine->tasklet))/* And kick in case we missed a new request submission. */ -tasklet_hi_schedule (&execlists->tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet);ENGINE_TRACE (engine,"depth->%d\n" , -atomic_read (&execlists->tasklet.count)); +atomic_read (&engine->sched_engine->tasklet.count)); }/* @@ -520,7 +517,7 @@ static void guc_submit_request(struct i915_request *rq)GEM_BUG_ON (i915_sched_engine_is_empty (engine->sched_engine));GEM_BUG_ON (list_empty (&rq->sched.link)); -tasklet_hi_schedule (&engine->execlists.tasklet); +tasklet_hi_schedule (&engine->sched_engine->tasklet);spin_unlock_irqrestore (&engine->sched_engine->lock, flags); }@@ -600,7 +597,7 @@ static void guc_release(struct intel_engine_cs *engine) { engine->sanitize =NULL ;/* no longer in control, nothing to sanitize */ -tasklet_kill (&engine->execlists.tasklet); +tasklet_kill (&engine->sched_engine->tasklet);intel_engine_cleanup_common (engine);lrc_fini_wa_ctx (engine);@@ -679,7 +676,7 @@ int intel_guc_submission_setup(struct intel_engine_cs *engine)*/ GEM_BUG_ON (GRAPHICS_VER (i915) <11 ); -tasklet_setup (&engine->execlists.tasklet, guc_submission_tasklet); +tasklet_setup (&engine->sched_engine->tasklet, guc_submission_tasklet);guc_default_vfuncs (engine);guc_default_irqs (engine);drivers/gpu/drm/i915/i915_scheduler.c +1
-0@@ -436,6 +436,7 @@ void i915_sched_engine_free(struct kref *kref)struct i915_sched_engine *sched_engine =container_of (kref,typeof (*sched_engine), ref); +tasklet_kill (&sched_engine->tasklet);/* flush the callback */ kfree (sched_engine); }drivers/gpu/drm/i915/i915_scheduler.h +14
-0@@ -79,6 +79,20 @@ i915_sched_engine_reset_on_empty(struct i915_sched_engine *sched_engine) sched_engine->no_priolist = false; } +static inline void +i915_sched_engine_active_lock_bh (struct i915_sched_engine *sched_engine) +{ +local_bh_disable ();/* prevent local softirq and lock recursion */ +tasklet_lock (&sched_engine->tasklet); +} + +static inline void +i915_sched_engine_active_unlock_bh (struct i915_sched_engine *sched_engine) +{ +tasklet_unlock (&sched_engine->tasklet); +local_bh_enable ();/* restore softirq, and kick ksoftirqd! */ +} + void i915_request_show_with_schedule(struct drm_printer *m, const struct i915_request *rq, const char *prefix,drivers/gpu/drm/i915/i915_scheduler_types.h +5
-0@@ -124,6 +124,11 @@ struct i915_sched_engine {*/ struct list_head hold; +/** +* @tasklet: softirq tasklet for submission +*/ +struct tasklet_struct tasklet; +/** * @default_priolist: priority list for I915_PRIORITY_NORMAL */ @@ -153,6 +158,11 @@ struct i915_sched_engine {*/
drivers/gpu/drm/i915/i915_scheduler_types.h struct i915_sched_engine { · line 168
Quoted 10 lines
drivers/gpu/drm/i915/i915_scheduler_types.h +5
-0bool no_priolist; +/** +* @private_data: private data of the submission backend +*/ +void *private_data; +/** * @kick_backend: kick backend after a request's priority has changed */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Introduce i915_sched_engine object (rev5)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Introduce i915_sched_engine object (rev5)
URL : https://patchwork.freedesktop.org/series/90630/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10226 -> Patchwork_20378
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/index.html
Known issues
------------
Here are the changes found in Patchwork_20378 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][1] ([fdo#109271]) +23 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/fi-bdw-5557u/igt@amdgpu/[email protected]
* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-snb-2600: NOTRUN -> [SKIP][2] ([fdo#109271]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/fi-snb-2600/igt@amdgpu/[email protected]
* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: NOTRUN -> [WARN][3] ([i915#2283])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/fi-bdw-5557u/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [PASS][4] -> [DMESG-WARN][5] ([i915#2868])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/fi-kbl-7500u/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/fi-kbl-7500u/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: [PASS][6] -> [FAIL][7] ([i915#1372])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/fi-kbl-7500u/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/fi-kbl-7500u/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- {fi-tgl-1115g4}: [FAIL][8] ([i915#1888]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/fi-tgl-1115g4/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/fi-tgl-1115g4/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [INCOMPLETE][10] ([i915#2782]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/fi-snb-2600/igt@i915_selftest@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/fi-snb-2600/igt@i915_selftest@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1372]: https://gitlab.freedesktop.org/drm/intel/issues/1372
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2283]: https://gitlab.freedesktop.org/drm/intel/issues/2283
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2868]: https://gitlab.freedesktop.org/drm/intel/issues/2868
Participating hosts (43 -> 38)
------------------------------
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_10226 -> Patchwork_20378
CI-20190529: 20190529
CI_DRM_10226: e59107e71dfda22b959337ca2dd68b1bcbe78710 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6108: be59e0579cca677566c85540219fb9545e9afadf @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20378: 9f3d6294bb95373ae1e5b5a0a61fd198a6a7f066 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
9f3d6294bb95 drm/i915: Move submission tasklet to i915_sched_engine 51faf8da5157 drm/i915: Update i915_scheduler to operate on i915_sched_engine 3106c15381dc drm/i915: Add kick_backend function to i915_sched_engine 0c08e1cb2281 drm/i915: Move engine->schedule to i915_sched_engine ea00bd4cefa1 drm/i915: Move active tracking to i915_sched_engine 937a39b95648 drm/i915: Reset sched_engine.no_priolist immediately after dequeue 9208143eb81b drm/i915: Add i915_sched_engine_is_empty function 665d3761c158 drm/i915: Move priolist to new i915_sched_engine object
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Introduce i915_sched_engine object (rev5)
In reply to Matthew Brost== Series Details ==
== Series Details ==
Series: Introduce i915_sched_engine object (rev5)
URL : https://patchwork.freedesktop.org/series/90630/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10226_full -> Patchwork_20378_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20378_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_20378_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20378_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_exec_schedule@pi-common@vecs0:
- shard-skl: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@gem_exec_schedule@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl9/igt@gem_exec_schedule@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-iclb: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_20378_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_create@create-clear:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#3160])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk8/igt@[email protected]
* igt@gem_ctx_persistence@legacy-engines-hostile-preempt:
- shard-snb: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#1099]) +3 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-snb5/igt@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: [PASS][8] -> [FAIL][9] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@gem_exec_fair@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vecs0:
- shard-kbl: [PASS][10] -> [SKIP][11] ([fdo#109271])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl1/igt@gem_exec_fair@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl3/igt@gem_exec_fair@[email protected]
- shard-tglb: [PASS][12] -> [FAIL][13] ([i915#2842]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb3/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-tglb6/igt@gem_exec_fair@[email protected]
* igt@gem_exec_reloc@basic-wide-active@rcs0:
- shard-snb: NOTRUN -> [FAIL][14] ([i915#2389]) +2 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-snb7/igt@gem_exec_reloc@[email protected]
* igt@gem_mmap_gtt@big-copy-xy:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#307]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl8/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl10/igt@[email protected]
* igt@gem_pwrite@basic-exhaustion:
- shard-snb: NOTRUN -> [WARN][17] ([i915#2658])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-snb5/igt@[email protected]
* igt@gem_userptr_blits@input-checking:
- shard-snb: NOTRUN -> [DMESG-WARN][18] ([i915#3002])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-snb5/igt@[email protected]
* igt@gem_vm_create@destroy-race:
- shard-tglb: [PASS][19] -> [FAIL][20] ([i915#2822])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb3/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-tglb3/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][21] -> [DMESG-WARN][22] ([i915#1436] / [i915#716])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl8/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl9/igt@[email protected]
* igt@gen9_exec_parse@batch-invalid-length:
- shard-snb: NOTRUN -> [SKIP][23] ([fdo#109271]) +327 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-snb2/igt@[email protected]
* igt@i915_pm_rpm@modeset-pc8-residency-stress:
- shard-apl: NOTRUN -> [SKIP][24] ([fdo#109271]) +91 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl3/igt@[email protected]
* igt@i915_pm_sseu@full-enable:
- shard-skl: [PASS][25] -> [FAIL][26] ([i915#3524])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl10/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- shard-skl: NOTRUN -> [DMESG-FAIL][27] ([i915#1886] / [i915#2291])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl4/igt@i915_selftest@live@gt_pm.html
* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-glk: [PASS][28] -> [DMESG-WARN][29] ([i915#118] / [i915#95])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk4/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk3/igt@[email protected]
* igt@kms_chamelium@dp-hpd-storm-disable:
- shard-apl: NOTRUN -> [SKIP][30] ([fdo#109271] / [fdo#111827]) +12 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-for-each-pipe:
- shard-kbl: NOTRUN -> [SKIP][31] ([fdo#109271] / [fdo#111827]) +7 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl7/igt@[email protected]
* igt@kms_chamelium@vga-hpd-without-ddc:
- shard-snb: NOTRUN -> [SKIP][32] ([fdo#109271] / [fdo#111827]) +17 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-snb2/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
- shard-iclb: NOTRUN -> [SKIP][33] ([fdo#109284] / [fdo#111827])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-green-to-red:
- shard-skl: NOTRUN -> [SKIP][34] ([fdo#109271] / [fdo#111827]) +6 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl4/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-degamma:
- shard-glk: NOTRUN -> [SKIP][35] ([fdo#109271] / [fdo#111827]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk6/igt@[email protected]
* igt@kms_content_protection@atomic-dpms:
- shard-kbl: NOTRUN -> [TIMEOUT][36] ([i915#1319])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl2/igt@[email protected]
* igt@kms_content_protection@legacy:
- shard-iclb: NOTRUN -> [SKIP][37] ([fdo#109300] / [fdo#111066])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@[email protected]
* igt@kms_content_protection@uevent:
- shard-apl: NOTRUN -> [FAIL][38] ([i915#2105])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-skl: [PASS][39] -> [INCOMPLETE][40] ([i915#300])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl10/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl10/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-kbl: NOTRUN -> [SKIP][41] ([fdo#109271]) +94 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-d-128x128-right-edge:
- shard-skl: NOTRUN -> [SKIP][42] ([fdo#109271]) +73 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl7/igt@[email protected]
* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-skl: NOTRUN -> [SKIP][43] ([fdo#109271] / [i915#533])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl3/igt@[email protected]
* igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium:
- shard-iclb: NOTRUN -> [SKIP][44] ([i915#3528])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [PASS][45] -> [INCOMPLETE][46] ([i915#180] / [i915#1982])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl6/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl3/igt@[email protected]
* igt@kms_flip@2x-dpms-vs-vblank-race:
- shard-iclb: NOTRUN -> [SKIP][47] ([fdo#109274])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@c-edp1:
- shard-skl: [PASS][48] -> [INCOMPLETE][49] ([i915#198])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@kms_flip@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl9/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-apl: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#2672])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-skl: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#2672]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl7/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][52] ([fdo#109271] / [i915#2672])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render:
- shard-iclb: NOTRUN -> [SKIP][53] ([fdo#109280])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-mmap-cpu:
- shard-glk: NOTRUN -> [SKIP][54] ([fdo#109271]) +30 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk6/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-indfb-draw-mmap-cpu.html
* igt@kms_hdr@bpc-switch:
- shard-skl: NOTRUN -> [FAIL][55] ([i915#1188])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl6/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][56] -> [FAIL][57] ([i915#1188])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@[email protected]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl4/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-kbl: NOTRUN -> [SKIP][58] ([fdo#109271] / [i915#533])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-kbl: [PASS][59] -> [DMESG-WARN][60] ([i915#180]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-skl: NOTRUN -> [FAIL][61] ([fdo#108145] / [i915#265]) +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][62] ([fdo#108145] / [i915#265]) +1 similar issue
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-kbl: NOTRUN -> [FAIL][63] ([fdo#108145] / [i915#265]) +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl2/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-5:
- shard-skl: NOTRUN -> [SKIP][64] ([fdo#109271] / [i915#658])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl4/igt@[email protected]
* igt@kms_psr2_sf@plane-move-sf-dmg-area-0:
- shard-kbl: NOTRUN -> [SKIP][65] ([fdo#109271] / [i915#658]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl2/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-apl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#658]) +2 similar issues
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl3/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][67] -> [SKIP][68] ([fdo#109441]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb6/igt@kms_psr@psr2_no_drrs.html
* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][69] ([i915#31])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-snb7/igt@[email protected]
* igt@kms_vblank@pipe-d-ts-continuation-modeset-rpm:
- shard-iclb: NOTRUN -> [SKIP][70] ([fdo#109278])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@[email protected]
* igt@kms_writeback@writeback-invalid-parameters:
- shard-kbl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#2437])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@[email protected]
* igt@nouveau_crc@pipe-a-source-rg:
- shard-iclb: NOTRUN -> [SKIP][72] ([i915#2530])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@[email protected]
* igt@sysfs_clients@fair-7:
- shard-apl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#2994]) +1 similar issue
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl3/igt@[email protected]
* igt@sysfs_clients@sema-10:
- shard-kbl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#2994]) +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl7/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][75] ([i915#2842]) -> [PASS][76] +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@gem_exec_fair@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][77] ([i915#2842]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb2/igt@gem_exec_fair@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-tglb5/igt@gem_exec_fair@[email protected]
- shard-glk: [FAIL][79] ([i915#2842]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk3/igt@gem_exec_fair@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk5/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-sync@rcs0:
- shard-kbl: [SKIP][81] ([fdo#109271]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl3/igt@gem_exec_fair@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][83] ([i915#2849]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@gem_exec_fair@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [DMESG-WARN][85] ([i915#118] / [i915#95]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk8/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk4/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- shard-glk: [DMESG-FAIL][87] ([i915#1886] / [i915#2291]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@i915_selftest@live@gt_pm.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk8/igt@i915_selftest@live@gt_pm.html
* igt@i915_suspend@forcewake:
- shard-skl: [INCOMPLETE][89] ([i915#636]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl9/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl7/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [FAIL][91] ([i915#2346] / [i915#533]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [FAIL][93] ([i915#2346]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl9/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [FAIL][95] ([i915#79]) -> [PASS][96] +1 similar issue
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@kms_flip@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl4/igt@kms_flip@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [DMESG-WARN][97] ([i915#180]) -> [PASS][98] +4 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-a-planes:
- shard-apl: [DMESG-WARN][99] ([i915#180]) -> [PASS][100] +1 similar issue
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl3/igt@kms_plane@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl2/igt@kms_plane@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][101] ([fdo#109441]) -> [PASS][102] +3 similar issues
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@kms_psr@psr2_sprite_plane_move.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
- shard-tglb: [DMESG-WARN][103] ([i915#2411] / [i915#2868]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb5/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-tglb5/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [FAIL][105] ([i915#1542]) -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl6/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-glk: [FAIL][107] ([i915#1542]) -> [PASS][108]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk9/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-glk2/igt@[email protected]
- shard-apl: [FAIL][109] ([i915#1542]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl2/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-apl3/igt@[email protected]
* igt@prime_vgem@sync@rcs0:
- shard-iclb: [INCOMPLETE][111] ([i915#409]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@prime_vgem@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@prime_vgem@[email protected]
#### Warnings ####
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][113] ([i915#588]) -> [SKIP][114] ([i915#658])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb7/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][115] ([i915#1804] / [i915#2684]) -> [WARN][116] ([i915#2684])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb5/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][117] ([i915#2684]) -> [WARN][118] ([i915#1804] / [i915#2684])
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb8/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb3/igt@[email protected]
* igt@kms_psr2_sf@plane-move-sf-dmg-area-0:
- shard-iclb: [SKIP][119] ([i915#658]) -> [SKIP][120] ([i915#2920]) +2 similar issues
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb2/igt@[email protected]
* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-iclb: [SKIP][121] ([i915#2920]) -> [SKIP][122] ([i915#658])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb6/igt@[email protected]
* igt@runner@aborted:
- shard-kbl: ([FAIL][123], [FAIL][124], [FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363]) -> ([FAIL][131], [FAIL][132], [FAIL][133], [FAIL][134], [FAIL][135]) ([i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363])
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl3/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl4/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-kbl6/igt@[email protected]
- shard-iclb: ([FAIL][136], [FAIL][137], [FAIL][138]) ([i915#2426] / [i915#3002] / [i915#409]) -> ([FAIL][139], [FAIL][140], [FAIL][141]) ([i915#1814] / [i915#3002])
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb7/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb8/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb2/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-iclb1/igt@[email protected]
- shard-skl: ([FAIL][142], [FAIL][143]) ([i915#3002] / [i915#3363]) -> ([FAIL][144], [FAIL][145], [FAIL][146], [FAIL][147]) ([i915#1436] / [i915#2029] / [i915#3002] / [i915#3363])
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl5/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl1/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl3/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl9/igt@[email protected]
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/shard-skl8/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#111066]: https://bugs.freedesktop.org/show_bug.cgi?id=111066
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1099]: https://gitlab.freedesktop.org/drm/intel/issues/1099
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20378/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx