Commit ab65cce8 authored by Alex Dai's avatar Alex Dai Committed by Rodrigo Vivi

drm/i915/guc: Support GuC SKL v6.1

This version of GuC firmware fixes the engine reset issue where golden
context LRC address is treated as page index by mistake. It also fixes
the problem that scheduler stops submiting to one engine when the other
engine work queue is full.
Signed-off-by: default avatarAlex Dai <yu.dai@intel.com>
Reviewed-by: default avatarDave Gordon <david.s.gordon@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 7caaef33
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
* *
*/ */
#define I915_SKL_GUC_UCODE "i915/skl_guc_ver4.bin" #define I915_SKL_GUC_UCODE "i915/skl_guc_ver6.bin"
MODULE_FIRMWARE(I915_SKL_GUC_UCODE); MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
/* User-friendly representation of an enum */ /* User-friendly representation of an enum */
...@@ -595,8 +595,8 @@ void intel_guc_ucode_init(struct drm_device *dev) ...@@ -595,8 +595,8 @@ void intel_guc_ucode_init(struct drm_device *dev)
fw_path = NULL; fw_path = NULL;
} else if (IS_SKYLAKE(dev)) { } else if (IS_SKYLAKE(dev)) {
fw_path = I915_SKL_GUC_UCODE; fw_path = I915_SKL_GUC_UCODE;
guc_fw->guc_fw_major_wanted = 4; guc_fw->guc_fw_major_wanted = 6;
guc_fw->guc_fw_minor_wanted = 3; guc_fw->guc_fw_minor_wanted = 1;
} 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