Commit 57bf5c81 authored by Nick Hoath's avatar Nick Hoath Committed by Tvrtko Ursulin

drm/i915/guc: Add Broxton GuC firmware loading support

Issue: VIZ-7772
Signed-off-by: default avatarNick Hoath <nicholas.hoath@intel.com>
Reviewed-by: peter.antoine@intel.com
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1462531373-34819-2-git-send-email-nicholas.hoath@intel.com
parent 4d3ba7e4
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
#define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin" #define I915_SKL_GUC_UCODE "i915/skl_guc_ver6_1.bin"
MODULE_FIRMWARE(I915_SKL_GUC_UCODE); MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
#define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin"
MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
/* User-friendly representation of an enum */ /* User-friendly representation of an enum */
const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status) const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status)
{ {
...@@ -640,6 +643,10 @@ void intel_guc_ucode_init(struct drm_device *dev) ...@@ -640,6 +643,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
fw_path = I915_SKL_GUC_UCODE; fw_path = I915_SKL_GUC_UCODE;
guc_fw->guc_fw_major_wanted = 6; guc_fw->guc_fw_major_wanted = 6;
guc_fw->guc_fw_minor_wanted = 1; guc_fw->guc_fw_minor_wanted = 1;
} else if (IS_BROXTON(dev)) {
fw_path = I915_BXT_GUC_UCODE;
guc_fw->guc_fw_major_wanted = 8;
guc_fw->guc_fw_minor_wanted = 7;
} else { } else {
i915.enable_guc_submission = false; i915.enable_guc_submission = false;
fw_path = ""; /* unknown device */ fw_path = ""; /* unknown device */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment