drm/i915: Move engine->schedule to i915_sched_engine

The schedule function should be in the schedule object.

v3:
 (Jason Ekstrand)
  Add kernel doc

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210618010638.98941-6-matthew.brost@intel.com

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_wait.c b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
index 1e97520c62b23bdbf947c77c590050a4c2c0ee71..1070d3afdce7c9f4903df15f61b5d92e10b477c1 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_wait.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_wait.c
@@ -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();
 }
 

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index 530bd3baf9d7bde6d0f70d0016a25b2221c42bdc..8e0a8ee955af8a7625f65be1780d5389d39bec7c 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@ -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);
 

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
index b99ac41695f3969e51e82be0cb881d0395bf460b..b6a305e6a974d043572fcdf1bc8c2706bc7876f0 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c
@@ -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))

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h
index 5e0f39d202ef906263c837e6b93a2a6d962ed0c0..0bb65c57d274d0fe01f163f18e7015bf33b3ef82 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@ -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;

diff --git a/drivers/gpu/drm/i915/gt/intel_engine_user.c b/drivers/gpu/drm/i915/gt/intel_engine_user.c
index 3cca7ea2d6ea3e8e3d6f7f07ad82c4aae7450ea4..84142127ebd87cd96d2923ab49e7ee6fecafe94e 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_engine_user.c
+++ b/drivers/gpu/drm/i915/gt/intel_engine_user.c
@@ -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

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index 0591698573e8d584e4067ce93a600aa2b3ec2219..8a3d4014fd2cef63c84a16308facbb5745ba28ed 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -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;
 

diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c
index da694bad4683d38b26b0954767e47d7f234f6bdb..72f8cc914f4fcdc8429a537e75256a688b2fc6ec 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_execlists.c
+++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
index 853246fad05f66c12ba785e13bc03a9ce74e56b5..cec4b9977c9bf87b38563b57547492655fdc6dcf 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
@@ -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);

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 6b8f6544d91a74359dc449e3ef2f21c5d8e628ef..60121809e6e29b0df93725c14abb520785fb6ed3 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
index bd58198735dce7c45e30e8a98b358e02b1b59af8..c5989c0b83d3e5862e70aec994fa548ea9c3e303 100644 (file)
--- a/drivers/gpu/drm/i915/i915_request.c
+++ b/drivers/gpu/drm/i915/i915_request.c
@@ -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);

diff --git a/drivers/gpu/drm/i915/i915_scheduler_types.h b/drivers/gpu/drm/i915/i915_scheduler_types.h
index 74e3bb2b2a6577814cb572a350e704273ab13488..0c1e417b016462ddb7b16b8d4c73c04c4e0e475c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_scheduler_types.h
+++ b/drivers/gpu/drm/i915/i915_scheduler_types.h
@@ -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_ */