intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Peter Antoine <peter.antoine@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: rodrigo.vivi@intel.com
Subject: [PATCH v2 6/6] drm/i915/huc: Add BXT HuC Loading Support
Date: Fri,  1 Jul 2016 14:15:45 +0100	[thread overview]
Message-ID: <1467378945-14274-7-git-send-email-peter.antoine@intel.com> (raw)
In-Reply-To: <1467378945-14274-1-git-send-email-peter.antoine@intel.com>

This patch adds the HuC Loading for the BXT.
Version 1.7 of the HuC firmware.

Signed-off-by: Peter Antoine <peter.antoine@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_huc_loader.c b/drivers/gpu/drm/i915/intel_huc_loader.c
index 98ef8df..23df639 100644
--- a/drivers/gpu/drm/i915/intel_huc_loader.c
+++ b/drivers/gpu/drm/i915/intel_huc_loader.c
@@ -49,6 +49,9 @@
 #define I915_SKL_HUC_UCODE "i915/skl_huc_ver1_7.bin"
 MODULE_FIRMWARE(I915_SKL_HUC_UCODE);
 
+#define I915_BXT_HUC_UCODE "i915/bxt_huc_ver1_7.bin"
+MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
+
 /**
  * intel_huc_load_ucode() - DMA's the firmware
  * @dev: the drm device
@@ -157,6 +160,10 @@ void intel_huc_init(struct drm_device *dev)
 		fw_path = I915_SKL_HUC_UCODE;
 		huc_fw->major_ver_wanted = 1;
 		huc_fw->minor_ver_wanted = 7;
+	} else if (IS_BROXTON(dev_priv)) {
+		fw_path = I915_BXT_HUC_UCODE;
+		huc_fw->major_ver_wanted = 1;
+		huc_fw->minor_ver_wanted = 7;
 	}
 
 	if (fw_path == NULL)
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2016-07-01 13:16 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-01 13:15 [PATCH v2 0/6] HuC Loading Patches Peter Antoine
2016-07-01 13:15 ` [PATCH v2 1/6] drm/i915/guc: Make the GuC fw loading helper functions general Peter Antoine
2016-07-05 14:44   ` Dave Gordon
2016-07-01 13:15 ` [PATCH v2 2/6] drm/i915/huc: Unified css_header struct for GuC and HuC Peter Antoine
2016-07-01 13:15 ` [PATCH v2 3/6] drm/i915/huc: Add HuC fw loading support Peter Antoine
2016-07-01 13:15 ` [PATCH v2 4/6] drm/i915/huc: Add debugfs for HuC loading status check Peter Antoine
2016-07-01 13:15 ` [PATCH v2 5/6] drm/i915/huc: Support HuC authentication Peter Antoine
2016-07-01 13:15 ` Peter Antoine [this message]
2016-07-01 14:04 ` ✗ Ro.CI.BAT: warning for HuC Loading Patches (rev2) 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=1467378945-14274-7-git-send-email-peter.antoine@intel.com \
    --to=peter.antoine@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).