drm/xe: GSC forcewake support

The ID for the GSC forcewake domain already exists, but we're missing
the register definitions and the domain intialization, so add that in.

v2: move reg definition to be in address order (Matt)

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230817201831.1583172-6-daniele.ceraolospurio@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/regs/xe_gt_regs.h b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
index b6e870302cc7bc4b110ab90b5f55df7624fca7e0..51d59e1229be7d2e32e4853a74989a05a9f5944b 100644 (file)
--- a/drivers/gpu/drm/xe/regs/xe_gt_regs.h
+++ b/drivers/gpu/drm/xe/regs/xe_gt_regs.h
@@ -39,6 +39,7 @@
 #define   GMD_ID_RELEASE_MASK                  REG_GENMASK(21, 14)
 #define   GMD_ID_REVID                         REG_GENMASK(5, 0)
 
+#define FORCEWAKE_ACK_GSC                      XE_REG(0xdf8)
 #define FORCEWAKE_ACK_GT_MTL                   XE_REG(0xdfc)
 
 /* L3 Cache Control */
@@ -256,6 +257,7 @@
 #define FORCEWAKE_RENDER                       XE_REG(0xa278)
 #define FORCEWAKE_MEDIA_VDBOX(n)               XE_REG(0xa540 + (n) * 4)
 #define FORCEWAKE_MEDIA_VEBOX(n)               XE_REG(0xa560 + (n) * 4)
+#define FORCEWAKE_GSC                          XE_REG(0xa618)
 
 #define XEHPC_LNCFMISCCFGREG0                  XE_REG_MCR(0xb01c, XE_REG_OPTION_MASKED)
 #define   XEHPC_OVRLSCCC                       REG_BIT(0)

diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c
index e563de862581470685a19acf18c67e15d9d796e7..ef7279e0b006ce54a80f3526592b3f8c12e8c0c8 100644 (file)
--- a/drivers/gpu/drm/xe/xe_force_wake.c
+++ b/drivers/gpu/drm/xe/xe_force_wake.c
@@ -97,6 +97,13 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw)
                            FORCEWAKE_ACK_MEDIA_VEBOX(j),
                            BIT(0), BIT(16));
        }
+
+       if (gt->info.engine_mask & BIT(XE_HW_ENGINE_GSCCS0))
+               domain_init(&fw->domains[XE_FW_DOMAIN_ID_GSC],
+                           XE_FW_DOMAIN_ID_GSC,
+                           FORCEWAKE_GSC,
+                           FORCEWAKE_ACK_GSC,
+                           BIT(0), BIT(16));
 }
 
 static void domain_wake(struct xe_gt *gt, struct xe_force_wake_domain *domain)