[PATCH 2/8] guc-stack-is-already-accounted-for

[Michał Winiarski]

---
 drivers/gpu/drm/i915/intel_wopcm.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 42876f8890e7..013315b6eece 100644
--- a/drivers/gpu/drm/i915/intel_wopcm.c
+++ b/drivers/gpu/drm/i915/intel_wopcm.c
@@ -23,9 +23,9 @@
  *   |    GuC    |                    |
  *   |   WOPCM   |                    |
  *   |    Size   +--------------------+
+ *   |     |     |                    |
  * WOPCM   |     |    GuC FW RSVD     |
- *   |     |     +--------------------+
- *   |     |     |   GuC Stack RSVD   |
+ *   |     |     |                    |
  *   |     |     +------------------- +
  *   |     v     |   GuC WOPCM RSVD   |
  *   |     +===> +====================+ <== GuC WOPCM base
@@ -46,8 +46,6 @@
 
 /* 16KB reserved at the beginning of GuC WOPCM. */
 #define GUC_WOPCM_RESERVED		(16 * 1024)
-/* 8KB from GUC_WOPCM_RESERVED is reserved for GuC stack. */
-#define GUC_WOPCM_STACK_RESERVED	(8 * 1024)
 
 /* GuC WOPCM Offset value needs to be aligned to 16KB. */
 #define GUC_WOPCM_OFFSET_ALIGNMENT	(1UL << GUC_WOPCM_OFFSET_SHIFT)
@@ -158,7 +156,6 @@ int intel_wopcm_init(struct intel_wopcm *wopcm)
 	u32 ctx_rsvd = context_reserved_size(i915);
 	u32 guc_wopcm_base;
 	u32 guc_wopcm_size;
-	u32 guc_wopcm_rsvd;
 	int err;
 
 	GEM_BUG_ON(!wopcm->size);
@@ -177,10 +174,9 @@ int intel_wopcm_init(struct intel_wopcm *wopcm)
 	DRM_DEBUG_DRIVER("Calculated GuC WOPCM Region: [%uKiB, %uKiB)\n",
 			 guc_wopcm_base / 1024, guc_wopcm_size / 1024);
 
-	guc_wopcm_rsvd = GUC_WOPCM_RESERVED + GUC_WOPCM_STACK_RESERVED;
-	if ((guc_fw_size + guc_wopcm_rsvd) > guc_wopcm_size) {
+	if ((guc_fw_size + GUC_WOPCM_RESERVED) > guc_wopcm_size) {
 		DRM_ERROR("Need %uKiB WOPCM for GuC, %uKiB available.\n",
-			  (guc_fw_size + guc_wopcm_rsvd) / 1024,
+			  (guc_fw_size + GUC_WOPCM_RESERVED) / 1024,
 			  guc_wopcm_size / 1024);
 		return -E2BIG;
 	}
-- 
2.14.3