Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK

From: John Spotswood <john.a.spotswood@intel.com>
To: Anusha Srivatsa <anusha.srivatsa@intel.com>,
	intel-gfx@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
Date: Tue, 28 Mar 2017 14:35:03 -0700	[thread overview]
Message-ID: <1490736903.8765.2.camel@intel.com> (raw)
In-Reply-To: <1490130577-3679-1-git-send-email-anusha.srivatsa@intel.com>

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@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  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);

> +
>  /* 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx