[Intel-gfx] [PATCH v2 3/6] drm/i915/uc: Create intel_uc_init_mmio

[Sagar Arun Kamble]

On 10/2/2017 7:31 PM, Michal Wajdeczko wrote:
> From: Sagar Arun Kamble <sagar.a.kamble at intel.com>
>
> 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>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
Looks good to me.
Acked-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 5cc2434..74a456f 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1007,6 +1007,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 201d23e..d921509 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -137,6 +137,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_modparams.guc_log_level < 0)
> @@ -158,8 +163,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 d111f79..f0d5a3f 100644
> --- a/drivers/gpu/drm/i915/intel_uc.h
> +++ b/drivers/gpu/drm/i915/intel_uc.h
> @@ -137,6 +137,7 @@ struct intel_huc {
>   /* intel_uc.c */
>   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_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_hw(struct drm_i915_private *dev_priv);