| Message ID | 1477699546-6624-7-git-send-email-anusha.srivatsa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Oct 28, 2016 at 05:05:45PM -0700, Anusha Srivatsa wrote: > From: Peter Antoine <peter.antoine@intel.com> > > This patch adds the HuC Loading for the BXT. > Version 1.7 of the HuC firmware. > > v2: rebased. > v3: rebased. > changed file name to match the install package format. > v7: rebased. > v8: rebased. > > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > Reviewed-by: David Gordon <david.s.gordon@intel.com> > --- > drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c > index dcd9970..0969bdf 100644 > --- a/drivers/gpu/drm/i915/intel_huc_loader.c > +++ b/drivers/gpu/drm/i915/intel_huc_loader.c > @@ -43,6 +43,9 @@ > #define I915_SKL_HUC_UCODE "i915/skl_huc_ver01_07_1398.bin" > MODULE_FIRMWARE(I915_SKL_HUC_UCODE); > > +#define I915_BXT_HUC_UCODE "i915/bxt_huc_ver01_07_1398.bin" > +MODULE_FIRMWARE(I915_BXT_HUC_UCODE); > + This will need updating if the newer firmware version/name macros in intel_guc_loader.c are adopted. -Jeff > /** > * huc_ucode_xfer() - DMA's the firmware > * @dev_priv: the drm device > @@ -150,6 +153,10 @@ void intel_huc_init(struct drm_device *dev) > fw_path = I915_SKL_HUC_UCODE; > huc_fw->major_ver_wanted = 1; > huc_fw->minor_ver_wanted = 7; > + } else if (IS_BROXTON(dev_priv)) { > + fw_path = I915_BXT_HUC_UCODE; > + huc_fw->major_ver_wanted = 1; > + huc_fw->minor_ver_wanted = 7; Use version macros here when that part is ready. -Jeff > } > > if (fw_path == NULL) > -- > 2.7.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c index dcd9970..0969bdf 100644 --- a/drivers/gpu/drm/i915/intel_huc_loader.c +++ b/drivers/gpu/drm/i915/intel_huc_loader.c @@ -43,6 +43,9 @@ #define I915_SKL_HUC_UCODE "i915/skl_huc_ver01_07_1398.bin" MODULE_FIRMWARE(I915_SKL_HUC_UCODE); +#define I915_BXT_HUC_UCODE "i915/bxt_huc_ver01_07_1398.bin" +MODULE_FIRMWARE(I915_BXT_HUC_UCODE); + /** * huc_ucode_xfer() - DMA's the firmware * @dev_priv: the drm device @@ -150,6 +153,10 @@ void intel_huc_init(struct drm_device *dev) fw_path = I915_SKL_HUC_UCODE; huc_fw->major_ver_wanted = 1; huc_fw->minor_ver_wanted = 7; + } else if (IS_BROXTON(dev_priv)) { + fw_path = I915_BXT_HUC_UCODE; + huc_fw->major_ver_wanted = 1; + huc_fw->minor_ver_wanted = 7; } if (fw_path == NULL)