Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0f82960 authored Jun 08, 2017 by Anusha Srivatsa Committed by Rodrigo Vivi Jun 09, 2017

drm/i915/guc: Load GuC on Coffee Lake



Coffee Lake reuses Kabylake's GuC.

v2: Change Coffeelake to Coffee Lake

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1496965704-23610-1-git-send-email-anusha.srivatsa@intel.com

parent d29fe702

drivers/gpu/drm/i915/i915_pci.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -426,6 +426,7 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
	BDW_FEATURES, \		BDW_FEATURES, \
	.gen = 9, \		.gen = 9, \
	.platform = INTEL_COFFEELAKE, \		.platform = INTEL_COFFEELAKE, \
			.has_guc = 1, \
	.ddb_size = 896		.ddb_size = 896

	static const struct intel_device_info intel_coffeelake_info = {		static const struct intel_device_info intel_coffeelake_info = {

drivers/gpu/drm/i915/intel_guc_loader.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -402,7 +402,7 @@ int intel_guc_select_fw(struct intel_guc *guc)
	guc->fw.path = I915_BXT_GUC_UCODE;		guc->fw.path = I915_BXT_GUC_UCODE;
	guc->fw.major_ver_wanted = BXT_FW_MAJOR;		guc->fw.major_ver_wanted = BXT_FW_MAJOR;
	guc->fw.minor_ver_wanted = BXT_FW_MINOR;		guc->fw.minor_ver_wanted = BXT_FW_MINOR;
	} else if (IS_KABYLAKE(dev_priv)) {		} else if (IS_KABYLAKE(dev_priv) \|\| IS_COFFEELAKE(dev_priv)) {
	guc->fw.path = I915_KBL_GUC_UCODE;		guc->fw.path = I915_KBL_GUC_UCODE;
	guc->fw.major_ver_wanted = KBL_FW_MAJOR;		guc->fw.major_ver_wanted = KBL_FW_MAJOR;
	guc->fw.minor_ver_wanted = KBL_FW_MINOR;		guc->fw.minor_ver_wanted = KBL_FW_MINOR;