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

Commit 90f192c8 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Ander Conselvan de Oliveira
Browse files

drm/i915/GuC/GLK: Load GuC on GLK 



Load GuC 10.56 on GLK. Work on firmware is still
in progress. Testing has not been done yet.
This patch addresses the initial need to load the GuC
firmware for HuC authentication

v2: rebased.

Cc: Jeff mcgee <jeff.mcgee@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarJohn Spotswood <john.a.spotswood@intel.com>
Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1490905447-15815-1-git-send-email-anusha.srivatsa@intel.com
parent b268d9fe

drivers/gpu/drm/i915/intel_guc_loader.c

+9 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ 
#define KBL_FW_MAJOR 9

#define KBL_FW_MINOR 14



#define GLK_FW_MAJOR 10

#define GLK_FW_MINOR 56



#define GUC_FW_PATH(platform, major, minor) \

       "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
@@ -73,6 +76,8 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE); 
#define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR)

MODULE_FIRMWARE(I915_KBL_GUC_UCODE);



#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)





static u32 get_gttype(struct drm_i915_private *dev_priv)

{
@@ -405,6 +410,10 @@ int intel_guc_select_fw(struct intel_guc *guc) 
		guc->fw.path = I915_KBL_GUC_UCODE;

		guc->fw.major_ver_wanted = KBL_FW_MAJOR;

		guc->fw.minor_ver_wanted = KBL_FW_MINOR;

	} else if (IS_GEMINILAKE(dev_priv)) {

		guc->fw.path = I915_GLK_GUC_UCODE;

		guc->fw.major_ver_wanted = GLK_FW_MAJOR;

		guc->fw.minor_ver_wanted = GLK_FW_MINOR;

	} else {

		DRM_ERROR("No GuC firmware known for platform with GuC!\n");

		return -ENOENT;