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 <[email protected]> Cc: Joonas Lahtinen <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: Daniele Ceraolo Spurio <[email protected]> Cc: John Spotswood <[email protected]> Cc: Vinay Belgaumkar <[email protected]> Cc: Tony Ye <[email protected]> Cc: Anusha Srivatsa <[email protected]> Cc: Jeff Mcgee <[email protected]> Cc: Antonio Argenziano <[email protected]> Cc: Sujaritha Sundaresan <[email protected]> --- 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 [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
