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

Commit 1fc556fa authored by Sagar Arun Kamble's avatar Sagar Arun Kamble Committed by Joonas Lahtinen
Browse files

drm/i915/uc: Create intel_uc_init_mmio 



This patch adds new function intel_uc_init_mmio which will initialize
MMIO access related variables prior to uc load/init.

v2: Removed unnecessary export of guc_send_init_regs. Created
intel_uc_init_mmio that currently wraps guc_init_send_regs. (Michal)

v3 (Michal): add kerneldoc (Joonas)

Signed-off-by: default avatarSagar Arun Kamble <sagar.a.kamble@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171004153327.32608-4-michal.wajdeczko@intel.com
parent c23b4f46

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1007,6 +1007,8 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) 




	intel_uncore_init(dev_priv);

	intel_uncore_init(dev_priv);





	intel_uc_init_mmio(dev_priv);



	ret = intel_engines_init_mmio(dev_priv);

	ret = intel_engines_init_mmio(dev_priv);

	if (ret)

	if (ret)

		goto err_uncore;

		goto err_uncore;

drivers/gpu/drm/i915/intel_uc.c

+13 −2
Original line number Original line Diff line number Diff line
@@ -288,6 +288,19 @@ static void guc_init_send_regs(struct intel_guc *guc) 
	guc->send_regs.fw_domains = fw_domains;

	guc->send_regs.fw_domains = fw_domains;

}

}





/**

 * intel_uc_init_mmio - setup uC MMIO access

 *

 * @dev_priv: device private

 *

 * Setup minimal state necessary for MMIO accesses later in the

 * initialization sequence.

 */

void intel_uc_init_mmio(struct drm_i915_private *dev_priv)

{

	guc_init_send_regs(&dev_priv->guc);

}



static void guc_capture_load_err_log(struct intel_guc *guc)

static void guc_capture_load_err_log(struct intel_guc *guc)

{

{

	if (!guc->log.vma || i915_modparams.guc_log_level < 0)

	if (!guc->log.vma || i915_modparams.guc_log_level < 0)
@@ -309,8 +322,6 @@ static int guc_enable_communication(struct intel_guc *guc) 
{

{

	struct drm_i915_private *dev_priv = guc_to_i915(guc);

	struct drm_i915_private *dev_priv = guc_to_i915(guc);





	guc_init_send_regs(guc);



	if (HAS_GUC_CT(dev_priv))

	if (HAS_GUC_CT(dev_priv))

		return intel_guc_enable_ct(guc);

		return intel_guc_enable_ct(guc);

drivers/gpu/drm/i915/intel_uc.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -202,6 +202,7 @@ struct intel_huc { 
/* intel_uc.c */

/* intel_uc.c */

void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);

void intel_uc_sanitize_options(struct drm_i915_private *dev_priv);

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_init_mmio(struct drm_i915_private *dev_priv);

void intel_uc_init_fw(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);

void intel_uc_fini_fw(struct drm_i915_private *dev_priv);

int intel_uc_init_hw(struct drm_i915_private *dev_priv);

int intel_uc_init_hw(struct drm_i915_private *dev_priv);