[Intel-gfx] [PATCH 02/14] drm/i915: Create intel_uc_init_mmio to initialize MMIO interface prior to uc init

[Michal Wajdeczko]

On Tue, 19 Sep 2017 19:27:39 +0200, Sagar Arun Kamble  
<sagar.a.kamble at intel.com> wrote:

> 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)
>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Michał Winiarski <michal.winiarski at intel.com>
> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 2 ++
>  drivers/gpu/drm/i915/intel_uc.c | 7 +++++--
>  drivers/gpu/drm/i915/intel_uc.h | 1 +
>  3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c  
> b/drivers/gpu/drm/i915/i915_drv.c
> index 5c111ea..ef4f84d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1002,6 +1002,8 @@ static int i915_driver_init_mmio(struct  
> drm_i915_private *dev_priv)
> 	intel_uncore_init(dev_priv);
> +	intel_uc_init_mmio(dev_priv);
> +
>  	ret = intel_engines_init_mmio(dev_priv);
>  	if (ret)
>  		goto err_uncore;
> diff --git a/drivers/gpu/drm/i915/intel_uc.c  
> b/drivers/gpu/drm/i915/intel_uc.c
> index b91f848..f2ccb7c 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -288,6 +288,11 @@ static void guc_init_send_regs(struct intel_guc  
> *guc)
>  	guc->send_regs.fw_domains = fw_domains;
>  }
> +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)
>  {
>  	if (!guc->log.vma || i915.guc_log_level < 0)
> @@ -309,8 +314,6 @@ static int guc_enable_communication(struct intel_guc  
> *guc)
>  {
>  	struct drm_i915_private *dev_priv = guc_to_i915(guc);
> -	guc_init_send_regs(guc);
> -
>  	if (HAS_GUC_CT(dev_priv))
>  		return intel_guc_enable_ct(guc);
> diff --git a/drivers/gpu/drm/i915/intel_uc.h  
> b/drivers/gpu/drm/i915/intel_uc.h
> index 8560a7e..60bf814 100644
> --- a/drivers/gpu/drm/i915/intel_uc.h
> +++ b/drivers/gpu/drm/i915/intel_uc.h
> @@ -206,6 +206,7 @@ struct intel_huc {
>  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_fini_fw(struct drm_i915_private *dev_priv);
> +void intel_uc_init_mmio(struct drm_i915_private *dev_priv);

As init_mmio() is called prior to init_fw() please try to keep
the same order in their declarations.

Michal

>  int intel_uc_init_hw(struct drm_i915_private *dev_priv);
>  void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
>  int intel_guc_sample_forcewake(struct intel_guc *guc);