drm/i915/xehp: Add Compute CS IRQ handlers

Add execlists and GuC interrupts for compute CS into existing IRQ handlers.

All compute command streamers belong to the same compute class, so the
only change needed to enable their interrupts is to program their GT engine
interrupt mask registers.

CCS0 shares the register with CCS1, while CCS2 and CCS3 are in a new one.

BSpec: 50844, 54029, 54030, 53223, 53224.
Original-author: Michel Thierry
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220301231549.1817978-4-matthew.d.roper@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 983264e10e0a626ab3e628b934b16548416a1a02..e443ac4c8059b41047cb2549ca2da26aacbc06ab 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_irq.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_irq.c
@@ -100,7 +100,7 @@ gen11_gt_identity_handler(struct intel_gt *gt, const u32 identity)
        if (unlikely(!intr))
                return;
 
-       if (class <= COPY_ENGINE_CLASS)
+       if (class <= COPY_ENGINE_CLASS || class == COMPUTE_CLASS)
                return gen11_engine_irq_handler(gt, class, instance, intr);
 
        if (class == OTHER_CLASS)
@@ -182,6 +182,8 @@ void gen11_gt_irq_reset(struct intel_gt *gt)
        /* Disable RCS, BCS, VCS and VECS class engines. */
        intel_uncore_write(uncore, GEN11_RENDER_COPY_INTR_ENABLE, 0);
        intel_uncore_write(uncore, GEN11_VCS_VECS_INTR_ENABLE,    0);
+       if (CCS_MASK(gt))
+               intel_uncore_write(uncore, GEN12_CCS_RSVD_INTR_ENABLE, 0);
 
        /* Restore masks irqs on RCS, BCS, VCS and VECS engines. */
        intel_uncore_write(uncore, GEN11_RCS0_RSVD_INTR_MASK,   ~0);
@@ -195,6 +197,10 @@ void gen11_gt_irq_reset(struct intel_gt *gt)
        intel_uncore_write(uncore, GEN11_VECS0_VECS1_INTR_MASK, ~0);
        if (HAS_ENGINE(gt, VECS2) || HAS_ENGINE(gt, VECS3))
                intel_uncore_write(uncore, GEN12_VECS2_VECS3_INTR_MASK, ~0);
+       if (HAS_ENGINE(gt, CCS0) || HAS_ENGINE(gt, CCS1))
+               intel_uncore_write(uncore, GEN12_CCS0_CCS1_INTR_MASK, ~0);
+       if (HAS_ENGINE(gt, CCS2) || HAS_ENGINE(gt, CCS3))
+               intel_uncore_write(uncore, GEN12_CCS2_CCS3_INTR_MASK, ~0);
 
        intel_uncore_write(uncore, GEN11_GPM_WGBOXPERF_INTR_ENABLE, 0);
        intel_uncore_write(uncore, GEN11_GPM_WGBOXPERF_INTR_MASK,  ~0);
@@ -225,6 +231,8 @@ void gen11_gt_irq_postinstall(struct intel_gt *gt)
        /* Enable RCS, BCS, VCS and VECS class interrupts. */
        intel_uncore_write(uncore, GEN11_RENDER_COPY_INTR_ENABLE, dmask);
        intel_uncore_write(uncore, GEN11_VCS_VECS_INTR_ENABLE, dmask);
+       if (CCS_MASK(gt))
+               intel_uncore_write(uncore, GEN12_CCS_RSVD_INTR_ENABLE, smask);
 
        /* Unmask irqs on RCS, BCS, VCS and VECS engines. */
        intel_uncore_write(uncore, GEN11_RCS0_RSVD_INTR_MASK, ~smask);
@@ -238,6 +246,11 @@ void gen11_gt_irq_postinstall(struct intel_gt *gt)
        intel_uncore_write(uncore, GEN11_VECS0_VECS1_INTR_MASK, ~dmask);
        if (HAS_ENGINE(gt, VECS2) || HAS_ENGINE(gt, VECS3))
                intel_uncore_write(uncore, GEN12_VECS2_VECS3_INTR_MASK, ~dmask);
+       if (HAS_ENGINE(gt, CCS0) || HAS_ENGINE(gt, CCS1))
+               intel_uncore_write(uncore, GEN12_CCS0_CCS1_INTR_MASK, ~dmask);
+       if (HAS_ENGINE(gt, CCS2) || HAS_ENGINE(gt, CCS3))
+               intel_uncore_write(uncore, GEN12_CCS2_CCS3_INTR_MASK, ~dmask);
+
        /*
         * RPS interrupts will get enabled/disabled on demand when RPS itself
         * is enabled/disabled.

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index 530807bfe9a059ef6486bfab2207a94a5c977dc0..69b826a3c38132baa61ddbb0afb851d514d1cc02 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -1468,6 +1468,7 @@
 #define GEN11_GPM_WGBOXPERF_INTR_ENABLE                _MMIO(0x19003c)
 #define GEN11_CRYPTO_RSVD_INTR_ENABLE          _MMIO(0x190040)
 #define GEN11_GUNIT_CSME_INTR_ENABLE           _MMIO(0x190044)
+#define GEN12_CCS_RSVD_INTR_ENABLE             _MMIO(0x190048)
 
 #define GEN11_INTR_IDENTITY_REG(x)             _MMIO(0x190060 + ((x) * 4))
 #define   GEN11_INTR_DATA_VALID                        (1 << 31)
@@ -1493,6 +1494,8 @@
 #define GEN11_GPM_WGBOXPERF_INTR_MASK          _MMIO(0x1900ec)
 #define GEN11_CRYPTO_RSVD_INTR_MASK            _MMIO(0x1900f0)
 #define GEN11_GUNIT_CSME_INTR_MASK             _MMIO(0x1900f4)
+#define GEN12_CCS0_CCS1_INTR_MASK              _MMIO(0x190100)
+#define GEN12_CCS2_CCS3_INTR_MASK              _MMIO(0x190104)
 
 #define GEN12_SFC_DONE(n)                      _MMIO(0x1cc000 + (n) * 0x1000)
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 51417e9b740f4254405620a0f40ced2907da128c..d134838b3458e75854a4b93cff88d0e3154fb091 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1241,6 +1241,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
        ENGINE_INSTANCES_MASK(gt, VCS0, I915_MAX_VCS)
 #define VEBOX_MASK(gt) \
        ENGINE_INSTANCES_MASK(gt, VECS0, I915_MAX_VECS)
+#define CCS_MASK(gt) \
+       ENGINE_INSTANCES_MASK(gt, CCS0, I915_MAX_CCS)
 
 /*
  * The Gen7 cmdparser copies the scanned buffer to the ggtt for execution