Skip to contentSkip to conversation

drm/i915/guc: Get rid of the enable_guc_loading module parameter

PATCH In review Oscar Mateo 4 participants 7 messages May 5, 2017 – May 31, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915/guc: Get rid of the enable_guc_loading module parameter

The decission to enable GuC loading shouldn't be left to the user. Provided the HW supports the GuC, there are only two reasons to load it:

- The user has requested GuC submission.
- We have a HuC firmware available (so we need the GuC to validate it).

We leave the enable_guc_submission parameter untouched ("auto", "never", "if supported", "required") but make its behavior a little bit more consistent. Also, if not really required, we do not try to fetch any firmware.

Cc Anusha Srivatsa <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c     | 10 ++++--
 drivers/gpu/drm/i915/i915_drv.c         |  2 +-
 drivers/gpu/drm/i915/i915_drv.h         | 16 +++++----
 drivers/gpu/drm/i915/i915_gem_context.c |  2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c     |  2 +-
 drivers/gpu/drm/i915/i915_irq.c         |  2 +-
 drivers/gpu/drm/i915/i915_params.c      |  6 ----
 drivers/gpu/drm/i915/i915_params.h      |  2 --
 drivers/gpu/drm/i915/intel_guc_loader.c | 48 +++++++++++++++++++++++----
 drivers/gpu/drm/i915/intel_huc.c        |  5 +--
 drivers/gpu/drm/i915/intel_uc.c         | 58 +++++++++------------------------
 drivers/gpu/drm/i915/intel_uc.h         |  4 +--
 drivers/gpu/drm/i915/intel_uncore.c     |  3 +-
 13 files changed, 82 insertions(+), 78 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -3
index 870c470..e030b41 100644
@@ -2366,8 +2366,10 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
 
-	if (!HAS_HUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No HuC support in HW\n");
 		return 0;
+	}
 
 	seq_puts(m, "HuC firmware status:\n");
 	seq_printf(m, "\tpath: %s\n", huc_fw->path);
@@ -2399,8 +2401,10 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)
 	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
 	u32 tmp, i;
 
-	if (!HAS_GUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No GuC support in HW\n");
 		return 0;
+	}
 
 	seq_printf(m, "GuC firmware status:\n");
 	seq_printf(m, "\tpath: %s\n",
@@ -2504,7 +2508,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
 
 	if (!guc->execbuf_client) {
 		seq_printf(m, "GuC submission %s\n",
-			   HAS_GUC_SCHED(dev_priv) ?
+			   HAS_GUC(dev_priv) ?
 			   "disabled" :
 			   "not supported");
 		return 0;
drivers/gpu/drm/i915/i915_drv.c +1 -1
index 72fb47a..006ed91 100644
@@ -996,7 +996,7 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)
 	i915.semaphores = intel_sanitize_semaphores(dev_priv, i915.semaphores);
 	DRM_DEBUG_DRIVER("use GPU semaphores? %s\n", yesno(i915.semaphores));
 
-	intel_uc_sanitize_options(dev_priv);
+	intel_guc_sanitize_submission(dev_priv);
 }
 
 /**
drivers/gpu/drm/i915/i915_drv.h +9 -7
index b20ed16..5d00120 100644
@@ -2921,15 +2921,17 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)
 #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc)
 
+#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
+#define HAS_GUC_UCODE(dev_priv)	((dev_priv)->guc.fw.path != NULL)
+#define HAS_HUC_UCODE(dev_priv)	((dev_priv)->huc.fw.path != NULL)
+
 /*
- * For now, anything with a GuC requires uCode loading, and then supports
- * command submission once loaded. But these are logically independent
- * properties, so we have separate macros to test them.
+ * Only two things require us to load the GuC firmware: either we want
+ * to enable GuC submission or we need it to to validate a HuC firmware
  */
-#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
-#define HAS_GUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_GUC_SCHED(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_HUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
+#define NEEDS_GUC_LOADING(dev_priv) \
+	(HAS_GUC(dev_priv) && \
+	(i915.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))
 
 #define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)
 
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index 31a73c3..a9f825b 100644
@@ -237,7 +237,7 @@ static u32 default_desc_template(const struct drm_i915_private *i915,
 	 * present or not in use we still need a small bias as ring wraparound
 	 * at offset 0 sometimes hangs. No idea why.
 	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading)
+	if (NEEDS_GUC_LOADING(dev_priv))
 		ctx->ggtt_offset_bias = GUC_WOPCM_TOP;
 	else
 		ctx->ggtt_offset_bias = I915_GTT_PAGE_SIZE;
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index 8bab4ae..283d7e5 100644
@@ -2897,7 +2897,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)
 	 * currently don't have any bits spare to pass in this upper
 	 * restriction!
 	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading) {
+	if (NEEDS_GUC_LOADING(dev_priv)) {
 		ggtt->base.total = min_t(u64, ggtt->base.total, GUC_GGTT_TOP);
 		ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total);
 	}
drivers/gpu/drm/i915/i915_irq.c +1 -1
index c99f51c..75cd0a9 100644
@@ -4240,7 +4240,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
 	for (i = 0; i < MAX_L3_SLICES; ++i)
 		dev_priv->l3_parity.remap_info[i] = NULL;
 
-	if (HAS_GUC_SCHED(dev_priv))
+	if (NEEDS_GUC_LOADING(dev_priv))
 		dev_priv->pm_guc_events = GEN9_GUC_TO_HOST_INT_EVENT;
 
 	/* Let's track the enabled rps events */
drivers/gpu/drm/i915/i915_params.c +0 -6
index b6a7e36..f90b7c1 100644
@@ -56,7 +56,6 @@ struct i915_params i915 __read_mostly = {
 	.verbose_state_checks = 1,
 	.nuclear_pageflip = 0,
 	.edp_vswing = 0,
-	.enable_guc_loading = 0,
 	.enable_guc_submission = 0,
 	.guc_log_level = -1,
 	.guc_firmware_path = NULL,
@@ -218,11 +217,6 @@ struct i915_params i915 __read_mostly = {
 		 "(0=use value from vbt [default], 1=low power swing(200mV),"
 		 "2=default swing(400mV))");
 
-module_param_named_unsafe(enable_guc_loading, i915.enable_guc_loading, int, 0400);
-MODULE_PARM_DESC(enable_guc_loading,
-		"Enable GuC firmware loading "
-		"(-1=auto, 0=never [default], 1=if available, 2=required)");
-
 module_param_named_unsafe(enable_guc_submission, i915.enable_guc_submission, int, 0400);
 MODULE_PARM_DESC(enable_guc_submission,
 		"Enable GuC submission "
drivers/gpu/drm/i915/i915_params.h +0 -2
index 34148cc..33e12f6 100644
@@ -43,7 +43,6 @@
 	func(int, disable_power_well); \
 	func(int, enable_ips); \
 	func(int, invert_brightness); \
-	func(int, enable_guc_loading); \
 	func(int, enable_guc_submission); \
 	func(int, guc_log_level); \
 	func(char *, guc_firmware_path); \
@@ -78,4 +77,3 @@ struct i915_params {
 extern struct i915_params i915 __read_mostly;
 
 #endif
-
drivers/gpu/drm/i915/intel_guc_loader.c +41 -7

63 lines not on this page · raw message

drivers/gpu/drm/i915/intel_huc.c +3 -2
index 88b4cf3..49a6d88 100644
@@ -176,7 +176,9 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
-		DRM_ERROR("No HuC firmware known for platform with HuC!\n");
+		/* For now, everything with a GuC also has a HuC */
+		if (HAS_GUC(dev_priv))
+			DRM_ERROR("No HuC FW known for a platform with HuC!\n");
 		return;
 	}
 }
@@ -275,4 +277,3 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
 out:
 	i915_vma_unpin(vma);
 }
-
drivers/gpu/drm/i915/intel_uc.c +15 -43

94 lines not on this page · raw message

drivers/gpu/drm/i915/intel_uc.h +2 -2
index 1e0eecd..2da4845 100644
@@ -220,7 +220,6 @@ struct intel_huc {
 };
 
 /* intel_uc.c */
-void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);
 void intel_uc_init_early(struct drm_i915_private *dev_priv);
 void intel_uc_init_fw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
@@ -235,13 +234,14 @@ static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 l
 }
 
 /* intel_guc_loader.c */
-int intel_guc_select_fw(struct intel_guc *guc);
+void intel_guc_select_fw(struct intel_guc *guc);
 int intel_guc_init_hw(struct intel_guc *guc);
 int intel_guc_suspend(struct drm_i915_private *dev_priv);
 int intel_guc_resume(struct drm_i915_private *dev_priv);
 u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);
 
 /* i915_guc_submission.c */
+void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv);
 int i915_guc_submission_init(struct drm_i915_private *dev_priv);
 int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
 int i915_guc_wq_reserve(struct drm_i915_gem_request *rq);
drivers/gpu/drm/i915/intel_uncore.c +1 -2
index aa9d306..7084088 100644
@@ -1762,8 +1762,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)
 {
 	int ret;
 
-	if (!HAS_GUC(dev_priv))
-		return -EINVAL;
+	GEM_BUG_ON(!HAS_UC(dev_priv));
 
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 	ret = gen6_hw_domain_reset(dev_priv, GEN9_GRDOM_GUC);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

RFC PATCH 2/2 drm/i915/guc: Rename has_guc to has_uc

AFAIK, every platform with a HuC has a GuC and viceversa, so make it explicit.

Cc Anusha Srivatsa <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
CC Arkadiusz Hiler <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c     |  6 +++---
 drivers/gpu/drm/i915/i915_drv.h         |  6 +++---
 drivers/gpu/drm/i915/i915_pci.c         | 10 +++++-----
 drivers/gpu/drm/i915/intel_guc_loader.c |  4 ++--
 drivers/gpu/drm/i915/intel_huc.c        |  3 +--
 drivers/gpu/drm/i915/intel_pm.c         |  2 +-
 drivers/gpu/drm/i915/intel_uc.c         |  2 +-
 7 files changed, 16 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -3
index e030b41..4538a5b 100644
@@ -2366,7 +2366,7 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
 
-	if (!HAS_GUC(dev_priv)) {
+	if (!HAS_UC(dev_priv)) {
 		seq_puts(m, "No HuC support in HW\n");
 		return 0;
 	}
@@ -2401,7 +2401,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)
 	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
 	u32 tmp, i;
 
-	if (!HAS_GUC(dev_priv)) {
+	if (!HAS_UC(dev_priv)) {
 		seq_puts(m, "No GuC support in HW\n");
 		return 0;
 	}
@@ -2508,7 +2508,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
 
 	if (!guc->execbuf_client) {
 		seq_printf(m, "GuC submission %s\n",
-			   HAS_GUC(dev_priv) ?
+			   HAS_UC(dev_priv) ?
 			   "disabled" :
 			   "not supported");
 		return 0;
drivers/gpu/drm/i915/i915_drv.h +3 -3
index 5d00120..a4d4ac6 100644
@@ -820,7 +820,7 @@ struct intel_csr {
 	func(has_full_48bit_ppgtt); \
 	func(has_gmbus_irq); \
 	func(has_gmch_display); \
-	func(has_guc); \
+	func(has_uc); \
 	func(has_hotplug); \
 	func(has_l3_dpf); \
 	func(has_llc); \
@@ -2921,7 +2921,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)
 #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc)
 
-#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
+#define HAS_UC(dev_priv)	((dev_priv)->info.has_uc)
 #define HAS_GUC_UCODE(dev_priv)	((dev_priv)->guc.fw.path != NULL)
 #define HAS_HUC_UCODE(dev_priv)	((dev_priv)->huc.fw.path != NULL)
 
@@ -2930,7 +2930,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
  * to enable GuC submission or we need it to to validate a HuC firmware
  */
 #define NEEDS_GUC_LOADING(dev_priv) \
-	(HAS_GUC(dev_priv) && \
+	(HAS_UC(dev_priv) && \
 	(i915.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))
 
 #define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)
drivers/gpu/drm/i915/i915_pci.c +5 -5
index f80db2c..261ed3a 100644
@@ -352,7 +352,7 @@
 	.platform = INTEL_SKYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 };
 
@@ -361,7 +361,7 @@
 	.platform = INTEL_SKYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
 };
@@ -384,7 +384,7 @@
 	.has_dp_mst = 1, \
 	.has_gmbus_irq = 1, \
 	.has_logical_ring_contexts = 1, \
-	.has_guc = 1, \
+	.has_uc = 1, \
 	.has_decoupled_mmio = 1, \
 	.has_aliasing_ppgtt = 1, \
 	.has_full_ppgtt = 1, \
@@ -412,7 +412,7 @@
 	.platform = INTEL_KABYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 };
 
@@ -421,7 +421,7 @@
 	.platform = INTEL_KABYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
 };
drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
index 762f0f2..ffe7fb5a 100644
@@ -378,7 +378,7 @@ int intel_guc_init_hw(struct intel_guc *guc)
 void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv)
 {
 	/* Verify hardware support */
-	if (!HAS_GUC(dev_priv)) {
+	if (!HAS_UC(dev_priv)) {
 		if (i915.enable_guc_submission > 0)
 			DRM_INFO("Ignoring GuC submission enable, no HW\n");
 		i915.enable_guc_submission = 0;
@@ -446,7 +446,7 @@ void intel_guc_select_fw(struct intel_guc *guc)
 		guc->fw.major_ver_wanted = GLK_FW_MAJOR;
 		guc->fw.minor_ver_wanted = GLK_FW_MINOR;
 	} else {
-		if (HAS_GUC(dev_priv))
+		if (HAS_UC(dev_priv))
 			DRM_ERROR("No GuC FW known for a platform with GuC!\n");
 		return;
 	}
drivers/gpu/drm/i915/intel_huc.c +1 -2
index 49a6d88..19191b2 100644
@@ -176,8 +176,7 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
-		/* For now, everything with a GuC also has a HuC */
-		if (HAS_GUC(dev_priv))
+		if (HAS_UC(dev_priv))
 			DRM_ERROR("No HuC FW known for a platform with HuC!\n");
 		return;
 	}
drivers/gpu/drm/i915/intel_pm.c +1 -1
index cacb65f..50bdf2e 100644
@@ -5690,7 +5690,7 @@ static void gen9_enable_rc6(struct drm_i915_private *dev_priv)
 	for_each_engine(engine, dev_priv, id)
 		I915_WRITE(RING_MAX_IDLE(engine->mmio_base), 10);
 
-	if (HAS_GUC(dev_priv))
+	if (HAS_UC(dev_priv))
 		I915_WRITE(GUC_MAX_IDLE_COUNT, 0xA);
 
 	I915_WRITE(GEN6_RC_SLEEP, 0);
drivers/gpu/drm/i915/intel_uc.c +1 -1
index 2f1f79b..f126d7e 100644
@@ -211,7 +211,7 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv,
 
 void intel_uc_init_fw(struct drm_i915_private *dev_priv)
 {
-	if (!HAS_GUC(dev_priv))
+	if (!HAS_UC(dev_priv))
 		return;
 
 	fetch_uc_fw(dev_priv, &dev_priv->huc.fw);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Re: [PATCH RFC 2/2] drm/i915/guc: Rename has_guc to has_uc

Quoted 12 lines

-----Original Message-----
From: Mateo Lozano, Oscar
Sent: Friday, May 5, 2017 6:23 AM
To: [email protected]
Cc: Mateo Lozano, Oscar <[email protected]>; Srivatsa, Anusha <[email protected]>; Ceraolo Spurio, Daniele <[email protected]>; Chris Wilson <[email protected]>; Hiler, Arkadiusz <[email protected]>
Subject: [PATCH RFC 2/2] drm/i915/guc: Rename has_guc to has_uc

Quoted 1 line

AFAIK, every platform with a HuC has a GuC and viceversa, so make it explicit.

I personally like the has_guc more than has_uc. It makes it easier while reading the code. But that my opinion. It is not a strong negation. If majority folks feel this is a cleaner approach then we can go ahead and change.

Anusha

Quoted 197 lines
Cc Anusha Srivatsa <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
CC Arkadiusz Hiler <[email protected]>

---

drivers/gpu/drm/i915/i915_debugfs.c     |  6 +++---
drivers/gpu/drm/i915/i915_drv.h         |  6 +++---
drivers/gpu/drm/i915/i915_pci.c         | 10 +++++-----
drivers/gpu/drm/i915/intel_guc_loader.c |  4 ++--
drivers/gpu/drm/i915/intel_huc.c        |  3 +--
drivers/gpu/drm/i915/intel_pm.c         |  2 +-
drivers/gpu/drm/i915/intel_uc.c         |  2 +-
7 files changed, 16 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
index e030b41..4538a5b 100644
@@ -2366,7 +2366,7 @@ static int i915_huc_load_status_info(struct seq_file
 *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
 
-	if (!HAS_GUC(dev_priv)) {
+	if (!HAS_UC(dev_priv)) {
 		seq_puts(m, "No HuC support in HW\n");
 		return 0;
	}
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -2401,7 +2401,7 @@ static int i915_guc_load_status_info(struct seq_file
 *m, void *data)
 	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
 	u32 tmp, i;
 
-	if (!HAS_GUC(dev_priv)) {
+	if (!HAS_UC(dev_priv)) {
 		seq_puts(m, "No GuC support in HW\n");
 		return 0;
	}
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -2508,7 +2508,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
 
 	if (!guc->execbuf_client) {
 		seq_printf(m, "GuC submission %s\n",
-			   HAS_GUC(dev_priv) ?
+			   HAS_UC(dev_priv) ?
 			   "disabled" :
 			   "not supported");
 		return 0;
drivers/gpu/drm/i915/i915_drv.h +1 -1
index 5d00120..a4d4ac6 100644
@@ -820,7 +820,7 @@ struct intel_csr {
 	func(has_full_48bit_ppgtt); \
 	func(has_gmbus_irq); \
 	func(has_gmch_display); \
-	func(has_guc); \
+	func(has_uc); \
 	func(has_hotplug); \
 	func(has_l3_dpf); \
 	func(has_llc); \
@@ -2921,7 +2921,7 @@ static inline struct scatterlist *__sg_next(struct

scatterlist *sg) #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)-

Quoted 2 lines

info.has_runtime_pm) #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)- info.has_64bit_reloc)

drivers/gpu/drm/i915/i915_drv.h +1 -1
-#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
+#define HAS_UC(dev_priv)	((dev_priv)->info.has_uc)

#define HAS_GUC_UCODE(dev_priv) ((dev_priv)->guc.fw.path != NULL)
#define HAS_HUC_UCODE(dev_priv) ((dev_priv)->huc.fw.path != NULL)

drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -2930,7 +2930,7 @@ static inline struct scatterlist *__sg_next(struct
 scatterlist *sg)
 * to enable GuC submission or we need it to to validate a HuC firmware
 */
 #define NEEDS_GUC_LOADING(dev_priv) \
-	(HAS_GUC(dev_priv) && \
+	(HAS_UC(dev_priv) && \
 	(i915.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))
 

#define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)-

Quoted 1 line

info.has_resource_streamer)

drivers/gpu/drm/i915/i915_pci.c +2 -2
index f80db2c..261ed3a 100644
@@ -352,7 +352,7 @@
 	.platform = INTEL_SKYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 };
 
@@ -361,7 +361,7 @@
 	.platform = INTEL_SKYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |

BSD2_RING, }; @@ -384,7 +384,7 @@

	.has_dp_mst = 1, \
	.has_gmbus_irq = 1, \
	.has_logical_ring_contexts = 1, \
drivers/gpu/drm/i915/i915_pci.c +1 -1
-	.has_guc = 1, \
+	.has_uc = 1, \
	.has_decoupled_mmio = 1, \
	.has_aliasing_ppgtt = 1, \
	.has_full_ppgtt = 1, \
drivers/gpu/drm/i915/i915_pci.c +2 -2
@@ -412,7 +412,7 @@
 	.platform = INTEL_KABYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 };
 
@@ -421,7 +421,7 @@
 	.platform = INTEL_KABYLAKE,
 	.gen = 9,
 	.has_csr = 1,
-	.has_guc = 1,
+	.has_uc = 1,
 	.ddb_size = 896,
 	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING |

BSD2_RING, }; diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 762f0f2..ffe7fb5a 100644

drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
@@ -378,7 +378,7 @@ int intel_guc_init_hw(struct intel_guc *guc)  void
 intel_guc_sanitize_submission(struct drm_i915_private *dev_priv)  {
 	/* Verify hardware support */
-	if (!HAS_GUC(dev_priv)) {
+	if (!HAS_UC(dev_priv)) {
 		if (i915.enable_guc_submission > 0)
 			DRM_INFO("Ignoring GuC submission enable, no
 HW\n");
 		i915.enable_guc_submission = 0;
@@ -446,7 +446,7 @@ void intel_guc_select_fw(struct intel_guc *guc)
 		guc->fw.major_ver_wanted = GLK_FW_MAJOR;
 		guc->fw.minor_ver_wanted = GLK_FW_MINOR;
 	} else {
-		if (HAS_GUC(dev_priv))
+		if (HAS_UC(dev_priv))
 			DRM_ERROR("No GuC FW known for a platform with
 GuC!\n");
 		return;
	}
drivers/gpu/drm/i915/intel_huc.c +1 -2
index 49a6d88..19191b2 100644
@@ -176,8 +176,7 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
-		/* For now, everything with a GuC also has a HuC */
-		if (HAS_GUC(dev_priv))
+		if (HAS_UC(dev_priv))
 			DRM_ERROR("No HuC FW known for a platform with
 HuC!\n");
 		return;
	}
drivers/gpu/drm/i915/intel_pm.c +1 -1
index cacb65f..50bdf2e 100644
@@ -5690,7 +5690,7 @@ static void gen9_enable_rc6(struct drm_i915_private
 *dev_priv)
 	for_each_engine(engine, dev_priv, id)
 		I915_WRITE(RING_MAX_IDLE(engine->mmio_base), 10);
 
-	if (HAS_GUC(dev_priv))
+	if (HAS_UC(dev_priv))
 		I915_WRITE(GUC_MAX_IDLE_COUNT, 0xA);
 
	I915_WRITE(GEN6_RC_SLEEP, 0);
drivers/gpu/drm/i915/intel_uc.c +1 -2
index 2f1f79b..f126d7e 100644
@@ -211,7 +211,7 @@ static void fetch_uc_fw(struct drm_i915_private
 *dev_priv,
 
 void intel_uc_init_fw(struct drm_i915_private *dev_priv)  {
-	if (!HAS_GUC(dev_priv))
+	if (!HAS_UC(dev_priv))
 		return;
 
 	fetch_uc_fw(dev_priv, &dev_priv->huc.fw);
--
Quoted 1 line

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/guc: Get rid of the enable_guc_loading module parameter

In reply to Oscar Mateo
== Series Details ==

== Series Details ==

Series: series starting with [1/2] drm/i915/guc: Get rid of the enable_guc_loading module parameter
URL : https://patchwork.freedesktop.org/series/24048/
State : success

== Summary ==

Series 24048v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/24048/revisions/1/mbox/

Test gem_exec_flush:

        Subgroup basic-batch-kernel-default-uc:
                fail       -> PASS       (fi-snb-2600) fdo#100007

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:431s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:426s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:582s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:507s
fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time:557s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:490s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:478s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:411s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:410s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:413s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:502s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:487s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:467s
fi-kbl-7560u     total:278  pass:267  dwarn:1   dfail:0   fail:0   skip:10  time:568s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:454s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time:573s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:454s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:495s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:429s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:532s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:410s

fb550f86433515f36a0de161631541ec114581e3 drm-tip: 2017y-05m-05d-18h-33m-52s UTC integration manifest 90ca756 drm/i915/guc: Rename has_guc to has_uc
8b1782e drm/i915/guc: Get rid of the enable_guc_loading module parameter

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4632/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by on v1 1/2
#4 lore raw
In reply to Oscar Mateo

I like the approach.

BR,
Anusha

Quoted 16 lines

-----Original Message-----
From: Mateo Lozano, Oscar
Sent: Friday, May 5, 2017 6:23 AM
To: [email protected]
Cc: Mateo Lozano, Oscar <[email protected]>; Srivatsa, Anusha <[email protected]>; Ceraolo Spurio, Daniele <[email protected]>; Chris Wilson <[email protected]>
Subject: [PATCH 1/2] drm/i915/guc: Get rid of the enable_guc_loading module parameter

The decission to enable GuC loading shouldn't be left to the user. Provided the HW supports the GuC, there are only two reasons to load it:

- The user has requested GuC submission.
- We have a HuC firmware available (so we need the GuC to validate it).

Quoted 8 lines

We leave the enable_guc_submission parameter untouched ("auto", "never", "if supported", "required") but make its behavior a little bit more consistent. Also, if not really required, we do not try to fetch any firmware.

Cc Anusha Srivatsa <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
Quoted 427 lines
drivers/gpu/drm/i915/i915_debugfs.c     | 10 ++++--
drivers/gpu/drm/i915/i915_drv.c         |  2 +-
drivers/gpu/drm/i915/i915_drv.h         | 16 +++++----
drivers/gpu/drm/i915/i915_gem_context.c |  2 +-
drivers/gpu/drm/i915/i915_gem_gtt.c     |  2 +-
drivers/gpu/drm/i915/i915_irq.c         |  2 +-
drivers/gpu/drm/i915/i915_params.c      |  6 ----
drivers/gpu/drm/i915/i915_params.h      |  2 --
drivers/gpu/drm/i915/intel_guc_loader.c | 48 +++++++++++++++++++++++----
drivers/gpu/drm/i915/intel_huc.c        |  5 +--
drivers/gpu/drm/i915/intel_uc.c         | 58 +++++++++------------------------
drivers/gpu/drm/i915/intel_uc.h         |  4 +--
drivers/gpu/drm/i915/intel_uncore.c     |  3 +-
13 files changed, 82 insertions(+), 78 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +3 -1
index 870c470..e030b41 100644
@@ -2366,8 +2366,10 @@ static int i915_huc_load_status_info(struct seq_file
 *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
 
-	if (!HAS_HUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No HuC support in HW\n");
 		return 0;
+	}
 
 	seq_puts(m, "HuC firmware status:\n");
	seq_printf(m, "\tpath: %s\n", huc_fw->path); @@ -2399,8 +2401,10 @@
static int i915_guc_load_status_info(struct seq_file *m, void *data)
	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
	u32 tmp, i;
drivers/gpu/drm/i915/i915_debugfs.c +2 -1
-	if (!HAS_GUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No GuC support in HW\n");
		return 0;
drivers/gpu/drm/i915/i915_debugfs.c +1 -0
+	}
	seq_printf(m, "GuC firmware status:\n");
	seq_printf(m, "\tpath: %s\n",
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -2504,7 +2508,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
 
 	if (!guc->execbuf_client) {
 		seq_printf(m, "GuC submission %s\n",
-			   HAS_GUC_SCHED(dev_priv) ?
+			   HAS_GUC(dev_priv) ?
 			   "disabled" :
 			   "not supported");
 		return 0;
drivers/gpu/drm/i915/i915_drv.c +1 -1
index 72fb47a..006ed91 100644
@@ -996,7 +996,7 @@ static void intel_sanitize_options(struct drm_i915_private
 *dev_priv)
 	i915.semaphores = intel_sanitize_semaphores(dev_priv,
 i915.semaphores);
 	DRM_DEBUG_DRIVER("use GPU semaphores? %s\n",
 yesno(i915.semaphores));
 
-	intel_uc_sanitize_options(dev_priv);
+	intel_guc_sanitize_submission(dev_priv);

}

/**

drivers/gpu/drm/i915/i915_drv.h +0 -0
index b20ed16..5d00120 100644
@@ -2921,15 +2921,17 @@ static inline struct scatterlist *__sg_next(struct

scatterlist *sg) #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)-

Quoted 2 lines

info.has_runtime_pm) #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)- info.has_64bit_reloc)

drivers/gpu/drm/i915/i915_drv.h +4 -0
+#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
+#define HAS_GUC_UCODE(dev_priv)	((dev_priv)->guc.fw.path != NULL)
+#define HAS_HUC_UCODE(dev_priv)	((dev_priv)->huc.fw.path != NULL)
+

/*
- * For now, anything with a GuC requires uCode loading, and then supports
- * command submission once loaded. But these are logically independent
- * properties, so we have separate macros to test them.
+ * Only two things require us to load the GuC firmware: either we want
+ * to enable GuC submission or we need it to to validate a HuC firmware */

drivers/gpu/drm/i915/i915_drv.h +3 -4
-#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
-#define HAS_GUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_GUC_SCHED(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_HUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
+#define NEEDS_GUC_LOADING(dev_priv) \
+	(HAS_GUC(dev_priv) && \
+	(i915.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))

#define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)-

Quoted 1 line

info.has_resource_streamer)

drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index 31a73c3..a9f825b 100644
@@ -237,7 +237,7 @@ static u32 default_desc_template(const struct
 drm_i915_private *i915,
 	 * present or not in use we still need a small bias as ring wraparound
 	 * at offset 0 sometimes hangs. No idea why.
 	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading)
+	if (NEEDS_GUC_LOADING(dev_priv))
 		ctx->ggtt_offset_bias = GUC_WOPCM_TOP;
 	else
		ctx->ggtt_offset_bias = I915_GTT_PAGE_SIZE; diff --git

a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 8bab4ae..283d7e5 100644

drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
@@ -2897,7 +2897,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private
 *dev_priv)
 	 * currently don't have any bits spare to pass in this upper
 	 * restriction!
 	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading) {
+	if (NEEDS_GUC_LOADING(dev_priv)) {
 		ggtt->base.total = min_t(u64, ggtt->base.total,
 GUC_GGTT_TOP);
		ggtt->mappable_end = min(ggtt->mappable_end, ggtt-
Quoted 1 line

base.total);

	}
drivers/gpu/drm/i915/i915_irq.c +1 -1
index c99f51c..75cd0a9 100644
@@ -4240,7 +4240,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
 	for (i = 0; i < MAX_L3_SLICES; ++i)
 		dev_priv->l3_parity.remap_info[i] = NULL;
 
-	if (HAS_GUC_SCHED(dev_priv))
+	if (NEEDS_GUC_LOADING(dev_priv))
 		dev_priv->pm_guc_events = GEN9_GUC_TO_HOST_INT_EVENT;
 
 	/* Let's track the enabled rps events */ diff --git

a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index b6a7e36..f90b7c1 100644

drivers/gpu/drm/i915/i915_params.c +0 -5
@@ -56,7 +56,6 @@ struct i915_params i915 __read_mostly = {
 	.verbose_state_checks = 1,
 	.nuclear_pageflip = 0,
 	.edp_vswing = 0,
-	.enable_guc_loading = 0,
 	.enable_guc_submission = 0,
 	.guc_log_level = -1,
 	.guc_firmware_path = NULL,
@@ -218,11 +217,6 @@ struct i915_params i915 __read_mostly = {
 		 "(0=use value from vbt [default], 1=low power swing(200mV),"
 		 "2=default swing(400mV))");
 
-module_param_named_unsafe(enable_guc_loading, i915.enable_guc_loading,
 int, 0400); -MODULE_PARM_DESC(enable_guc_loading,
-		"Enable GuC firmware loading "
-		"(-1=auto, 0=never [default], 1=if available, 2=required)");
-
 module_param_named_unsafe(enable_guc_submission,
 i915.enable_guc_submission, int, 0400);

MODULE_PARM_DESC(enable_guc_submission,
"Enable GuC submission "

drivers/gpu/drm/i915/i915_params.h +0 -2
index 34148cc..33e12f6 100644
@@ -43,7 +43,6 @@
 	func(int, disable_power_well); \
 	func(int, enable_ips); \
 	func(int, invert_brightness); \
-	func(int, enable_guc_loading); \
 	func(int, enable_guc_submission); \
 	func(int, guc_log_level); \
 	func(char *, guc_firmware_path); \
@@ -78,4 +77,3 @@ struct i915_params {
 extern struct i915_params i915 __read_mostly;
 
 #endif
-
drivers/gpu/drm/i915/intel_guc_loader.c +40 -5
index d9045b6..762f0f2 100644
@@ -375,13 +375,48 @@ int intel_guc_init_hw(struct intel_guc *guc)
 	return 0;
 }
 
+void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv) {
+	/* Verify hardware support */
+	if (!HAS_GUC(dev_priv)) {
+		if (i915.enable_guc_submission > 0)
+			DRM_INFO("Ignoring GuC submission enable, no
 HW\n");
+		i915.enable_guc_submission = 0;
+		return;
+	}
+
+	/* Verify firmware support */
+	if (!HAS_GUC_UCODE(dev_priv)) {
+		if (i915.enable_guc_submission == 1) {
+			DRM_INFO("Ignoring GuC submission enable, no FW\n");
+			i915.enable_guc_submission = 0;
+			return;
+		}
+
+		if (i915.enable_guc_submission < 0) {
+			i915.enable_guc_submission = 0;
+			return;
+		}
+
+		/*
+		 * If "required" (> 1), let it continue and we will fail later
+		 * due to the lack of firmware
+		 */
+	}
+
+	/*
+	 * A negative value means "use platform default" (enabled if we have
+	 * survived to get here)
+	 */
+	if (i915.enable_guc_submission < 0)
+		i915.enable_guc_submission = 1;
+}
+
 /**
 * intel_guc_select_fw() - selects GuC firmware for loading
 * @guc:	intel_guc struct
- *
- * Return: zero when we know firmware, non-zero in other case
 */
-int intel_guc_select_fw(struct intel_guc *guc)
+void intel_guc_select_fw(struct intel_guc *guc)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
@@ -411,9 +446,8 @@ int intel_guc_select_fw(struct intel_guc *guc)
 		guc->fw.major_ver_wanted = GLK_FW_MAJOR;
 		guc->fw.minor_ver_wanted = GLK_FW_MINOR;
 	} else {
-		DRM_ERROR("No GuC firmware known for platform with
 GuC!\n");
-		return -ENOENT;
+		if (HAS_GUC(dev_priv))
+			DRM_ERROR("No GuC FW known for a platform with
 GuC!\n");
+		return;
	}
drivers/gpu/drm/i915/intel_guc_loader.c +0 -2
-
-	return 0;

}

drivers/gpu/drm/i915/intel_huc.c +3 -1
index 88b4cf3..49a6d88 100644
@@ -176,7 +176,9 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
-		DRM_ERROR("No HuC firmware known for platform with
 HuC!\n");
+		/* For now, everything with a GuC also has a HuC */
+		if (HAS_GUC(dev_priv))
+			DRM_ERROR("No HuC FW known for a platform with
 HuC!\n");
 		return;
	}
}
drivers/gpu/drm/i915/intel_huc.c +0 -0
@@ -275,4 +277,3 @@ void intel_guc_auth_huc(struct drm_i915_private
 *dev_priv)

out:

	i915_vma_unpin(vma);
}
drivers/gpu/drm/i915/intel_huc.c +0 -1
-
drivers/gpu/drm/i915/intel_uc.c +6 -33
index 7fd75ca..2f1f79b 100644
@@ -60,44 +60,13 @@ static int __intel_uc_reset_hw(struct drm_i915_private
 *dev_priv)
 	return ret;
 }
 
-void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) -{
-	if (!HAS_GUC(dev_priv)) {
-		if (i915.enable_guc_loading > 0 ||
-		    i915.enable_guc_submission > 0)
-			DRM_INFO("Ignoring GuC options, no hardware\n");
-
-		i915.enable_guc_loading = 0;
-		i915.enable_guc_submission = 0;
-		return;
-	}
-
-	/* A negative value means "use platform default" */
-	if (i915.enable_guc_loading < 0)
-		i915.enable_guc_loading = HAS_GUC_UCODE(dev_priv);
-
-	/* Verify firmware version */
-	if (i915.enable_guc_loading) {
-		if (HAS_HUC_UCODE(dev_priv))
-			intel_huc_select_fw(&dev_priv->huc);
-
-		if (intel_guc_select_fw(&dev_priv->guc))
-			i915.enable_guc_loading = 0;
-	}
-
-	/* Can't enable guc submission without guc loaded */
-	if (!i915.enable_guc_loading)
-		i915.enable_guc_submission = 0;
-
-	/* A negative value means "use platform default" */
-	if (i915.enable_guc_submission < 0)
-		i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv);
-}
-
 void intel_uc_init_early(struct drm_i915_private *dev_priv)  {
 	struct intel_guc *guc = &dev_priv->guc;
 
+	intel_guc_select_fw(&dev_priv->guc);
+	intel_huc_select_fw(&dev_priv->huc);
+
 	mutex_init(&guc->send_mutex);
 	guc->send = intel_guc_send_nop;
 }
@@ -242,6 +211,9 @@ static void fetch_uc_fw(struct drm_i915_private
 *dev_priv,
 
 void intel_uc_init_fw(struct drm_i915_private *dev_priv)  {
+	if (!HAS_GUC(dev_priv))
+		return;
+
 	fetch_uc_fw(dev_priv, &dev_priv->huc.fw);
 	fetch_uc_fw(dev_priv, &dev_priv->guc.fw);  } @@ -269,7 +241,7 @@ int
 intel_uc_init_hw(struct drm_i915_private *dev_priv)
	struct intel_guc *guc = &dev_priv->guc;
	int ret, attempts;
drivers/gpu/drm/i915/intel_uc.c +1 -1
-	if (!i915.enable_guc_loading)
+	if (!NEEDS_GUC_LOADING(dev_priv))
		return 0;

	guc_disable_communication(guc);
drivers/gpu/drm/i915/intel_uc.c +8 -8
@@ -357,22 +329,22 @@ int intel_uc_init_hw(struct drm_i915_private
 *dev_priv)
 	i915_ggtt_disable_guc(dev_priv);
 
 	DRM_ERROR("GuC init failed\n");
-	if (i915.enable_guc_loading > 1 || i915.enable_guc_submission > 1)
+	if (i915.enable_guc_submission > 1) {
+		DRM_NOTE("GuC is required, so marking the GPU as
 wedged\n");
 		ret = -EIO;
-	else
-		ret = 0;
-
-	if (i915.enable_guc_submission) {
-		i915.enable_guc_submission = 0;
+	} else if (i915.enable_guc_submission == 1) {
 		DRM_NOTE("Falling back from GuC submission to execlist
 mode\n");
-	}
+		i915.enable_guc_submission = 0;
+		ret = 0;
+	} else
+		ret = 0;
 
 	return ret;
 }
 
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv)  {
-	if (!i915.enable_guc_loading)
+	if (!NEEDS_GUC_LOADING(dev_priv))
 		return;
	if (i915.enable_guc_submission) {
drivers/gpu/drm/i915/intel_uc.h +0 -1
index 1e0eecd..2da4845 100644
@@ -220,7 +220,6 @@ struct intel_huc {
 };
 
 /* intel_uc.c */
-void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);  void

intel_uc_init_early(struct drm_i915_private *dev_priv); void intel_uc_init_fw(struct drm_i915_private *dev_priv); void intel_uc_fini_fw(struct drm_i915_private *dev_priv); @@ -235,13 +234,14 @@ static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 l }

/* intel_guc_loader.c */

drivers/gpu/drm/i915/intel_uc.h +1 -1
-int intel_guc_select_fw(struct intel_guc *guc);
+void intel_guc_select_fw(struct intel_guc *guc);

int intel_guc_init_hw(struct intel_guc *guc); int intel_guc_suspend(struct drm_i915_private *dev_priv); int intel_guc_resume(struct drm_i915_private *dev_priv);
u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);

/* i915_guc_submission.c */
+void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv); int i915_guc_submission_init(struct drm_i915_private *dev_priv); int i915_guc_submission_enable(struct drm_i915_private *dev_priv); int i915_guc_wq_reserve(struct drm_i915_gem_request *rq); diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index aa9d306..7084088 100644

drivers/gpu/drm/i915/intel_uncore.c +1 -3
@@ -1762,8 +1762,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)
 {
 	int ret;
 
-	if (!HAS_GUC(dev_priv))
-		return -EINVAL;
+	GEM_BUG_ON(!HAS_UC(dev_priv));
 
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 	ret = gen6_hw_domain_reset(dev_priv, GEN9_GRDOM_GUC);
--
Quoted 1 line

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
In reply to Oscar Mateo
Quoted 201 lines · Oscar Mateo

The decission to enable GuC loading shouldn't be left to the user. Provided the HW supports the GuC, there are only two reasons to load it:

- The user has requested GuC submission.
- We have a HuC firmware available (so we need the GuC to validate it).

We leave the enable_guc_submission parameter untouched ("auto", "never", "if supported", "required") but make its behavior a little bit more consistent. Also, if not really required, we do not try to fetch any firmware.

Cc Anusha Srivatsa <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
---
 drivers/gpu/drm/i915/i915_debugfs.c     | 10 ++++--
 drivers/gpu/drm/i915/i915_drv.c         |  2 +-
 drivers/gpu/drm/i915/i915_drv.h         | 16 +++++----
 drivers/gpu/drm/i915/i915_gem_context.c |  2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c     |  2 +-
 drivers/gpu/drm/i915/i915_irq.c         |  2 +-
 drivers/gpu/drm/i915/i915_params.c      |  6 ----
 drivers/gpu/drm/i915/i915_params.h      |  2 --
 drivers/gpu/drm/i915/intel_guc_loader.c | 48 +++++++++++++++++++++++----
 drivers/gpu/drm/i915/intel_huc.c        |  5 +--
 drivers/gpu/drm/i915/intel_uc.c         | 58 +++++++++------------------------
 drivers/gpu/drm/i915/intel_uc.h         |  4 +--
 drivers/gpu/drm/i915/intel_uncore.c     |  3 +-
 13 files changed, 82 insertions(+), 78 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -3
index 870c470..e030b41 100644
@@ -2366,8 +2366,10 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)
 	struct drm_i915_private *dev_priv = node_to_i915(m->private);
 	struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
 
-	if (!HAS_HUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No HuC support in HW\n");
 		return 0;
+	}
 
 	seq_puts(m, "HuC firmware status:\n");
 	seq_printf(m, "\tpath: %s\n", huc_fw->path);
@@ -2399,8 +2401,10 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)
 	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
 	u32 tmp, i;
 
-	if (!HAS_GUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No GuC support in HW\n");
 		return 0;
+	}
 
 	seq_printf(m, "GuC firmware status:\n");
 	seq_printf(m, "\tpath: %s\n",
@@ -2504,7 +2508,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
 
 	if (!guc->execbuf_client) {
 		seq_printf(m, "GuC submission %s\n",
-			   HAS_GUC_SCHED(dev_priv) ?
+			   HAS_GUC(dev_priv) ?
 			   "disabled" :
 			   "not supported");
 		return 0;
drivers/gpu/drm/i915/i915_drv.c +1 -1
index 72fb47a..006ed91 100644
@@ -996,7 +996,7 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)
 	i915.semaphores = intel_sanitize_semaphores(dev_priv, i915.semaphores);
 	DRM_DEBUG_DRIVER("use GPU semaphores? %s\n", yesno(i915.semaphores));
 
-	intel_uc_sanitize_options(dev_priv);
+	intel_guc_sanitize_submission(dev_priv);
 }
 
 /**
drivers/gpu/drm/i915/i915_drv.h +9 -7
index b20ed16..5d00120 100644
@@ -2921,15 +2921,17 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)
 #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc)
 
+#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
+#define HAS_GUC_UCODE(dev_priv)	((dev_priv)->guc.fw.path != NULL)
+#define HAS_HUC_UCODE(dev_priv)	((dev_priv)->huc.fw.path != NULL)
+
 /*
- * For now, anything with a GuC requires uCode loading, and then supports
- * command submission once loaded. But these are logically independent
- * properties, so we have separate macros to test them.
+ * Only two things require us to load the GuC firmware: either we want
+ * to enable GuC submission or we need it to to validate a HuC firmware
  */
-#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
-#define HAS_GUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_GUC_SCHED(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_HUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
+#define NEEDS_GUC_LOADING(dev_priv) \
+	(HAS_GUC(dev_priv) && \
+	(i915.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))
 
 #define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)
 
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index 31a73c3..a9f825b 100644
@@ -237,7 +237,7 @@ static u32 default_desc_template(const struct drm_i915_private *i915,
 	 * present or not in use we still need a small bias as ring wraparound
 	 * at offset 0 sometimes hangs. No idea why.
 	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading)
+	if (NEEDS_GUC_LOADING(dev_priv))
 		ctx->ggtt_offset_bias = GUC_WOPCM_TOP;
 	else
 		ctx->ggtt_offset_bias = I915_GTT_PAGE_SIZE;
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index 8bab4ae..283d7e5 100644
@@ -2897,7 +2897,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)
 	 * currently don't have any bits spare to pass in this upper
 	 * restriction!
 	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading) {
+	if (NEEDS_GUC_LOADING(dev_priv)) {
 		ggtt->base.total = min_t(u64, ggtt->base.total, GUC_GGTT_TOP);
 		ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total);
 	}
drivers/gpu/drm/i915/i915_irq.c +1 -1
index c99f51c..75cd0a9 100644
@@ -4240,7 +4240,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
 	for (i = 0; i < MAX_L3_SLICES; ++i)
 		dev_priv->l3_parity.remap_info[i] = NULL;
 
-	if (HAS_GUC_SCHED(dev_priv))
+	if (NEEDS_GUC_LOADING(dev_priv))
 		dev_priv->pm_guc_events = GEN9_GUC_TO_HOST_INT_EVENT;
 
 	/* Let's track the enabled rps events */
drivers/gpu/drm/i915/i915_params.c +0 -6
index b6a7e36..f90b7c1 100644
@@ -56,7 +56,6 @@ struct i915_params i915 __read_mostly = {
 	.verbose_state_checks = 1,
 	.nuclear_pageflip = 0,
 	.edp_vswing = 0,
-	.enable_guc_loading = 0,
 	.enable_guc_submission = 0,
 	.guc_log_level = -1,
 	.guc_firmware_path = NULL,
@@ -218,11 +217,6 @@ struct i915_params i915 __read_mostly = {
 		 "(0=use value from vbt [default], 1=low power swing(200mV),"
 		 "2=default swing(400mV))");
 
-module_param_named_unsafe(enable_guc_loading, i915.enable_guc_loading, int, 0400);
-MODULE_PARM_DESC(enable_guc_loading,
-		"Enable GuC firmware loading "
-		"(-1=auto, 0=never [default], 1=if available, 2=required)");
-
 module_param_named_unsafe(enable_guc_submission, i915.enable_guc_submission, int, 0400);
 MODULE_PARM_DESC(enable_guc_submission,
 		"Enable GuC submission "
drivers/gpu/drm/i915/i915_params.h +0 -2
index 34148cc..33e12f6 100644
@@ -43,7 +43,6 @@
 	func(int, disable_power_well); \
 	func(int, enable_ips); \
 	func(int, invert_brightness); \
-	func(int, enable_guc_loading); \
 	func(int, enable_guc_submission); \
 	func(int, guc_log_level); \
 	func(char *, guc_firmware_path); \
@@ -78,4 +77,3 @@ struct i915_params {
 extern struct i915_params i915 __read_mostly;
 
 #endif
-
drivers/gpu/drm/i915/intel_guc_loader.c +3 -0
index d9045b6..762f0f2 100644
@@ -375,13 +375,48 @@ int intel_guc_init_hw(struct intel_guc *guc)
 	return 0;
 }
 
+void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv)
+{
+	/* Verify hardware support */

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_init_hw(struct intel_guc *guc) · line 390

Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +10 -0
+	if (!HAS_GUC(dev_priv)) {
+		if (i915.enable_guc_submission > 0)
+			DRM_INFO("Ignoring GuC submission enable, no HW\n");
+		i915.enable_guc_submission = 0;
+		return;
+	}
+
+	/* Verify firmware support */
+	if (!HAS_GUC_UCODE(dev_priv)) {
+		if (i915.enable_guc_submission == 1) {

Shouldn't we check here against > 0 ?

Quoted 36 lines
drivers/gpu/drm/i915/intel_guc_loader.c +25 -3
+			DRM_INFO("Ignoring GuC submission enable, no FW\n");
+			i915.enable_guc_submission = 0;
+			return;
+		}
+
+		if (i915.enable_guc_submission < 0) {
+			i915.enable_guc_submission = 0;
+			return;
+		}
+
+		/*
+		 * If "required" (> 1), let it continue and we will fail later
+		 * due to the lack of firmware
+		 */
+	}
+
+	/*
+	 * A negative value means "use platform default" (enabled if we have
+	 * survived to get here)
+	 */
+	if (i915.enable_guc_submission < 0)
+		i915.enable_guc_submission = 1;
+}
+
 /**
  * intel_guc_select_fw() - selects GuC firmware for loading
  * @guc:	intel_guc struct
- *
- * Return: zero when we know firmware, non-zero in other case
  */
-int intel_guc_select_fw(struct intel_guc *guc)
+void intel_guc_select_fw(struct intel_guc *guc)
 {
 	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 449

Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -2
@@ -411,9 +446,8 @@ int intel_guc_select_fw(struct intel_guc *guc)
 		guc->fw.major_ver_wanted = GLK_FW_MAJOR;
 		guc->fw.minor_ver_wanted = GLK_FW_MINOR;
 	} else {
-		DRM_ERROR("No GuC firmware known for platform with GuC!\n");
-		return -ENOENT;
+		if (HAS_GUC(dev_priv))

This check can be done at the very top of this function, or by the caller

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 450

Quoted 1 line
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
+			DRM_ERROR("No GuC FW known for a platform with GuC!\n");

If we use %s then we can share message with the HuC function below:

	DRM_ERROR("No FW know for a platform with %s!\n",
		   intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_GUC));
Quoted 64 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -2
+		return;
 	}
-
-	return 0;
 }
drivers/gpu/drm/i915/intel_huc.c +3 -2
index 88b4cf3..49a6d88 100644
@@ -176,7 +176,9 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR;
 		huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
-		DRM_ERROR("No HuC firmware known for platform with HuC!\n");
+		/* For now, everything with a GuC also has a HuC */
+		if (HAS_GUC(dev_priv))
+			DRM_ERROR("No HuC FW known for a platform with HuC!\n");
 		return;
 	}
 }
@@ -275,4 +277,3 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
 out:
 	i915_vma_unpin(vma);
 }
-
drivers/gpu/drm/i915/intel_uc.c +0 -31
index 7fd75ca..2f1f79b 100644
@@ -60,44 +60,13 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)
 	return ret;
 }
 
-void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)
-{
-	if (!HAS_GUC(dev_priv)) {
-		if (i915.enable_guc_loading > 0 ||
-		    i915.enable_guc_submission > 0)
-			DRM_INFO("Ignoring GuC options, no hardware\n");
-
-		i915.enable_guc_loading = 0;
-		i915.enable_guc_submission = 0;
-		return;
-	}
-
-	/* A negative value means "use platform default" */
-	if (i915.enable_guc_loading < 0)
-		i915.enable_guc_loading = HAS_GUC_UCODE(dev_priv);
-
-	/* Verify firmware version */
-	if (i915.enable_guc_loading) {
-		if (HAS_HUC_UCODE(dev_priv))
-			intel_huc_select_fw(&dev_priv->huc);
-
-		if (intel_guc_select_fw(&dev_priv->guc))
-			i915.enable_guc_loading = 0;
-	}
-
-	/* Can't enable guc submission without guc loaded */
-	if (!i915.enable_guc_loading)
-		i915.enable_guc_submission = 0;
-
-	/* A negative value means "use platform default" */
-	if (i915.enable_guc_submission < 0)

drivers/gpu/drm/i915/intel_uc.c static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) · line 69

Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +3 -3
-		i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv);
-}
-
 void intel_uc_init_early(struct drm_i915_private *dev_priv)
 {
 	struct intel_guc *guc = &dev_priv->guc;
 
+	intel_guc_select_fw(&dev_priv->guc);
+	intel_huc_select_fw(&dev_priv->huc);
+

Wrap above inside "if (HAS_GUC(dev_priv))" ?

Quoted 29 lines
drivers/gpu/drm/i915/intel_uc.c +6 -2
 	mutex_init(&guc->send_mutex);
 	guc->send = intel_guc_send_nop;
 }
@@ -242,6 +211,9 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv,
 
 void intel_uc_init_fw(struct drm_i915_private *dev_priv)
 {
+	if (!HAS_GUC(dev_priv))
+		return;
+
 	fetch_uc_fw(dev_priv, &dev_priv->huc.fw);
 	fetch_uc_fw(dev_priv, &dev_priv->guc.fw);
 }
@@ -269,7 +241,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	struct intel_guc *guc = &dev_priv->guc;
 	int ret, attempts;
 
-	if (!i915.enable_guc_loading)
+	if (!NEEDS_GUC_LOADING(dev_priv))
 		return 0;
 
 	guc_disable_communication(guc);
@@ -357,22 +329,22 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 	i915_ggtt_disable_guc(dev_priv);
 
 	DRM_ERROR("GuC init failed\n");
-	if (i915.enable_guc_loading > 1 || i915.enable_guc_submission > 1)
+	if (i915.enable_guc_submission > 1) {
+		DRM_NOTE("GuC is required, so marking the GPU as wedged\n");

drivers/gpu/drm/i915/intel_uc.c int intel_uc_init_hw(struct drm_i915_private *dev_priv) · line 337

Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +2 -6
 		ret = -EIO;
-	else
-		ret = 0;
-
-	if (i915.enable_guc_submission) {
-		i915.enable_guc_submission = 0;
+	} else if (i915.enable_guc_submission == 1) {
 		DRM_NOTE("Falling back from GuC submission to execlist mode\n");
-	}
+		i915.enable_guc_submission = 0;

Btw, I'm not sure that it is ok to change params outside of the sanitize function

Quoted 29 lines
drivers/gpu/drm/i915/intel_uc.c +4 -1
+		ret = 0;
+	} else
+		ret = 0;
 
 	return ret;
 }
 
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 {
-	if (!i915.enable_guc_loading)
+	if (!NEEDS_GUC_LOADING(dev_priv))
 		return;
 
 	if (i915.enable_guc_submission) {
drivers/gpu/drm/i915/intel_uc.h +0 -1
index 1e0eecd..2da4845 100644
@@ -220,7 +220,6 @@ struct intel_huc {
 };
 
 /* intel_uc.c */
-void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);
 void intel_uc_init_early(struct drm_i915_private *dev_priv);
 void intel_uc_init_fw(struct drm_i915_private *dev_priv);
 void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
@@ -235,13 +234,14 @@ static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 l
 }
 

drivers/gpu/drm/i915/intel_uc.h static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 l · line 244

Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.h +2 -1
 /* intel_guc_loader.c */
-int intel_guc_select_fw(struct intel_guc *guc);
+void intel_guc_select_fw(struct intel_guc *guc);
 int intel_guc_init_hw(struct intel_guc *guc);
 int intel_guc_suspend(struct drm_i915_private *dev_priv);
 int intel_guc_resume(struct drm_i915_private *dev_priv);
 u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);
 
 /* i915_guc_submission.c */
+void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv);

For functions with "intel_guc" we are passing guc instead of dev_priv

Regards,
Michal

Quoted 24 lines
drivers/gpu/drm/i915/intel_uc.h +0 -0
 int i915_guc_submission_init(struct drm_i915_private *dev_priv);
 int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
 int i915_guc_wq_reserve(struct drm_i915_gem_request *rq);
drivers/gpu/drm/i915/intel_uncore.c +1 -2
index aa9d306..7084088 100644
@@ -1762,8 +1762,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)
 {
 	int ret;
 
-	if (!HAS_GUC(dev_priv))
-		return -EINVAL;
+	GEM_BUG_ON(!HAS_UC(dev_priv));
 
 	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
 	ret = gen6_hw_domain_reset(dev_priv, GEN9_GRDOM_GUC);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw
Quoted 199 lines · Michal Wajdeczko
Quoted 198 lines · Oscar Mateo

The decission to enable GuC loading shouldn't be left to the user. Provided the HW supports the GuC, there are only two reasons to load it:

- The user has requested GuC submission.
- We have a HuC firmware available (so we need the GuC to validate it).

We leave the enable_guc_submission parameter untouched ("auto", "never", "if supported", "required") but make its behavior a little bit more consistent. Also, if not really required, we do not try to fetch any firmware.

Cc Anusha Srivatsa <[email protected]>
Cc Daniele Ceraolo Spurio <[email protected]>
Cc Chris Wilson <[email protected]>
---
  drivers/gpu/drm/i915/i915_debugfs.c     | 10 ++++--
  drivers/gpu/drm/i915/i915_drv.c         |  2 +-
  drivers/gpu/drm/i915/i915_drv.h         | 16 +++++----
  drivers/gpu/drm/i915/i915_gem_context.c |  2 +-
  drivers/gpu/drm/i915/i915_gem_gtt.c     |  2 +-
  drivers/gpu/drm/i915/i915_irq.c         |  2 +-
  drivers/gpu/drm/i915/i915_params.c      |  6 ----
  drivers/gpu/drm/i915/i915_params.h      |  2 --
  drivers/gpu/drm/i915/intel_guc_loader.c | 48 +++++++++++++++++++++++----
  drivers/gpu/drm/i915/intel_huc.c        |  5 +--
  drivers/gpu/drm/i915/intel_uc.c         | 58 +++++++++------------------------
  drivers/gpu/drm/i915/intel_uc.h         |  4 +--
  drivers/gpu/drm/i915/intel_uncore.c     |  3 +-
  13 files changed, 82 insertions(+), 78 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +7 -3
index 870c470..e030b41 100644
@@ -2366,8 +2366,10 @@ static int i915_huc_load_status_info(struct seq_file *m, void *data)
  	struct drm_i915_private *dev_priv = node_to_i915(m->private);
  	struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
 
-	if (!HAS_HUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No HuC support in HW\n");
  		return 0;
+	}
 
  	seq_puts(m, "HuC firmware status:\n");
  	seq_printf(m, "\tpath: %s\n", huc_fw->path);
@@ -2399,8 +2401,10 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)
  	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;
  	u32 tmp, i;
 
-	if (!HAS_GUC_UCODE(dev_priv))
+	if (!HAS_GUC(dev_priv)) {
+		seq_puts(m, "No GuC support in HW\n");
  		return 0;
+	}
 
  	seq_printf(m, "GuC firmware status:\n");
  	seq_printf(m, "\tpath: %s\n",
@@ -2504,7 +2508,7 @@ static int i915_guc_info(struct seq_file *m, void *data)
 
  	if (!guc->execbuf_client) {
  		seq_printf(m, "GuC submission %s\n",
-			   HAS_GUC_SCHED(dev_priv) ?
+			   HAS_GUC(dev_priv) ?
  			   "disabled" :
  			   "not supported");
  		return 0;
drivers/gpu/drm/i915/i915_drv.c +1 -1
index 72fb47a..006ed91 100644
@@ -996,7 +996,7 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)
  	i915.semaphores = intel_sanitize_semaphores(dev_priv, i915.semaphores);
  	DRM_DEBUG_DRIVER("use GPU semaphores? %s\n", yesno(i915.semaphores));
 
-	intel_uc_sanitize_options(dev_priv);
+	intel_guc_sanitize_submission(dev_priv);
  }
 
  /**
drivers/gpu/drm/i915/i915_drv.h +9 -7
index b20ed16..5d00120 100644
@@ -2921,15 +2921,17 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
  #define HAS_RUNTIME_PM(dev_priv) ((dev_priv)->info.has_runtime_pm)
  #define HAS_64BIT_RELOC(dev_priv) ((dev_priv)->info.has_64bit_reloc)
 
+#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
+#define HAS_GUC_UCODE(dev_priv)	((dev_priv)->guc.fw.path != NULL)
+#define HAS_HUC_UCODE(dev_priv)	((dev_priv)->huc.fw.path != NULL)
+
  /*
- * For now, anything with a GuC requires uCode loading, and then supports
- * command submission once loaded. But these are logically independent
- * properties, so we have separate macros to test them.
+ * Only two things require us to load the GuC firmware: either we want
+ * to enable GuC submission or we need it to to validate a HuC firmware
   */
-#define HAS_GUC(dev_priv)	((dev_priv)->info.has_guc)
-#define HAS_GUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_GUC_SCHED(dev_priv)	(HAS_GUC(dev_priv))
-#define HAS_HUC_UCODE(dev_priv)	(HAS_GUC(dev_priv))
+#define NEEDS_GUC_LOADING(dev_priv) \
+	(HAS_GUC(dev_priv) && \
+	(i915.enable_guc_submission || HAS_HUC_UCODE(dev_priv)))
 
  #define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)
 
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index 31a73c3..a9f825b 100644
@@ -237,7 +237,7 @@ static u32 default_desc_template(const struct drm_i915_private *i915,
  	 * present or not in use we still need a small bias as ring wraparound
  	 * at offset 0 sometimes hangs. No idea why.
  	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading)
+	if (NEEDS_GUC_LOADING(dev_priv))
  		ctx->ggtt_offset_bias = GUC_WOPCM_TOP;
  	else
  		ctx->ggtt_offset_bias = I915_GTT_PAGE_SIZE;
drivers/gpu/drm/i915/i915_gem_gtt.c +1 -1
index 8bab4ae..283d7e5 100644
@@ -2897,7 +2897,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)
  	 * currently don't have any bits spare to pass in this upper
  	 * restriction!
  	 */
-	if (HAS_GUC(dev_priv) && i915.enable_guc_loading) {
+	if (NEEDS_GUC_LOADING(dev_priv)) {
  		ggtt->base.total = min_t(u64, ggtt->base.total, GUC_GGTT_TOP);
  		ggtt->mappable_end = min(ggtt->mappable_end, ggtt->base.total);
  	}
drivers/gpu/drm/i915/i915_irq.c +1 -1
index c99f51c..75cd0a9 100644
@@ -4240,7 +4240,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
  	for (i = 0; i < MAX_L3_SLICES; ++i)
  		dev_priv->l3_parity.remap_info[i] = NULL;
 
-	if (HAS_GUC_SCHED(dev_priv))
+	if (NEEDS_GUC_LOADING(dev_priv))
  		dev_priv->pm_guc_events = GEN9_GUC_TO_HOST_INT_EVENT;
 
  	/* Let's track the enabled rps events */
drivers/gpu/drm/i915/i915_params.c +0 -6
index b6a7e36..f90b7c1 100644
@@ -56,7 +56,6 @@ struct i915_params i915 __read_mostly = {
  	.verbose_state_checks = 1,
  	.nuclear_pageflip = 0,
  	.edp_vswing = 0,
-	.enable_guc_loading = 0,
  	.enable_guc_submission = 0,
  	.guc_log_level = -1,
  	.guc_firmware_path = NULL,
@@ -218,11 +217,6 @@ struct i915_params i915 __read_mostly = {
  		 "(0=use value from vbt [default], 1=low power swing(200mV),"
  		 "2=default swing(400mV))");
 
-module_param_named_unsafe(enable_guc_loading, i915.enable_guc_loading, int, 0400);
-MODULE_PARM_DESC(enable_guc_loading,
-		"Enable GuC firmware loading "
-		"(-1=auto, 0=never [default], 1=if available, 2=required)");
-
  module_param_named_unsafe(enable_guc_submission, i915.enable_guc_submission, int, 0400);
  MODULE_PARM_DESC(enable_guc_submission,
  		"Enable GuC submission "
drivers/gpu/drm/i915/i915_params.h +0 -2
index 34148cc..33e12f6 100644
@@ -43,7 +43,6 @@
  	func(int, disable_power_well); \
  	func(int, enable_ips); \
  	func(int, invert_brightness); \
-	func(int, enable_guc_loading); \
  	func(int, enable_guc_submission); \
  	func(int, guc_log_level); \
  	func(char *, guc_firmware_path); \
@@ -78,4 +77,3 @@ struct i915_params {
  extern struct i915_params i915 __read_mostly;
 
  #endif
-
drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
index d9045b6..762f0f2 100644
@@ -375,13 +375,48 @@ int intel_guc_init_hw(struct intel_guc *guc)
  	return 0;
  }
 
Quoted 15 lines

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_init_hw(struct intel_guc *guc) · line 390

Quoted 13 lines
drivers/gpu/drm/i915/intel_guc_loader.c +13 -0
+void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv)
+{
+	/* Verify hardware support */
+	if (!HAS_GUC(dev_priv)) {
+		if (i915.enable_guc_submission > 0)
+			DRM_INFO("Ignoring GuC submission enable, no HW\n");
+		i915.enable_guc_submission = 0;
+		return;
+	}
+
+	/* Verify firmware support */
+	if (!HAS_GUC_UCODE(dev_priv)) {
+		if (i915.enable_guc_submission == 1) {

Shouldn't we check here against > 0 ?

A 2 is "required", so we are letting it continue for now and it will fail later due to the lack of firmware, instead of papering over it.

Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +6 -0
+			DRM_INFO("Ignoring GuC submission enable, no FW\n");
+			i915.enable_guc_submission = 0;
+			return;
+		}
+
+		if (i915.enable_guc_submission < 0) {
Quoted 8 lines

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_init_hw(struct intel_guc *guc) · line 404

Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c +8 -0
+			i915.enable_guc_submission = 0;
+			return;
+		}
+
+		/*
+		 * If "required" (> 1), let it continue and we will fail later
+		 * due to the lack of firmware
+		 */

Ditto.

Quoted 21 lines
Quoted 21 lines
drivers/gpu/drm/i915/intel_guc_loader.c +11 -3
+	}
+
+	/*
+	 * A negative value means "use platform default" (enabled if we have
+	 * survived to get here)
+	 */
+	if (i915.enable_guc_submission < 0)
+		i915.enable_guc_submission = 1;
+}
+
  /**
   * intel_guc_select_fw() - selects GuC firmware for loading
   * @guc:	intel_guc struct
- *
- * Return: zero when we know firmware, non-zero in other case
   */
-int intel_guc_select_fw(struct intel_guc *guc)
+void intel_guc_select_fw(struct intel_guc *guc)
  {
  	struct drm_i915_private *dev_priv = guc_to_i915(guc);
 
Quoted 9 lines

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 449

Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -2
@@ -411,9 +446,8 @@ int intel_guc_select_fw(struct intel_guc *guc)
  		guc->fw.major_ver_wanted = GLK_FW_MAJOR;
  		guc->fw.minor_ver_wanted = GLK_FW_MINOR;
  	} else {
-		DRM_ERROR("No GuC firmware known for platform with GuC!\n");
-		return -ENOENT;
+		if (HAS_GUC(dev_priv))

This check can be done at the very top of this function, or by the caller

Will do.

Quoted 6 lines

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 450

Quoted 1 line
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
+			DRM_ERROR("No GuC FW known for a platform with GuC!\n");

If we use %s then we can share message with the HuC function below:

	DRM_ERROR("No FW know for a platform with %s!\n",
		   intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_GUC));

Hmmm... but in this case we know we are talking about the GuC (we are intel_*guc*_loader after all). Same for the HuC function. Do you think this is really needed?

Quoted 71 lines
Quoted 71 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -2
+		return;
  	}
-
-	return 0;
  }
drivers/gpu/drm/i915/intel_huc.c +3 -2
index 88b4cf3..49a6d88 100644
@@ -176,7 +176,9 @@ void intel_huc_select_fw(struct intel_huc *huc)
  		huc->fw.major_ver_wanted = GLK_HUC_FW_MAJOR;
  		huc->fw.minor_ver_wanted = GLK_HUC_FW_MINOR;
  	} else {
-		DRM_ERROR("No HuC firmware known for platform with HuC!\n");
+		/* For now, everything with a GuC also has a HuC */
+		if (HAS_GUC(dev_priv))
+			DRM_ERROR("No HuC FW known for a platform with HuC!\n");
  		return;
  	}
  }
@@ -275,4 +277,3 @@ void intel_guc_auth_huc(struct drm_i915_private *dev_priv)
  out:
  	i915_vma_unpin(vma);
  }
-
drivers/gpu/drm/i915/intel_uc.c +0 -34
index 7fd75ca..2f1f79b 100644
@@ -60,44 +60,13 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)
  	return ret;
  }
 
-void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)
-{
-	if (!HAS_GUC(dev_priv)) {
-		if (i915.enable_guc_loading > 0 ||
-		    i915.enable_guc_submission > 0)
-			DRM_INFO("Ignoring GuC options, no hardware\n");
-
-		i915.enable_guc_loading = 0;
-		i915.enable_guc_submission = 0;
-		return;
-	}
-
-	/* A negative value means "use platform default" */
-	if (i915.enable_guc_loading < 0)
-		i915.enable_guc_loading = HAS_GUC_UCODE(dev_priv);
-
-	/* Verify firmware version */
-	if (i915.enable_guc_loading) {
-		if (HAS_HUC_UCODE(dev_priv))
-			intel_huc_select_fw(&dev_priv->huc);
-
-		if (intel_guc_select_fw(&dev_priv->guc))
-			i915.enable_guc_loading = 0;
-	}
-
-	/* Can't enable guc submission without guc loaded */
-	if (!i915.enable_guc_loading)
-		i915.enable_guc_submission = 0;
-
-	/* A negative value means "use platform default" */
-	if (i915.enable_guc_submission < 0)
-		i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv);
-}
-
  void intel_uc_init_early(struct drm_i915_private *dev_priv)
  {
  	struct intel_guc *guc = &dev_priv->guc;
 
Quoted 4 lines

drivers/gpu/drm/i915/intel_uc.c static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) · line 69

Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.c +3 -0
+	intel_guc_select_fw(&dev_priv->guc);
+	intel_huc_select_fw(&dev_priv->huc);
+

Wrap above inside "if (HAS_GUC(dev_priv))" ?

Yes, will do.

Quoted 25 lines
Quoted 25 lines
drivers/gpu/drm/i915/intel_uc.c +4 -1
  	mutex_init(&guc->send_mutex);
  	guc->send = intel_guc_send_nop;
  }
@@ -242,6 +211,9 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv,
 
  void intel_uc_init_fw(struct drm_i915_private *dev_priv)
  {
+	if (!HAS_GUC(dev_priv))
+		return;
+
  	fetch_uc_fw(dev_priv, &dev_priv->huc.fw);
  	fetch_uc_fw(dev_priv, &dev_priv->guc.fw);
  }
@@ -269,7 +241,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
  	struct intel_guc *guc = &dev_priv->guc;
  	int ret, attempts;
 
-	if (!i915.enable_guc_loading)
+	if (!NEEDS_GUC_LOADING(dev_priv))
  		return 0;
 
  	guc_disable_communication(guc);
@@ -357,22 +329,22 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
  	i915_ggtt_disable_guc(dev_priv);
 
Quoted 16 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +2 -1
  	DRM_ERROR("GuC init failed\n");
-	if (i915.enable_guc_loading > 1 || i915.enable_guc_submission > 1)
+	if (i915.enable_guc_submission > 1) {
+		DRM_NOTE("GuC is required, so marking the GPU as wedged\n");

drivers/gpu/drm/i915/intel_uc.c int intel_uc_init_hw(struct drm_i915_private *dev_priv) · line 337

Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +2 -6
  		ret = -EIO;
-	else
-		ret = 0;
-
-	if (i915.enable_guc_submission) {
-		i915.enable_guc_submission = 0;
+	} else if (i915.enable_guc_submission == 1) {
  		DRM_NOTE("Falling back from GuC submission to execlist mode\n");
-	}
+		i915.enable_guc_submission = 0;

Btw, I'm not sure that it is ok to change params outside of the sanitize function

Hmmmm... we were already doing that before this patch. I guess we could have a runtime variable (has GuC init failed?) if we answer some questions (do we want to retry the init after a reset?).

Quoted 37 lines
Quoted 37 lines
drivers/gpu/drm/i915/intel_uc.c +4 -1
+		ret = 0;
+	} else
+		ret = 0;
 
  	return ret;
  }
 
  void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
  {
-	if (!i915.enable_guc_loading)
+	if (!NEEDS_GUC_LOADING(dev_priv))
  		return;
 
  	if (i915.enable_guc_submission) {
drivers/gpu/drm/i915/intel_uc.h +1 -2
index 1e0eecd..2da4845 100644
@@ -220,7 +220,6 @@ struct intel_huc {
  };
 
  /* intel_uc.c */
-void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);
  void intel_uc_init_early(struct drm_i915_private *dev_priv);
  void intel_uc_init_fw(struct drm_i915_private *dev_priv);
  void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
@@ -235,13 +234,14 @@ static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 l
  }
 
  /* intel_guc_loader.c */
-int intel_guc_select_fw(struct intel_guc *guc);
+void intel_guc_select_fw(struct intel_guc *guc);
  int intel_guc_init_hw(struct intel_guc *guc);
  int intel_guc_suspend(struct drm_i915_private *dev_priv);
  int intel_guc_resume(struct drm_i915_private *dev_priv);
  u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);
 
Quoted 5 lines

drivers/gpu/drm/i915/intel_uc.h static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 l · line 244

Quoted 2 lines
drivers/gpu/drm/i915/intel_uc.h +1 -0
  /* i915_guc_submission.c */
+void intel_guc_sanitize_submission(struct drm_i915_private *dev_priv);

For functions with "intel_guc" we are passing guc instead of dev_priv

Not always, from what I can see, and in this case it makes little sense (I don't need to access guc, and all other sanitize functions take dev_priv).

Quoted 3 lines

Regards,
Michal

Thanks for the review,
Oscar

Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/i915/intel_uc.h +0 -0
  int i915_guc_submission_init(struct drm_i915_private *dev_priv);
  int i915_guc_submission_enable(struct drm_i915_private *dev_priv);
  int i915_guc_wq_reserve(struct drm_i915_gem_request *rq);
drivers/gpu/drm/i915/intel_uncore.c +1 -2
index aa9d306..7084088 100644
@@ -1762,8 +1762,7 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)
  {
  	int ret;
 
-	if (!HAS_GUC(dev_priv))
-		return -EINVAL;
+	GEM_BUG_ON(!HAS_UC(dev_priv));
 
  	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
  	ret = gen6_hw_domain_reset(dev_priv, GEN9_GRDOM_GUC);
Signature · 1 line
1.9.1
Quoted 6 lines
Quoted 6 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx