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

Commit 29ad6a30 authored by Arkadiusz Hiler's avatar Arkadiusz Hiler Committed by Joonas Lahtinen
Browse files

drm/i915/uc: Introduce intel_uc_init_fw() 



Instead of calling intel_guc_init() and intel_huc_init() one by one this
patch introduces intel_uc_init_fw() function that calls them both.

Called functions are renamed accordingly.

Trying to have subject_verb_object ordering and more descriptive names,
the intel_huc_init() and intel_guc_init() functions are renamed.

For guc_init():
 * `intel_guc` is the subject, so those functions now take intel_guc
   structure, instead of the dev_priv
 * init is the verb
 * fw is the object which better describes the function's role

huc_init() change follows the same reasoning.

v2: settle on intel_uc_fetch_fw name (M. Wajdeczko)
v3: yet another rename - intel_uc_init_fw (J. Lahtinen)
v4: non-trivial rebase

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Signed-off-by: default avatarArkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 4c0fed79

drivers/gpu/drm/i915/i915_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -605,8 +605,7 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	if (ret)

		goto cleanup_irq;



	intel_huc_init(dev_priv);

	intel_guc_init(dev_priv);

	intel_uc_init_fw(dev_priv);



	ret = i915_gem_init(dev_priv);

	if (ret)

drivers/gpu/drm/i915/intel_guc_loader.c

+15 −15
Original line number Diff line number Diff line
@@ -521,17 +521,17 @@ int intel_guc_init_hw(struct intel_guc *guc) 




/**

 * intel_guc_init() - define parameters and fetch firmware

 * @dev_priv:	i915 device private

 * intel_guc_init_fw() - select and prepare firmware for loading

 * @guc:	intel_guc struct

 *

 * Called early during driver load, but after GEM is initialised.

 *

 * The firmware will be transferred to the GuC's memory later,

 * when intel_guc_init_hw() is called.

 */

void intel_guc_init(struct drm_i915_private *dev_priv)

void intel_guc_init_fw(struct intel_guc *guc)

{

	struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	const char *fw_path;



	if (!HAS_GUC(dev_priv)) {
@@ -549,23 +549,23 @@ void intel_guc_init(struct drm_i915_private *dev_priv) 
		fw_path = NULL;

	} else if (IS_SKYLAKE(dev_priv)) {

		fw_path = I915_SKL_GUC_UCODE;

		guc_fw->major_ver_wanted = SKL_FW_MAJOR;

		guc_fw->minor_ver_wanted = SKL_FW_MINOR;

		guc->fw.major_ver_wanted = SKL_FW_MAJOR;

		guc->fw.minor_ver_wanted = SKL_FW_MINOR;

	} else if (IS_BROXTON(dev_priv)) {

		fw_path = I915_BXT_GUC_UCODE;

		guc_fw->major_ver_wanted = BXT_FW_MAJOR;

		guc_fw->minor_ver_wanted = BXT_FW_MINOR;

		guc->fw.major_ver_wanted = BXT_FW_MAJOR;

		guc->fw.minor_ver_wanted = BXT_FW_MINOR;

	} else if (IS_KABYLAKE(dev_priv)) {

		fw_path = I915_KBL_GUC_UCODE;

		guc_fw->major_ver_wanted = KBL_FW_MAJOR;

		guc_fw->minor_ver_wanted = KBL_FW_MINOR;

		guc->fw.major_ver_wanted = KBL_FW_MAJOR;

		guc->fw.minor_ver_wanted = KBL_FW_MINOR;

	} else {

		fw_path = "";	/* unknown device */

	}



	guc_fw->path = fw_path;

	guc_fw->fetch_status = INTEL_UC_FIRMWARE_NONE;

	guc_fw->load_status = INTEL_UC_FIRMWARE_NONE;

	guc->fw.path = fw_path;

	guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE;

	guc->fw.load_status = INTEL_UC_FIRMWARE_NONE;



	/* Early (and silent) return if GuC loading is disabled */

	if (!i915.enable_guc_loading)
@@ -575,9 +575,9 @@ void intel_guc_init(struct drm_i915_private *dev_priv) 
	if (*fw_path == '\0')

		return;



	guc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;

	guc->fw.fetch_status = INTEL_UC_FIRMWARE_PENDING;

	DRM_DEBUG_DRIVER("GuC firmware pending, path %s\n", fw_path);

	intel_uc_prepare_fw(dev_priv, guc_fw);

	intel_uc_prepare_fw(dev_priv, &guc->fw);

	/* status must now be FAIL or SUCCESS */

}

drivers/gpu/drm/i915/intel_huc.c

+20 −19
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv) 
}



/**

 * intel_huc_init() - initiate HuC firmware loading request

 * @dev_priv: the drm_i915_private device

 * intel_huc_init_fw() - select and prepare firmware for loading

 * @huc:	intel_huc struct

 *

 * Called early during driver load, but after GEM is initialised. The loading

 * will continue only when driver explicitly specify firmware name and version.
@@ -152,44 +152,45 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv) 
 *

 * The DMA-copying to HW is done later when intel_huc_init_hw() is called.

 */

void intel_huc_init(struct drm_i915_private *dev_priv)

void intel_huc_init_fw(struct intel_huc *huc)

{

	struct intel_huc *huc = &dev_priv->huc;

	struct intel_uc_fw *huc_fw = &huc->fw;

	struct drm_i915_private *dev_priv = huc_to_i915(huc);

	const char *fw_path = NULL;



	huc_fw->path = NULL;

	huc_fw->fetch_status = INTEL_UC_FIRMWARE_NONE;

	huc_fw->load_status = INTEL_UC_FIRMWARE_NONE;

	huc_fw->fw = INTEL_UC_FW_TYPE_HUC;

	huc->fw.path = NULL;

	huc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE;

	huc->fw.load_status = INTEL_UC_FIRMWARE_NONE;

	huc->fw.fw = INTEL_UC_FW_TYPE_HUC;



	if (!HAS_HUC_UCODE(dev_priv))

		return;



	if (IS_SKYLAKE(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;

		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.major_ver_wanted = BXT_HUC_FW_MAJOR;

		huc->fw.minor_ver_wanted = BXT_HUC_FW_MINOR;

	} else if (IS_KABYLAKE(dev_priv)) {

		fw_path = I915_KBL_HUC_UCODE;

		huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;

		huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;

		huc->fw.major_ver_wanted = KBL_HUC_FW_MAJOR;

		huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR;

	}



	huc_fw->path = fw_path;

	huc->fw.path = fw_path;



	if (huc_fw->path == NULL)

	if (fw_path == NULL)

		return;



	huc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;

	huc->fw.fetch_status = INTEL_UC_FIRMWARE_PENDING;



	DRM_DEBUG_DRIVER("HuC firmware pending, path %s\n", fw_path);



	intel_uc_prepare_fw(dev_priv, huc_fw);

	WARN(huc->fw.path == NULL, "HuC present but no fw path\n");



	intel_uc_prepare_fw(dev_priv, &huc->fw);

}



/**

drivers/gpu/drm/i915/intel_uc.c

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) 
	mutex_init(&dev_priv->guc.send_mutex);

}



void intel_uc_init_fw(struct drm_i915_private *dev_priv)

{

	intel_huc_init_fw(&dev_priv->huc);

	intel_guc_init_fw(&dev_priv->guc);

}



/*

 * Read GuC command/status register (SOFT_SCRATCH_0)

 * Return true if it contains a response rather than a command

drivers/gpu/drm/i915/intel_uc.h

+3 −2
Original line number Diff line number Diff line
@@ -185,13 +185,14 @@ struct intel_huc { 


/* intel_uc.c */

void intel_uc_init_early(struct drm_i915_private *dev_priv);

void intel_uc_init_fw(struct drm_i915_private *dev_priv);

void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,

			 struct intel_uc_fw *uc_fw);

int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);

int intel_guc_sample_forcewake(struct intel_guc *guc);



/* intel_guc_loader.c */

void intel_guc_init(struct drm_i915_private *dev_priv);

void intel_guc_init_fw(struct intel_guc *guc);

int intel_guc_init_hw(struct intel_guc *guc);

void intel_guc_fini(struct drm_i915_private *dev_priv);

const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status);
@@ -223,7 +224,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) 
}



/* intel_huc.c */

void intel_huc_init(struct drm_i915_private *dev_priv);

void intel_huc_init_fw(struct intel_huc *huc);

void intel_huc_fini(struct drm_i915_private  *dev_priv);

int intel_huc_init_hw(struct intel_huc *huc);

void intel_guc_auth_huc(struct drm_i915_private *dev_priv);