| Message ID | 1525287804-2071-6-git-send-email-oscar.mateo@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2018-05-02 at 12:03 -0700, Oscar Mateo wrote: > This patch adds the support to load HuC on ICL. > Version 8.02.2678 > > v2 (James): Rebase > > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> > Cc: Tony Ye <tony.ye@intel.com> > Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com> > Cc: Michel Thierry <michel.thierry@intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: John Spotswood <john.a.spotswood@intel.com> Reviewed-by: John Spotswood <john.a.spotswood@intel.com> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> > --- > drivers/gpu/drm/i915/intel_huc_fw.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c > b/drivers/gpu/drm/i915/intel_huc_fw.c > index f93d238..795d585 100644 > --- a/drivers/gpu/drm/i915/intel_huc_fw.c > +++ b/drivers/gpu/drm/i915/intel_huc_fw.c > @@ -34,6 +34,10 @@ > #define KBL_HUC_FW_MINOR 00 > #define KBL_BLD_NUM 1810 > > +#define ICL_HUC_FW_MAJOR 8 > +#define ICL_HUC_FW_MINOR 02 > +#define ICL_BLD_NUM 2678 > + > #define HUC_FW_PATH(platform, major, minor, bld_num) \ > "i915/" __stringify(platform) "_huc_ver" __stringify(major) > "_" \ > __stringify(minor) "_" __stringify(bld_num) ".bin" > @@ -50,6 +54,9 @@ > KBL_HUC_FW_MINOR, KBL_BLD_NUM) > MODULE_FIRMWARE(I915_KBL_HUC_UCODE); > > +#define I915_ICL_HUC_UCODE HUC_FW_PATH(icl, ICL_HUC_FW_MAJOR, \ > + ICL_HUC_FW_MINOR, ICL_BLD_NUM) > + > static void huc_fw_select(struct intel_uc_fw *huc_fw) > { > struct intel_huc *huc = container_of(huc_fw, struct > intel_huc, fw); > @@ -76,6 +83,10 @@ static void huc_fw_select(struct intel_uc_fw > *huc_fw) > huc_fw->path = I915_KBL_HUC_UCODE; > huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR; > huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR; > + } else if (IS_ICELAKE(dev_priv)) { > + huc->fw.path = I915_ICL_HUC_UCODE; > + huc->fw.major_ver_wanted = ICL_HUC_FW_MAJOR; > + huc->fw.minor_ver_wanted = ICL_HUC_FW_MINOR; > } else { > DRM_WARN("%s: No firmware known for this > platform!\n", > intel_uc_fw_type_repr(huc_fw->type));
diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c index f93d238..795d585 100644 --- a/drivers/gpu/drm/i915/intel_huc_fw.c +++ b/drivers/gpu/drm/i915/intel_huc_fw.c @@ -34,6 +34,10 @@ #define KBL_HUC_FW_MINOR 00 #define KBL_BLD_NUM 1810 +#define ICL_HUC_FW_MAJOR 8 +#define ICL_HUC_FW_MINOR 02 +#define ICL_BLD_NUM 2678 + #define HUC_FW_PATH(platform, major, minor, bld_num) \ "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ __stringify(minor) "_" __stringify(bld_num) ".bin" @@ -50,6 +54,9 @@ KBL_HUC_FW_MINOR, KBL_BLD_NUM) MODULE_FIRMWARE(I915_KBL_HUC_UCODE); +#define I915_ICL_HUC_UCODE HUC_FW_PATH(icl, ICL_HUC_FW_MAJOR, \ + ICL_HUC_FW_MINOR, ICL_BLD_NUM) + static void huc_fw_select(struct intel_uc_fw *huc_fw) { struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw); @@ -76,6 +83,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw) huc_fw->path = I915_KBL_HUC_UCODE; huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR; huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR; + } else if (IS_ICELAKE(dev_priv)) { + huc->fw.path = I915_ICL_HUC_UCODE; + huc->fw.major_ver_wanted = ICL_HUC_FW_MAJOR; + huc->fw.minor_ver_wanted = ICL_HUC_FW_MINOR; } else { DRM_WARN("%s: No firmware known for this platform!\n", intel_uc_fw_type_repr(huc_fw->type));
This patch adds the support to load HuC on ICL. Version 8.02.2678 v2 (James): Rebase Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Cc: Tony Ye <tony.ye@intel.com> Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: John Spotswood <john.a.spotswood@intel.com> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> --- drivers/gpu/drm/i915/intel_huc_fw.c | 11 +++++++++++ 1 file changed, 11 insertions(+)