Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

i915/guc: Add Kabylake GuC Loading

This patch added the loading of the GuC for Kabylake.
It loads a 9.14 firmware.

v2: Fix commit message
v3: Fix major/minor var names to match -nightly. (Rodrigo)

Cc: Christophe Prigent <christophe.prigent@intel.com>
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Michel Thierry <michel.thierry@intel.com> (v3)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467304672-2106-1-git-send-email-rodrigo.vivi@intel.com

authored by

Peter Antoine and committed by
Tvrtko Ursulin
ff64cc16 6f8be280

+7
+7
drivers/gpu/drm/i915/intel_guc_loader.c
··· 65 65 #define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8_7.bin" 66 66 MODULE_FIRMWARE(I915_BXT_GUC_UCODE); 67 67 68 + #define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9_14.bin" 69 + MODULE_FIRMWARE(I915_KBL_GUC_UCODE); 70 + 68 71 /* User-friendly representation of an enum */ 69 72 const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status) 70 73 { ··· 701 698 fw_path = I915_BXT_GUC_UCODE; 702 699 guc_fw->guc_fw_major_wanted = 8; 703 700 guc_fw->guc_fw_minor_wanted = 7; 701 + } else if (IS_KABYLAKE(dev)) { 702 + fw_path = I915_KBL_GUC_UCODE; 703 + guc_fw->guc_fw_major_wanted = 9; 704 + guc_fw->guc_fw_minor_wanted = 14; 704 705 } else { 705 706 fw_path = ""; /* unknown device */ 706 707 }