[Intel-gfx] [PATCH v8 03/12] drm/i915: Move i915_gem_fini to i915_gem.c

[Sagar Arun Kamble]

On 4/9/2018 5:53 PM, Michal Wajdeczko wrote:
> We should keep i915_gem_init/fini functions together for easier
> tracking of their symmetry.
>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_drv.c | 20 --------------------
>   drivers/gpu/drm/i915/i915_drv.h |  1 +
>   drivers/gpu/drm/i915/i915_gem.c | 20 ++++++++++++++++++++
>   3 files changed, 21 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index f770be1..854b26c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -625,26 +625,6 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
>   	.can_switch = i915_switcheroo_can_switch,
>   };
>   
> -static void i915_gem_fini(struct drm_i915_private *dev_priv)
> -{
> -	/* Flush any outstanding unpin_work. */
> -	i915_gem_drain_workqueue(dev_priv);
> -
> -	mutex_lock(&dev_priv->drm.struct_mutex);
> -	intel_uc_fini_hw(dev_priv);
> -	intel_uc_fini(dev_priv);
> -	i915_gem_cleanup_engines(dev_priv);
> -	i915_gem_contexts_fini(dev_priv);
> -	mutex_unlock(&dev_priv->drm.struct_mutex);
> -
> -	intel_uc_fini_misc(dev_priv);
> -	i915_gem_cleanup_userptr(dev_priv);
> -
> -	i915_gem_drain_freed_objects(dev_priv);
> -
> -	WARN_ON(!list_empty(&dev_priv->contexts.list));
> -}
> -
>   static int i915_load_modeset_init(struct drm_device *dev)
>   {
>   	struct drm_i915_private *dev_priv = to_i915(dev);
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 9bca104..f8bc276 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3143,6 +3143,7 @@ void i915_gem_reset_engine(struct intel_engine_cs *engine,
>   int __must_check i915_gem_init(struct drm_i915_private *dev_priv);
>   int __must_check i915_gem_init_hw(struct drm_i915_private *dev_priv);
>   void i915_gem_init_swizzling(struct drm_i915_private *dev_priv);
> +void i915_gem_fini(struct drm_i915_private *dev_priv);
>   void i915_gem_cleanup_engines(struct drm_i915_private *dev_priv);
>   int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv,
>   			   unsigned int flags);
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 26294e8..fb99485 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -5520,6 +5520,26 @@ int i915_gem_init(struct drm_i915_private *dev_priv)
>   	return ret;
>   }
>   
> +void i915_gem_fini(struct drm_i915_private *dev_priv)
> +{
> +	/* Flush any outstanding unpin_work. */
> +	i915_gem_drain_workqueue(dev_priv);
> +
> +	mutex_lock(&dev_priv->drm.struct_mutex);
> +	intel_uc_fini_hw(dev_priv);
> +	intel_uc_fini(dev_priv);
> +	i915_gem_cleanup_engines(dev_priv);
> +	i915_gem_contexts_fini(dev_priv);
> +	mutex_unlock(&dev_priv->drm.struct_mutex);
> +
> +	intel_uc_fini_misc(dev_priv);
> +	i915_gem_cleanup_userptr(dev_priv);
> +
> +	i915_gem_drain_freed_objects(dev_priv);
> +
> +	WARN_ON(!list_empty(&dev_priv->contexts.list));
> +}
> +
>   void i915_gem_init_mmio(struct drm_i915_private *i915)
>   {
>   	i915_gem_sanitize(i915);

-- 
Thanks,
Sagar