| Message ID | 1464886877-3610-3-git-send-email-peter.antoine@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 6/2/2016 6:01 PM, Peter Antoine wrote: > This patch added the loading of the GuC for Kabylake. > It loads a 2.4 firmware. ^^^^^^ not anymore Either we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;) > > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > Signed-off-by: Michel Thierry <michel.thierry@intel.com> > --- > 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 f2b88c7..413af19 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.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) > { > @@ -696,6 +699,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 */ > } >
I'll remove the comment. :) -----Original Message----- From: Thierry, Michel Sent: Friday, June 3, 2016 9:44 AM To: Antoine, Peter <peter.antoine@intel.com>; intel-gfx@lists.freedesktop.org Cc: Gordon, David S <david.s.gordon@intel.com> Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading On 6/2/2016 6:01 PM, Peter Antoine wrote: > This patch added the loading of the GuC for Kabylake. > It loads a 2.4 firmware. ^^^^^^ not anymore Either we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;) > > Signed-off-by: Peter Antoine <peter.antoine@intel.com> > Signed-off-by: Michel Thierry <michel.thierry@intel.com> > --- > 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 f2b88c7..413af19 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.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) { @@ > -696,6 +699,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 */ > } >
With the commit message updated feel free to use Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> On Fri, Jun 3, 2016 at 2:14 AM, Antoine, Peter <peter.antoine@intel.com> wrote: > I'll remove the comment. :) > > -----Original Message----- > From: Thierry, Michel > Sent: Friday, June 3, 2016 9:44 AM > To: Antoine, Peter <peter.antoine@intel.com>; intel-gfx@lists.freedesktop.org > Cc: Gordon, David S <david.s.gordon@intel.com> > Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading > > On 6/2/2016 6:01 PM, Peter Antoine wrote: >> This patch added the loading of the GuC for Kabylake. >> It loads a 2.4 firmware. > ^^^^^^ not anymore > Either we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;) > >> >> Signed-off-by: Peter Antoine <peter.antoine@intel.com> >> Signed-off-by: Michel Thierry <michel.thierry@intel.com> >> --- >> 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 f2b88c7..413af19 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.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) { @@ >> -696,6 +699,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 */ >> } >> > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Thanks. Rodrigo will sin a new patch now. Peter. On Wed, 29 Jun 2016, Rodrigo Vivi wrote: > With the commit message updated feel free to use > Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > On Fri, Jun 3, 2016 at 2:14 AM, Antoine, Peter <peter.antoine@intel.com> wrote: >> I'll remove the comment. :) >> >> -----Original Message----- >> From: Thierry, Michel >> Sent: Friday, June 3, 2016 9:44 AM >> To: Antoine, Peter <peter.antoine@intel.com>; intel-gfx@lists.freedesktop.org >> Cc: Gordon, David S <david.s.gordon@intel.com> >> Subject: Re: [PATCH 2/2] i915/guc: Add Kabylake GuC Loading >> >> On 6/2/2016 6:01 PM, Peter Antoine wrote: >>> This patch added the loading of the GuC for Kabylake. >>> It loads a 2.4 firmware. >> ^^^^^^ not anymore >> Either we update the commit msg to say 9.14 (and let people know how many releases we had), or just keep silent about it ;) >> >>> >>> Signed-off-by: Peter Antoine <peter.antoine@intel.com> >>> Signed-off-by: Michel Thierry <michel.thierry@intel.com> >>> --- >>> 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 f2b88c7..413af19 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.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) { @@ >>> -696,6 +699,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 */ >>> } >>> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- Peter Antoine (Android Graphics Driver Software Engineer) --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index f2b88c7..413af19 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.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) { @@ -696,6 +699,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 */ }