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 2/2] drm/i915/HuC/GLK: Load HuC on GLK
Date: Tue, 21 Mar 2017 16:39:34 -0700 [thread overview]
Message-ID: <83ceccad-b53f-d24f-bcdd-725552a3f2e7@intel.com> (raw)
In-Reply-To: <1490130631-3726-2-git-send-email-anusha.srivatsa@intel.com>
On 03/21/2017 02:10 PM, Anusha Srivatsa wrote:
> Load HuC version 1.07.1748 on GLK.
>
> Cc: Jeff Mcgee <jeff.mcgee@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/intel_huc.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
> index 7af900b..8dfb917 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -52,6 +52,10 @@
> #define KBL_HUC_FW_MINOR 00
> #define KBL_BLD_NUM 1810
>
> +#define GLK_HUC_FW_MAJOR 01
> +#define GLK_HUC_FW_MINOR 07
> +#define GLK_BLD_NUM 1748
> +
> #define HUC_FW_PATH(platform, major, minor, bld_num) \
> "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
> __stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -68,6 +72,9 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
> KBL_HUC_FW_MINOR, KBL_BLD_NUM)
> MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
>
> +#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \
> + GLK_HUC_FW_MINOR, GLK_BLD_NUM)
> +
> /**
> * huc_ucode_xfer() - DMA's the firmware
> * @dev_priv: the drm_i915_private device
> @@ -169,6 +176,10 @@ void intel_huc_select_fw(struct intel_huc *huc)
> huc->fw.path = I915_KBL_HUC_UCODE;
> huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;
> huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;
> + } else if (IS_GEMINILAKE(dev_priv)) {
> + huc->fw.path = I915_GLK_HUC_UCODE;
> + huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;
> + huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;
These should be GLK_HUC_FW_MAJOR and GLK_HUC_FW_MINOR.
> } else {
> DRM_ERROR("No HuC firmware known for platform with HuC!\n");
> return;
Regards,
John
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-03-21 23:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 21:10 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa
2017-03-21 21:10 ` [PATCH 2/2] drm/i915/HuC/GLK: Load HuC " Anusha Srivatsa
2017-03-21 22:40 ` Spotswood, John A
2017-03-22 0:20 ` Srivatsa, Anusha
2017-03-21 23:39 ` John Spotswood [this message]
2017-03-21 21:30 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83ceccad-b53f-d24f-bcdd-725552a3f2e7@intel.com \
--to=john.a.spotswood@intel.com \
--cc=anusha.srivatsa@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).