[PATCH v3 2/4] drm/i915/guc: Adds WOPCM partitioning support for CNL.

[Jackie Li]

CNL has different WOPCM size and hardware restriction on GuC
WOPCM size.

This patch returns the correct WOPCM reserved size on CNL and
adds the GuC WOPCM size check for CNL.

Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble at intel.com>
Cc: John Spotswood <john.a.spotswood at intel.com>
Cc: Jeff McGee <jeff.mcgee at intel.com>
Signed-off-by: Jackie Li <yaodong.li at intel.com>
---
 drivers/gpu/drm/i915/intel_guc.c     |  3 +++
 drivers/gpu/drm/i915/intel_guc_reg.h |  4 ++++
 drivers/gpu/drm/i915/intel_uc.c      | 27 +++++++++++++++++++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index 6d62428..d73eec8 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -379,6 +379,9 @@ static inline u32 guc_reserved_wopcm_size(struct intel_guc *guc)
 	if (IS_GEN9_LP(i915))
 		return BXT_WOPCM_RC6_RESERVED;
 
+	if (IS_GEN10(i915))
+		return CNL_WOPCM_RESERVED;
+
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/i915/intel_guc_reg.h b/drivers/gpu/drm/i915/intel_guc_reg.h
index 419d922..33cb70d 100644
--- a/drivers/gpu/drm/i915/intel_guc_reg.h
+++ b/drivers/gpu/drm/i915/intel_guc_reg.h
@@ -89,9 +89,13 @@
 #define GUC_WOPCM_STACK_RESERVED	(0x2000)
 /* 24KB WOPCM reserved for RC6 CTX on BXT */
 #define BXT_WOPCM_RC6_RESERVED		(0x6000)
+/* 36KB WOPCM reserved on CNL */
+#define CNL_WOPCM_RESERVED		(0x9000)
+
 
 #define GEN9_GUC_WOPCM_DELTA		4
 #define GEN9_GUC_WOPCM_OFFSET		(0x24000)
+#define GEN10_GUC_WOPCM_OFFSET		(0x4000)
 
 #define GEN8_GT_PM_CONFIG		_MMIO(0x138140)
 #define GEN9LP_GT_PM_CONFIG		_MMIO(0x138140)
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 4f964b1..099c7ce 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -108,12 +108,28 @@ static inline int gen9_wocpm_size_check(struct drm_i915_private *i915)
 	return 0;
 }
 
+static inline int cnl_a0_wopcm_size_check(struct drm_i915_private *i915)
+{
+	struct guc_wopcm_partition *wp = &i915->guc.wopcm;
+	u32 huc_size = intel_uc_fw_get_size(&i915->huc.fw);
+
+	/*
+	 * On CNL A0, hardware requires guc size to be larger than or equal to
+	 * HuC kernel size.
+	 */
+	if ((wp->size - GEN10_GUC_WOPCM_OFFSET) < huc_size)
+		return -E2BIG;
+
+	return 0;
+}
+
 static int intel_uc_wopcm_partition_init(struct drm_i915_private *i915)
 {
 	struct intel_guc *guc = &i915->guc;
 	struct intel_huc *huc = &i915->huc;
 	u32 guc_size = intel_uc_fw_get_size(&guc->fw);
 	u32 huc_size = intel_uc_fw_get_size(&huc->fw);
+	int (*wopcm_size_check)(struct drm_i915_private *i915);
 	int err;
 
 	if (!i915_modparams.enable_guc_loading)
@@ -128,8 +144,15 @@ static int intel_uc_wopcm_partition_init(struct drm_i915_private *i915)
 		goto fail;
 
 	/* Platform specific restrictions */
-	if (IS_GEN9(i915)) {
-		err = gen9_wocpm_size_check(i915);
+	if (IS_GEN9(i915))
+		wopcm_size_check = gen9_wocpm_size_check;
+	else if (IS_CNL_REVID(i915, CNL_REVID_A0, CNL_REVID_A0))
+		wopcm_size_check = cnl_a0_wopcm_size_check;
+	else
+		wopcm_size_check = NULL;
+
+	if (wopcm_size_check) {
+		err = wopcm_size_check(i915);
 		if (err)
 			goto fail;
 	}
-- 
2.7.4