[Intel-gfx] [PATCH 01/11] drm/i915/guc: Pass intel_guc to intel_guc_suspend/resume instead of drm_i915_private

[Michal Wajdeczko]

On Fri, 15 Sep 2017 23:06:19 +0200, Sagar Arun Kamble  
<sagar.a.kamble at intel.com> wrote:

> Also put the declaration under the i915_guc_submission section in
> intel_uc.h.
>
> 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            |  6 +++---
>  drivers/gpu/drm/i915/i915_gem.c            |  2 +-
>  drivers/gpu/drm/i915/i915_guc_submission.c | 10 ++++------
>  drivers/gpu/drm/i915/intel_uc.h            |  4 ++--
>  4 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c  
> b/drivers/gpu/drm/i915/i915_drv.c
> index 5c111ea..dec2850 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1691,7 +1691,7 @@ static int i915_drm_resume(struct drm_device *dev)
>  	}
>  	mutex_unlock(&dev->struct_mutex);
> -	intel_guc_resume(dev_priv);
> +	intel_guc_resume(&dev_priv->guc);
> 	intel_modeset_init_hw(dev);
> @@ -2493,7 +2493,7 @@ static int intel_runtime_suspend(struct device  
> *kdev)
>  	 */
>  	i915_gem_runtime_suspend(dev_priv);
> -	intel_guc_suspend(dev_priv);
> +	intel_guc_suspend(&dev_priv->guc);
> 	intel_runtime_pm_disable_interrupts(dev_priv);
> @@ -2578,7 +2578,7 @@ static int intel_runtime_resume(struct device  
> *kdev)
>  	if (intel_uncore_unclaimed_mmio(dev_priv))
>  		DRM_DEBUG_DRIVER("Unclaimed access during suspend, bios?\n");
> -	intel_guc_resume(dev_priv);
> +	intel_guc_resume(&dev_priv->guc);
> 	if (IS_GEN9_LP(dev_priv)) {
>  		bxt_disable_dc9(dev_priv);
> diff --git a/drivers/gpu/drm/i915/i915_gem.c  
> b/drivers/gpu/drm/i915/i915_gem.c
> index f445587..eb20e73 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4575,7 +4575,7 @@ int i915_gem_suspend(struct drm_i915_private  
> *dev_priv)
>  	i915_gem_contexts_lost(dev_priv);
>  	mutex_unlock(&dev->struct_mutex);
> -	intel_guc_suspend(dev_priv);
> +	intel_guc_suspend(&dev_priv->guc);
> 	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
>  	cancel_delayed_work_sync(&dev_priv->gt.retire_work);
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c  
> b/drivers/gpu/drm/i915/i915_guc_submission.c
> index 3f9d227..9c9d639 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -1208,11 +1208,10 @@ void i915_guc_submission_disable(struct  
> drm_i915_private *dev_priv)
> /**
>   * intel_guc_suspend() - notify GuC entering suspend state
> - * @dev_priv:	i915 device private
>   */
> -int intel_guc_suspend(struct drm_i915_private *dev_priv)
> +int intel_guc_suspend(struct intel_guc *guc)
>  {
> -	struct intel_guc *guc = &dev_priv->guc;
> +	struct drm_i915_private *dev_priv = guc_to_i915(guc);
>  	struct i915_gem_context *ctx;
>  	u32 data[3];
> @@ -1234,11 +1233,10 @@ int intel_guc_suspend(struct drm_i915_private  
> *dev_priv)
> /**
>   * intel_guc_resume() - notify GuC resuming from suspend state
> - * @dev_priv:	i915 device private
>   */
> -int intel_guc_resume(struct drm_i915_private *dev_priv)
> +int intel_guc_resume(struct intel_guc *guc)
>  {
> -	struct intel_guc *guc = &dev_priv->guc;
> +	struct drm_i915_private *dev_priv = guc_to_i915(guc);
>  	struct i915_gem_context *ctx;
>  	u32 data[3];
> diff --git a/drivers/gpu/drm/i915/intel_uc.h  
> b/drivers/gpu/drm/i915/intel_uc.h
> index 7703c9a..6ed8ece 100644
> --- a/drivers/gpu/drm/i915/intel_uc.h
> +++ b/drivers/gpu/drm/i915/intel_uc.h
> @@ -225,8 +225,6 @@ static inline void intel_guc_notify(struct intel_guc  
> *guc)
>  /* intel_guc_loader.c */
>  int intel_guc_select_fw(struct intel_guc *guc);
>  int intel_guc_init_hw(struct intel_guc *guc);
> -int intel_guc_suspend(struct drm_i915_private *dev_priv);
> -int intel_guc_resume(struct drm_i915_private *dev_priv);
>  u32 intel_guc_wopcm_size(struct drm_i915_private *dev_priv);
> /* i915_guc_submission.c */
> @@ -235,6 +233,8 @@ static inline void intel_guc_notify(struct intel_guc  
> *guc)
>  void i915_guc_submission_disable(struct drm_i915_private *dev_priv);
>  void i915_guc_submission_fini(struct drm_i915_private *dev_priv);
>  struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32  
> size);
> +int intel_guc_suspend(struct intel_guc *guc);
> +int intel_guc_resume(struct intel_guc *guc);
> /* intel_guc_log.c */
>  int intel_guc_log_create(struct intel_guc *guc);

Hmm, this patch seems to be fully consumed by other patch
"[08/11] Fix GuC interaction in reset/suspend scenarios"
Please reorder your patches.

Michal