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

Commit 8c650aef authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915/uc: Fetch uC firmware in init_early 



We were fetching uC firmwares in separate uc_init_fw step, while
there is no reason why we can't fetch them during init_early.
This will also simplify upcoming patches, as size of the firmware
may be used for register initialization.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michal Winiarski <michal.winiarski@intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180323123451.59244-2-michal.wajdeczko@intel.com
parent a0de908d

drivers/gpu/drm/i915/i915_drv.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -692,11 +692,9 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	if (ret)

	if (ret)

		goto cleanup_irq;

		goto cleanup_irq;





	intel_uc_init_fw(dev_priv);



	ret = i915_gem_init(dev_priv);

	ret = i915_gem_init(dev_priv);

	if (ret)

	if (ret)

		goto cleanup_uc;

		goto cleanup_irq;





	intel_setup_overlay(dev_priv);

	intel_setup_overlay(dev_priv);
@@ -716,8 +714,6 @@ static int i915_load_modeset_init(struct drm_device *dev) 
	if (i915_gem_suspend(dev_priv))

	if (i915_gem_suspend(dev_priv))

		DRM_ERROR("failed to idle hardware; continuing to unload!\n");

		DRM_ERROR("failed to idle hardware; continuing to unload!\n");

	i915_gem_fini(dev_priv);

	i915_gem_fini(dev_priv);

cleanup_uc:

	intel_uc_fini_fw(dev_priv);

cleanup_irq:

cleanup_irq:

	drm_irq_uninstall(dev);

	drm_irq_uninstall(dev);

	intel_teardown_gmbus(dev_priv);

	intel_teardown_gmbus(dev_priv);
@@ -962,6 +958,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv, 
static void i915_driver_cleanup_early(struct drm_i915_private *dev_priv)

static void i915_driver_cleanup_early(struct drm_i915_private *dev_priv)

{

{

	intel_irq_fini(dev_priv);

	intel_irq_fini(dev_priv);

	intel_uc_cleanup_early(dev_priv);

	i915_gem_cleanup_early(dev_priv);

	i915_gem_cleanup_early(dev_priv);

	i915_workqueues_cleanup(dev_priv);

	i915_workqueues_cleanup(dev_priv);

	i915_engines_cleanup(dev_priv);

	i915_engines_cleanup(dev_priv);
@@ -1457,7 +1454,6 @@ void i915_driver_unload(struct drm_device *dev) 
	i915_reset_error_state(dev_priv);

	i915_reset_error_state(dev_priv);





	i915_gem_fini(dev_priv);

	i915_gem_fini(dev_priv);

	intel_uc_fini_fw(dev_priv);

	intel_fbc_cleanup_cfb(dev_priv);

	intel_fbc_cleanup_cfb(dev_priv);





	intel_power_domains_fini(dev_priv);

	intel_power_domains_fini(dev_priv);

drivers/gpu/drm/i915/intel_guc_fw.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -275,9 +275,8 @@ static int guc_fw_xfer(struct intel_uc_fw *guc_fw, struct i915_vma *vma) 
 * Called from intel_uc_init_hw() during driver load, resume from sleep and

 * Called from intel_uc_init_hw() during driver load, resume from sleep and

 * after a GPU reset.

 * after a GPU reset.

 *

 *

 * The firmware image should have already been fetched into memory by the

 * The firmware image should have already been fetched into memory, so only

 * earlier call to intel_uc_init_fw(), so here we need to only check that

 * check that fetch succeeded, and then transfer the image to the h/w.

 * fetch succeeded, and then transfer the image to the h/w.

 *

 *

 * Return:	non-zero code on error

 * Return:	non-zero code on error

 */

 */

drivers/gpu/drm/i915/intel_huc_fw.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -155,9 +155,8 @@ static int huc_fw_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma) 
 * Called from intel_uc_init_hw() during driver load, resume from sleep and

 * Called from intel_uc_init_hw() during driver load, resume from sleep and

 * after a GPU reset. Note that HuC must be loaded before GuC.

 * after a GPU reset. Note that HuC must be loaded before GuC.

 *

 *

 * The firmware image should have already been fetched into memory by the

 * The firmware image should have already been fetched into memory, so only

 * earlier call to intel_uc_init_fw(), so here we need to only check that

 * check that fetch succeeded, and then transfer the image to the h/w.

 * fetch succeeded, and then transfer the image to the h/w.

 *

 *

 * Return:	non-zero code on error

 * Return:	non-zero code on error

 */

 */

drivers/gpu/drm/i915/intel_uc.c

+18 −19
Original line number Original line Diff line number Diff line
@@ -162,36 +162,35 @@ static void sanitize_options_early(struct drm_i915_private *dev_priv) 
	GEM_BUG_ON(i915_modparams.guc_log_level < 0);

	GEM_BUG_ON(i915_modparams.guc_log_level < 0);

}

}





void intel_uc_init_early(struct drm_i915_private *dev_priv)

void intel_uc_init_early(struct drm_i915_private *i915)

{

{

	intel_guc_init_early(&dev_priv->guc);

	struct intel_guc *guc = &i915->guc;

	intel_huc_init_early(&dev_priv->huc);

	struct intel_huc *huc = &i915->huc;





	sanitize_options_early(dev_priv);

	intel_guc_init_early(guc);

}

	intel_huc_init_early(huc);





void intel_uc_init_fw(struct drm_i915_private *dev_priv)

	sanitize_options_early(i915);

{

	if (!USES_GUC(dev_priv))

		return;





	if (USES_HUC(dev_priv))

	if (USES_GUC(i915))

		intel_uc_fw_fetch(dev_priv, &dev_priv->huc.fw);

		intel_uc_fw_fetch(i915, &guc->fw);





	intel_uc_fw_fetch(dev_priv, &dev_priv->guc.fw);

	if (USES_HUC(i915))

		intel_uc_fw_fetch(i915, &huc->fw);

}

}





void intel_uc_fini_fw(struct drm_i915_private *dev_priv)

void intel_uc_cleanup_early(struct drm_i915_private *i915)

{

{

	if (!USES_GUC(dev_priv))

	struct intel_guc *guc = &i915->guc;

		return;

	struct intel_huc *huc = &i915->huc;





	intel_uc_fw_fini(&dev_priv->guc.fw);

	if (USES_HUC(i915))

		intel_uc_fw_fini(&huc->fw);





	if (USES_HUC(dev_priv))

	if (USES_GUC(i915))

		intel_uc_fw_fini(&dev_priv->huc.fw);

		intel_uc_fw_fini(&guc->fw);





	guc_free_load_err_log(&dev_priv->guc);

	guc_free_load_err_log(guc);

}

}





/**

/**

drivers/gpu/drm/i915/intel_uc.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -29,9 +29,8 @@ 
#include "i915_params.h"

#include "i915_params.h"





void intel_uc_init_early(struct drm_i915_private *dev_priv);

void intel_uc_init_early(struct drm_i915_private *dev_priv);

void intel_uc_cleanup_early(struct drm_i915_private *dev_priv);

void intel_uc_init_mmio(struct drm_i915_private *dev_priv);

void intel_uc_init_mmio(struct drm_i915_private *dev_priv);

void intel_uc_init_fw(struct drm_i915_private *dev_priv);

void intel_uc_fini_fw(struct drm_i915_private *dev_priv);

int intel_uc_init_misc(struct drm_i915_private *dev_priv);

int intel_uc_init_misc(struct drm_i915_private *dev_priv);

void intel_uc_fini_misc(struct drm_i915_private *dev_priv);

void intel_uc_fini_misc(struct drm_i915_private *dev_priv);

void intel_uc_sanitize(struct drm_i915_private *dev_priv);

void intel_uc_sanitize(struct drm_i915_private *dev_priv);