drm/i915/guc: enable only the user interrupt when using GuC submission

In GuC submission mode the CS is owned by the GuC FW, so all CS status
interrupts are handled by it. We only need the user interrupt as that
signals request completion.

Since we're now starting the engines directly in GuC submission mode
when selected, we can stop switching back and forth between the
execlists and the GuC programming and select directly the correct
interrupt mask.

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Cc: John Harrison <john.c.harrison@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210603051630.2635-4-matthew.brost@intel.com

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_irq.c b/drivers/gpu/drm/i915/gt/intel_gt_irq.c
index d29126c458baa632e9adc50c4361d073a3c629e3..f88c10366e58f420a99e8a19127e78fe633e4322 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_irq.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_irq.c
@@ -194,14 +194,18 @@ void gen11_gt_irq_reset(struct intel_gt *gt)
 
 void gen11_gt_irq_postinstall(struct intel_gt *gt)
 {
-       const u32 irqs =
-               GT_CS_MASTER_ERROR_INTERRUPT |
-               GT_RENDER_USER_INTERRUPT |
-               GT_CONTEXT_SWITCH_INTERRUPT |
-               GT_WAIT_SEMAPHORE_INTERRUPT;
        struct intel_uncore *uncore = gt->uncore;
-       const u32 dmask = irqs << 16 | irqs;
-       const u32 smask = irqs << 16;
+       u32 irqs = GT_RENDER_USER_INTERRUPT;
+       u32 dmask;
+       u32 smask;
+
+       if (!intel_uc_wants_guc_submission(&gt->uc))
+               irqs |= GT_CS_MASTER_ERROR_INTERRUPT |
+                       GT_CONTEXT_SWITCH_INTERRUPT |
+                       GT_WAIT_SEMAPHORE_INTERRUPT;
+
+       dmask = irqs << 16 | irqs;
+       smask = irqs << 16;
 
        BUILD_BUG_ON(irqs & 0xffff0000);
 

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 335719f174907cc31846c65eeff7547d7c0ac34e..38cda5d599a696c57318cbc52aa4e294fc0199fe 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -432,32 +432,6 @@ void intel_guc_submission_fini(struct intel_guc *guc)
        }
 }
 
-static void guc_interrupts_capture(struct intel_gt *gt)
-{
-       struct intel_uncore *uncore = gt->uncore;
-       u32 irqs = GT_CONTEXT_SWITCH_INTERRUPT;
-       u32 dmask = irqs << 16 | irqs;
-
-       GEM_BUG_ON(INTEL_GEN(gt->i915) < 11);
-
-       /* Don't handle the ctx switch interrupt in GuC submission mode */
-       intel_uncore_rmw(uncore, GEN11_RENDER_COPY_INTR_ENABLE, dmask, 0);
-       intel_uncore_rmw(uncore, GEN11_VCS_VECS_INTR_ENABLE, dmask, 0);
-}
-
-static void guc_interrupts_release(struct intel_gt *gt)
-{
-       struct intel_uncore *uncore = gt->uncore;
-       u32 irqs = GT_CONTEXT_SWITCH_INTERRUPT;
-       u32 dmask = irqs << 16 | irqs;
-
-       GEM_BUG_ON(INTEL_GEN(gt->i915) < 11);
-
-       /* Handle ctx switch interrupts again */
-       intel_uncore_rmw(uncore, GEN11_RENDER_COPY_INTR_ENABLE, 0, dmask);
-       intel_uncore_rmw(uncore, GEN11_VCS_VECS_INTR_ENABLE, 0, dmask);
-}
-
 static int guc_context_alloc(struct intel_context *ce)
 {
        return lrc_alloc(ce, ce->engine);
@@ -722,9 +696,6 @@ int intel_guc_submission_setup(struct intel_engine_cs *engine)
 void intel_guc_submission_enable(struct intel_guc *guc)
 {
        guc_stage_desc_init(guc);
-
-       /* Take over from manual control of ELSP (execlists) */
-       guc_interrupts_capture(guc_to_gt(guc));
 }
 
 void intel_guc_submission_disable(struct intel_guc *guc)
@@ -735,8 +706,6 @@ void intel_guc_submission_disable(struct intel_guc *guc)
 
        /* Note: By the time we're here, GuC may have already been reset */
 
-       guc_interrupts_release(gt);
-
        guc_stage_desc_fini(guc);
 }