On Wed, 2018-08-29 at 12:10 -0700, Wajdeczko, Michal wrote: > Upcoming Gen11 GuC firmware requires new interface that is > incompatible > with existing pre-Gen11 firmwares. Updated firmwares for pre-Gen11 > will > arrive later. In the meantime sanitize the enable_guc option so that > we > can enable HuC authentication but nothing else on pre-Gen11. > > Signed-off-by: Michal Wajdeczko <[email protected]> > Cc: Joonas Lahtinen <[email protected]> > Cc: Rodrigo Vivi <[email protected]> > Cc: Daniele Ceraolo Spurio <[email protected]> > Cc: Michel Thierry <[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]>
Reviewed-by: John Spotswood <[email protected]> > --- > drivers/gpu/drm/i915/intel_uc.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_uc.c > b/drivers/gpu/drm/i915/intel_uc.c > index 7a3a4ca..185b29b 100644 > --- a/drivers/gpu/drm/i915/intel_uc.c > +++ b/drivers/gpu/drm/i915/intel_uc.c > @@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct > drm_i915_private *i915) > enable_guc |= ENABLE_GUC_LOAD_HUC; > > /* Any platform specific fine-tuning can be done here */ > + if (INTEL_GEN(i915) < 11) > + enable_guc &= ~ENABLE_GUC_SUBMISSION; > > return enable_guc; > } > @@ -115,6 +117,13 @@ static void sanitize_options_early(struct > drm_i915_private *i915) > yesno(intel_uc_is_using_guc_submission()), > yesno(intel_uc_is_using_huc())); > > + /* Verify GuC submission support */ > + if (intel_uc_is_using_guc_submission() && 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() && > !intel_uc_fw_is_selected(guc_fw)) { > DRM_WARN("Incompatible option detected: %s=%d, > %s!\n", > @@ -292,6 +301,12 @@ int intel_uc_init(struct drm_i915_private *i915) > return ret; > > if (USES_GUC_SUBMISSION(i915)) { > + > + if (INTEL_GEN(i915) < 11) { > + intel_guc_fini(guc); > + return -EIO; > + } > + > /* > * This is stuff we need to have available at fw > load time > * if we are planning to enable submission later _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
