[Intel-gfx] [PATCH v2 2/2] i915/guc: Add Kabylake GuC Loading

[Peter Antoine]

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

Signed-off-by: Peter Antoine <peter.antoine at intel.com>
Signed-off-by: Michel Thierry <michel.thierry at intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 51d108e..4862d58 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -65,6 +65,9 @@ MODULE_FIRMWARE(I915_SKL_GUC_UCODE);
 #define I915_BXT_GUC_UCODE "i915/bxt_guc_ver8.7.bin"
 MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
 
+#define I915_KBL_GUC_UCODE "i915/kbl_guc_ver9_14.bin"
+MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
+
 /* User-friendly representation of an enum */
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
 {
@@ -701,6 +704,10 @@ void intel_guc_ucode_init(struct drm_device *dev)
 		fw_path = I915_BXT_GUC_UCODE;
 		guc_fw->major_ver_wanted = 8;
 		guc_fw->minor_ver_wanted = 0;
+	} else if (IS_KABYLAKE(dev)) {
+		fw_path = I915_KBL_GUC_UCODE;
+		guc_fw->major_ver_wanted = 9;
+		guc_fw->minor_ver_wanted = 14;
 	}
 
 	if (fw_path == NULL)
-- 
1.9.1