[Intel-gfx] [PATCH 6/9] drm/i915: Move intel_guc_sample_forcewake to guc.c

[Sagar Arun Kamble]

On 9/29/2017 11:11 PM, Michal Wajdeczko wrote:
> We want to keep GuC functions together.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Sagar Arun Kamble <sagar.a.kamble at intel.com>
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
nitpick: Subject prefix as drm/i915/guc
> ---
>   drivers/gpu/drm/i915/intel_guc.c | 16 ++++++++++++++++
>   drivers/gpu/drm/i915/intel_guc.h |  2 +-
>   drivers/gpu/drm/i915/intel_uc.c  | 16 ----------------
>   3 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
> index 44df609..d1f90e2 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -128,3 +128,19 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len)
>   
>   	return ret;
>   }
> +
> +int intel_guc_sample_forcewake(struct intel_guc *guc)
> +{
> +	struct drm_i915_private *i915 = guc_to_i915(guc);
> +	u32 action[2];
> +
> +	action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;
> +	/* WaRsDisableCoarsePowerGating:skl,bxt */
> +	if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(i915))
> +		action[1] = 0;
> +	else
> +		/* bit 0 and 1 are for Render and Media domain separately */
> +		action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA;
> +
> +	return intel_guc_send(guc, action, ARRAY_SIZE(action));
> +}
> diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
> index 76d283b..63aec84 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -144,13 +144,13 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)
>   }
>   
>   /* intel_uc.c */
> -int intel_guc_sample_forcewake(struct intel_guc *guc);
>   int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);
>   
>   /* intel_guc.c */
>   void intel_guc_init_early(struct intel_guc *guc);
>   int intel_guc_send_nop(struct intel_guc *guc, const u32 *action, u32 len);
>   int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
> +int intel_guc_sample_forcewake(struct intel_guc *guc);
>   
>   /* intel_guc_loader.c */
>   int intel_guc_select_fw(struct intel_guc *guc);
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 78af95a..75db20a 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -290,19 +290,3 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
>   
>   	i915_ggtt_disable_guc(dev_priv);
>   }
> -
> -int intel_guc_sample_forcewake(struct intel_guc *guc)
> -{
> -	struct drm_i915_private *dev_priv = guc_to_i915(guc);
> -	u32 action[2];
> -
> -	action[0] = INTEL_GUC_ACTION_SAMPLE_FORCEWAKE;
> -	/* WaRsDisableCoarsePowerGating:skl,bxt */
> -	if (!intel_enable_rc6() || NEEDS_WaRsDisableCoarsePowerGating(dev_priv))
> -		action[1] = 0;
> -	else
> -		/* bit 0 and 1 are for Render and Media domain separately */
> -		action[1] = GUC_FORCEWAKE_RENDER | GUC_FORCEWAKE_MEDIA;
> -
> -	return intel_guc_send(guc, action, ARRAY_SIZE(action));
> -}