Message ID | 1467304672-2106-2-git-send-email-rodrigo.vivi@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 6/30/2016 5:37 PM, Rodrigo Vivi wrote: > From: Peter Antoine <peter.antoine@intel.com> > > This patch added the loading of the GuC for Kabylake. > It loads a 9.14 firmware. Hello, in case you need a fresh r-b for v3: > > v2: Fix commit message > v3: Fix major/minor var names to match -nightly. (Rodrigo) > > Cc: Christophe Prigent <christophe.prigent@intel.com> > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > Signed-off-by: Michel Thierry <michel.thierry@intel.com> > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Michel Thierry <michel.thierry@intel.com> (v3) > --- > drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c > index 4f6311a..d80b617 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE); > #define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin" > MODULE_FIRMWARE(I915_BXT_GUC_UCODE); > > +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9_14.bin" > +MODULE_FIRMWARE(I915_KBL_GUC_UCODE); > + > /* User-friendly representation of an enum */ > const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status) > { > @@ -698,6 +701,10 @@ void intel_guc_init(struct drm_device *dev) > fw_path = I915_BXT_GUC_UCODE; > guc_fw->guc_fw_major_wanted = 8; > guc_fw->guc_fw_minor_wanted = 7; > + } else if (IS_KABYLAKE(dev)) { > + fw_path = I915_KBL_GUC_UCODE; > + guc_fw->guc_fw_major_wanted = 9; > + guc_fw->guc_fw_minor_wanted = 14; > } else { > fw_path = ""; /* unknown device */ > } >
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 4f6311a..d80b617 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE); #define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin" MODULE_FIRMWARE(I915_BXT_GUC_UCODE); +#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9_14.bin" +MODULE_FIRMWARE(I915_KBL_GUC_UCODE); + /* User-friendly representation of an enum */ const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status) { @@ -698,6 +701,10 @@ void intel_guc_init(struct drm_device *dev) fw_path = I915_BXT_GUC_UCODE; guc_fw->guc_fw_major_wanted = 8; guc_fw->guc_fw_minor_wanted = 7; + } else if (IS_KABYLAKE(dev)) { + fw_path = I915_KBL_GUC_UCODE; + guc_fw->guc_fw_major_wanted = 9; + guc_fw->guc_fw_minor_wanted = 14; } else { fw_path = ""; /* unknown device */ }