drm/i915/gt: Only disable preemption on gen8 render engines

The reason why we did not enable preemption on Broadwater was due to
missing GPGPU workarounds. Since this only applies to rcs0, only
restrict rcs0 (and our global capabilities).

While this does not affect exposing a preemption capability to
userspace, it does affect our internal decisions on whether to use
timeslicing and semaphores between individual engines.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210108204026.20682-6-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index aadd04f8dc9efdcd3b3d5c9e02f1b04c3bd81ff1..d857d168adcc36c85f57e95f385b7bba813f399e 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -3093,6 +3093,15 @@ static void execlists_park(struct intel_engine_cs *engine)
        cancel_timer(&engine->execlists.preempt);
 }
 
+static bool can_preempt(struct intel_engine_cs *engine)
+{
+       if (INTEL_GEN(engine->i915) > 8)
+               return true;
+
+       /* GPGPU on bdw requires extra w/a; not implemented */
+       return engine->class != RENDER_CLASS;
+}
+
 void intel_execlists_set_default_submission(struct intel_engine_cs *engine)
 {
        engine->submit_request = execlists_submit_request;
@@ -3110,7 +3119,7 @@ void intel_execlists_set_default_submission(struct intel_engine_cs *engine)
        engine->flags |= I915_ENGINE_SUPPORTS_STATS;
        if (!intel_vgpu_active(engine->i915)) {
                engine->flags |= I915_ENGINE_HAS_SEMAPHORES;
-               if (HAS_LOGICAL_RING_PREEMPTION(engine->i915)) {
+               if (can_preempt(engine)) {
                        engine->flags |= I915_ENGINE_HAS_PREEMPTION;
                        if (IS_ACTIVE(CONFIG_DRM_I915_TIMESLICE_DURATION))
                                engine->flags |= I915_ENGINE_HAS_TIMESLICES;

diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c
index bfa7fd5c2c915d0e78c7ba95b1a104953c7ec374..e9070f51ff151a44d106817266b5560cfff53e8d 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_execlists.c
+++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c
@@ -924,6 +924,9 @@ slice_semaphore_queue(struct intel_engine_cs *outer,
                return PTR_ERR(head);
 
        for_each_engine(engine, outer->gt, id) {
+               if (!intel_engine_has_preemption(engine))
+                       continue;
+
                for (i = 0; i < count; i++) {
                        struct i915_request *rq;
 
@@ -943,8 +946,8 @@ slice_semaphore_queue(struct intel_engine_cs *outer,
 
        if (i915_request_wait(head, 0,
                              2 * outer->gt->info.num_engines * (count + 2) * (count + 3)) < 0) {
-               pr_err("Failed to slice along semaphore chain of length (%d, %d)!\n",
-                      count, n);
+               pr_err("%s: Failed to slice along semaphore chain of length (%d, %d)!\n",
+                      outer->name, count, n);
                GEM_TRACE_DUMP();
                intel_gt_set_wedged(outer->gt);
                err = -EIO;
@@ -1721,12 +1724,6 @@ static int live_preempt(void *arg)
        enum intel_engine_id id;
        int err = -ENOMEM;
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
-       if (!(gt->i915->caps.scheduler & I915_SCHEDULER_CAP_PREEMPTION))
-               pr_err("Logical preemption supported, but not exposed\n");
-
        if (igt_spinner_init(&spin_hi, gt))
                return -ENOMEM;
 
@@ -1821,9 +1818,6 @@ static int live_late_preempt(void *arg)
        enum intel_engine_id id;
        int err = -ENOMEM;
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        if (igt_spinner_init(&spin_hi, gt))
                return -ENOMEM;
 
@@ -1957,9 +1951,6 @@ static int live_nopreempt(void *arg)
         * that may be being observed and not want to be interrupted.
         */
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        if (preempt_client_init(gt, &a))
                return -ENOMEM;
        if (preempt_client_init(gt, &b))
@@ -2382,9 +2373,6 @@ static int live_preempt_cancel(void *arg)
         * GPU. That sounds like preemption! Plus a little bit of bookkeeping.
         */
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        if (preempt_client_init(gt, &data.a))
                return -ENOMEM;
        if (preempt_client_init(gt, &data.b))
@@ -2448,9 +2436,6 @@ static int live_suppress_self_preempt(void *arg)
         * completion event.
         */
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        if (intel_uc_uses_guc_submission(&gt->uc))
                return 0; /* presume black blox */
 
@@ -2563,9 +2548,6 @@ static int live_chain_preempt(void *arg)
         * the previously submitted spinner in B.
         */
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        if (preempt_client_init(gt, &hi))
                return -ENOMEM;
 
@@ -2969,9 +2951,6 @@ static int live_preempt_gang(void *arg)
        struct intel_engine_cs *engine;
        enum intel_engine_id id;
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        /*
         * Build as long a chain of preempters as we can, with each
         * request higher priority than the last. Once we are ready, we release
@@ -3272,9 +3251,6 @@ static int live_preempt_user(void *arg)
        u32 *result;
        int err = 0;
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        /*
         * In our other tests, we look at preemption in carefully
         * controlled conditions in the ringbuffer. Since most of the
@@ -3397,9 +3373,6 @@ static int live_preempt_timeout(void *arg)
        if (!IS_ACTIVE(CONFIG_DRM_I915_PREEMPT_TIMEOUT))
                return 0;
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(gt->i915))
-               return 0;
-
        if (!intel_has_reset_engine(gt))
                return 0;
 
@@ -3670,9 +3643,6 @@ static int live_preempt_smoke(void *arg)
        u32 *cs;
        int n;
 
-       if (!HAS_LOGICAL_RING_PREEMPTION(smoke.gt->i915))
-               return 0;
-
        smoke.contexts = kmalloc_array(smoke.ncontext,
                                       sizeof(*smoke.contexts),
                                       GFP_KERNEL);

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f253fb06b602af7dc921b2540102a485417bfb59..e4e6e0aa823dfbd891af7cfb2ecdbf617a66fa61 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1659,8 +1659,6 @@ tgl_revids_get(struct drm_i915_private *dev_priv)
                (INTEL_INFO(dev_priv)->has_logical_ring_contexts)
 #define HAS_LOGICAL_RING_ELSQ(dev_priv) \
                (INTEL_INFO(dev_priv)->has_logical_ring_elsq)
-#define HAS_LOGICAL_RING_PREEMPTION(dev_priv) \
-               (INTEL_INFO(dev_priv)->has_logical_ring_preemption)
 
 #define HAS_MASTER_UNIT_IRQ(dev_priv) (INTEL_INFO(dev_priv)->has_master_unit_irq)
 

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 11fe790b19690b7897fce684f0dd559dbc6ba6a0..39608381b4a41e5cb1b42afb0c8352c0e56d74d8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -639,7 +639,6 @@ static const struct intel_device_info chv_info = {
        GEN8_FEATURES, \
        GEN(9), \
        GEN9_DEFAULT_PAGE_SIZES, \
-       .has_logical_ring_preemption = 1, \
        .display.has_csr = 1, \
        .has_gt_uc = 1, \
        .display.has_hdcp = 1, \
@@ -700,7 +699,6 @@ static const struct intel_device_info skl_gt4_info = {
        .has_rps = true, \
        .display.has_dp_mst = 1, \
        .has_logical_ring_contexts = 1, \
-       .has_logical_ring_preemption = 1, \
        .has_gt_uc = 1, \
        .dma_mask_size = 39, \
        .ppgtt_type = INTEL_PPGTT_FULL, \

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 17d0fdb94d2d622a17ff791cc23bf0acfaadde1d..cf2d528c6e9b0fcaba5caf5cd229f9aa65f3f9ad 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -123,7 +123,6 @@ enum intel_ppgtt_type {
        func(has_llc); \
        func(has_logical_ring_contexts); \
        func(has_logical_ring_elsq); \
-       func(has_logical_ring_preemption); \
        func(has_master_unit_irq); \
        func(has_pooled_eu); \
        func(has_rc6); \