Re: [Intel-gfx] [PATCH 25/57] drm/i915: Move submit_request to i915_sched_engine

[Chris Wilson]

Quoting Tvrtko Ursulin (2021-02-04 14:13:17)
> 
> On 01/02/2021 08:56, Chris Wilson wrote:
> > @@ -28,6 +28,15 @@ struct i915_sched {
> >   
> >   unsigned long mask; /* available scheduling channels */
> >   
> > + /*
> > +  * Pass the request to the hardware queue (e.g. directly into
> 
> s/hardware queue/submission backend/ ?

Aye. One of the final steps is to remove this vfunc :)
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 25/57] drm/i915: Move submit_request to i915_sched_engine

[Tvrtko Ursulin]

On 01/02/2021 08:56, Chris Wilson wrote:

Claim the submit_request vfunc as the entry point into the scheduler
backend for ready requests.

Signed-off-by: Chris Wilson 
---
  drivers/gpu/drm/i915/gt/intel_engine_types.h |  8 
  drivers/gpu/drm/i915/gt/intel_execlists_submission.c | 11 ++-
  drivers/gpu/drm/i915/gt/intel_reset.c|  2 +-
  drivers/gpu/drm/i915/gt/intel_ring_submission.c  |  4 ++--
  drivers/gpu/drm/i915/gt/mock_engine.c|  4 +++-
  drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c|  2 +-
  drivers/gpu/drm/i915/i915_request.c  |  2 +-
  drivers/gpu/drm/i915/i915_scheduler.c|  2 ++
  drivers/gpu/drm/i915/i915_scheduler_types.h  |  9 +
  drivers/gpu/drm/i915/selftests/i915_request.c|  3 +--
  10 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h 
b/drivers/gpu/drm/i915/gt/intel_engine_types.h
index 97fe5e395a85..6b0bde292916 100644
--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@ -416,14 +416,6 @@ struct intel_engine_cs {
 u32 *cs);
unsigned intemit_fini_breadcrumb_dw;
  
-	/* Pass the request to the hardware queue (e.g. directly into

-* the legacy ringbuffer or to the end of an execlist).
-*
-* This is called from an atomic context with irqs disabled; must
-* be irq safe.
-*/
-   void(*submit_request)(struct i915_request *rq);
-
/*
 * Called on signaling of a SUBMIT_FENCE, passing along the signaling
 * request down to the bonded pairs.
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c 
b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index be79a352e512..33c1a833df20 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -483,7 +483,7 @@ resubmit_virtual_request(struct i915_request *rq, struct 
virtual_engine *ve)
  
  	clear_bit(I915_FENCE_FLAG_PQUEUE, >fence.flags);

WRITE_ONCE(rq->engine, >base);
-   ve->base.submit_request(rq);
+   ve->base.sched.submit_request(rq);
  
  	spin_unlock_irq(>lock);

  }
@@ -2766,7 +2766,7 @@ static bool can_preempt(struct intel_engine_cs *engine)
  
  static void execlists_set_default_submission(struct intel_engine_cs *engine)

  {
-   engine->submit_request = i915_request_enqueue;
+   engine->sched.submit_request = i915_request_enqueue;
engine->sched.tasklet.callback = execlists_submission_tasklet;
  }
  
@@ -3227,7 +3227,7 @@ static void virtual_submit_request(struct i915_request *rq)

 rq->fence.context,
 rq->fence.seqno);
  
-	GEM_BUG_ON(ve->base.submit_request != virtual_submit_request);

+   GEM_BUG_ON(ve->base.sched.submit_request != virtual_submit_request);
  
  	spin_lock_irqsave(>lock, flags);
  
@@ -3341,12 +3341,10 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings,

ve->base.cops = _context_ops;
ve->base.request_alloc = execlists_request_alloc;
  
-	ve->base.submit_request = virtual_submit_request;

ve->base.bond_execute = virtual_bond_execute;
  
  	INIT_LIST_HEAD(virtual_queue(ve));

ve->base.execlists.queue_priority_hint = INT_MIN;
-   tasklet_setup(>base.sched.tasklet, virtual_submission_tasklet);
  
  	intel_context_init(>context, >base);
  
@@ -3427,6 +3425,9 @@ intel_execlists_create_virtual(struct intel_engine_cs **siblings,

ve->base.mask,
ENGINE_VIRTUAL);
  
+	ve->base.sched.submit_request = virtual_submit_request;

+   tasklet_setup(>base.sched.tasklet, virtual_submission_tasklet);
+
virtual_engine_initial_hint(ve);
return >context;
  
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c

index 4a8f982a1a4f..e5cb92c7d0f8 100644
--- a/drivers/gpu/drm/i915/gt/intel_reset.c
+++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -820,7 +820,7 @@ static void __intel_gt_set_wedged(struct intel_gt *gt)
__intel_gt_reset(gt, ALL_ENGINES);
  
  	for_each_engine(engine, gt, id)

-   engine->submit_request = nop_submit_request;
+   engine->sched.submit_request = nop_submit_request;
  
  	/*

 * Make sure no request can slip through without getting completed by
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c 
b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 8af1bc77e15e..a7d49ea71900 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -970,12 +970,12 @@ static void gen6_bsd_submit_request(struct i915_request 
*request)
  
  static void i9xx_set_default_submission(struct intel_engine_cs *engine)

  {
-   engine->submit_request =