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

Commit cd690985 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Jani Nikula
Browse files

drm/i915/huc: Add BXT HuC Loading Support 



This patch adds the HuC Loading for the BXT by using
the updated file construction.

Version 1.7 of the HuC firmware.

v2: rebased on to top drm-tip. Rename BXT_FW_MAJOR to BXT_HUC_FW_

Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1484755558-1234-2-git-send-email-anusha.srivatsa@intel.com
parent bd132858

drivers/gpu/drm/i915/intel_huc.c

+11 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ 
 * Note that HuC firmware loading must be done before GuC loading.

 */



#define BXT_HUC_FW_MAJOR 01

#define BXT_HUC_FW_MINOR 07

#define BXT_BLD_NUM 1398



#define SKL_HUC_FW_MAJOR 01

#define SKL_HUC_FW_MINOR 07

#define SKL_BLD_NUM 1398
@@ -52,6 +56,9 @@ 
	SKL_HUC_FW_MINOR, SKL_BLD_NUM)

MODULE_FIRMWARE(I915_SKL_HUC_UCODE);



#define I915_BXT_HUC_UCODE HUC_FW_PATH(bxt, BXT_HUC_FW_MAJOR, \

	BXT_HUC_FW_MINOR, BXT_BLD_NUM)

MODULE_FIRMWARE(I915_BXT_HUC_UCODE);

/**

 * huc_ucode_xfer() - DMA's the firmware

 * @dev_priv: the drm_i915_private device
@@ -154,6 +161,10 @@ void intel_huc_init(struct drm_i915_private *dev_priv) 
		fw_path = I915_SKL_HUC_UCODE;

		huc_fw->major_ver_wanted = SKL_HUC_FW_MAJOR;

		huc_fw->minor_ver_wanted = SKL_HUC_FW_MINOR;

	} else if (IS_BROXTON(dev_priv)) {

		fw_path = I915_BXT_HUC_UCODE;

		huc_fw->major_ver_wanted = BXT_HUC_FW_MAJOR;

		huc_fw->minor_ver_wanted = BXT_HUC_FW_MINOR;

	}



	huc_fw->path = fw_path;