Due to the GuC interface changes, new firmware releases will
stop support GuC submission mode for pre-Gen11 platforms.
Sanitize the enable_guc option so that only HuC authentication
would be possible.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
Cc: John Spotswood <john.a.spotswood@xxxxxxxxx>
Cc: Vinay Belgaumkar <vinay.belgaumkar@xxxxxxxxx>
Cc: Tony Ye <tony.ye@xxxxxxxxx>
Cc: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx>
Cc: Jeff Mcgee <jeff.mcgee@xxxxxxxxx>
Cc: Antonio Argenziano <antonio.argenziano@xxxxxxxxx>
Cc: Sujaritha Sundaresan <sujaritha.sundaresan@xxxxxxxxx>
---
drivers/gpu/drm/i915/intel_uc.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 2d360d53757f..61d2a2910ef1 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -63,7 +63,9 @@ static int __get_platform_enable_guc(struct drm_i915_private *i915)
if (intel_uc_fw_is_selected(huc_fw))
enable_guc |= ENABLE_GUC_LOAD_HUC;
- /* Any platform specific fine-tuning can be done here */
+ /* Don't allow GuC submission on pre-Gen11 */
+ if (INTEL_GEN(i915) < 11)
+ enable_guc &= ~ENABLE_GUC_SUBMISSION;
return enable_guc;
}
@@ -116,6 +118,13 @@ static void sanitize_options_early(struct drm_i915_private *i915)
yesno(intel_uc_is_using_guc_submission(i915)),
yesno(intel_uc_is_using_huc(i915)));
+ /* Verify GuC submission support */
+ if (intel_uc_is_using_guc_submission(i915) && INTEL_GEN(i915) < 11) {
+ DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
+ "enable_guc", i915_modparams.enable_guc,
+ "submission not supported");
+ }
+
/* Verify GuC firmware availability */
if (intel_uc_is_using_guc(i915) && !intel_uc_fw_is_selected(guc_fw)) {
DRM_WARN("Incompatible option detected: %s=%d, %s!\n",
@@ -288,6 +297,10 @@ int intel_uc_init(struct drm_i915_private *i915)
if (!HAS_GUC(i915))
return -ENODEV;
+ /* Don't allow GuC submission on pre-Gen11 */
+ if (USES_GUC_SUBMISSION(i915) && INTEL_GEN(i915) < 11)
+ return -EIO;
+
ret = intel_guc_init(guc);
if (ret)
return ret;
--
2.19.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
