On Tue, 2017-03-28 at 22:11 +0000, Srivatsa, Anusha wrote: > > >-----Original Message----- > >From: Spotswood, John A > >Sent: Tuesday, March 28, 2017 2:35 PM > >To: Srivatsa, Anusha <anusha.srivatsa@xxxxxxxxx>; intel- > >gfx@xxxxxxxxxxxxxxxxxxxxx > >Cc: Mcgee, Jeff <jeff.mcgee@xxxxxxxxx>; Vivi, Rodrigo <rodrigo.vivi@xxxxxxxxx> > >Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK > > > >On Tue, 2017-03-21 at 14:09 -0700, Anusha Srivatsa wrote: > >> Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing > >> has not been done yet. > >> This patch addresses the initial need to load the GuC firmware for HuC > >> authentication > >> > >> Cc: Jeff mcgee <jeff.mcgee@xxxxxxxxx> > >> Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > >> Cc: John Spotswood <john.a.spotswood@xxxxxxxxx> > >> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@xxxxxxxxx> > >> --- > >> drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++ > >> 1 file changed, 9 insertions(+) > >> > >> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c > >> b/drivers/gpu/drm/i915/intel_guc_loader.c > >> index 2f270d0..a6899df 100644 > >> --- a/drivers/gpu/drm/i915/intel_guc_loader.c > >> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > >> @@ -61,6 +61,9 @@ > >> #define KBL_FW_MAJOR 9 > >> #define KBL_FW_MINOR 14 > >> > >> +#define GLK_FW_MAJOR 10 > >> +#define GLK_FW_MINOR 56 > >> + > >> #define GUC_FW_PATH(platform, major, minor) \ > >> "i915/" __stringify(platform) "_guc_ver" __stringify(major) > >> "_" __stringify(minor) ".bin" > >> > >> @@ -73,6 +76,8 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE); > >> #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, > >> KBL_FW_MINOR) > >> MODULE_FIRMWARE(I915_KBL_GUC_UCODE); > >> > >> +#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, > >> GLK_FW_MINOR) > > > >You need a line after this #define that says the following: > > MODULE_FIRMWARE(I915_GLK_GUC_UCODE); > > > Hi John, we have decided to not use it in pre-production platforms. Using MODULE_FIRMWARE is going to shout that the firmware is not available in systems. Since we will not be releasing the firmware binary to the public yet, it is unnecessary noise. +MODULE_FIRMARE() should be in a separated patch and only get merged after the firmware got released at 01.org propagated and merged to linux-firmware.git. > > > Anusha > >> + > >> /* User-friendly representation of an enum */ > >> const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) > >> { > >> @@ -423,6 +428,10 @@ int intel_guc_select_fw(struct intel_guc *guc) > >> guc->fw.path = I915_KBL_GUC_UCODE; > >> guc->fw.major_ver_wanted = KBL_FW_MAJOR; > >> guc->fw.minor_ver_wanted = KBL_FW_MINOR; > >> + } else if (IS_GEMINILAKE(dev_priv)) { > >> + guc->fw.path = I915_GLK_GUC_UCODE; > >> + guc->fw.major_ver_wanted = GLK_FW_MAJOR; > >> + guc->fw.minor_ver_wanted = GLK_FW_MINOR; > >> } else { > >> DRM_ERROR("No GuC firmware known for platform with > >GuC!\n"); > >> return -ENOENT; _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx