[Intel-gfx] [PATCH] drm/i915/userptr: Convert to drm_i915_private

[Tvrtko Ursulin]

On 19/05/16 16:17, Chris Wilson wrote:
> userptr directly only uses drm_device in a single interface where it
> meant to use drm_i915_private (everywhere else we have to derive it from
> the drm_i915_gem_object and so require going from drm_device).
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> ---
>   drivers/gpu/drm/i915/i915_drv.h         | 2 +-
>   drivers/gpu/drm/i915/i915_gem.c         | 5 +----
>   drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +---
>   3 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 72f0b02a8372..b89817178874 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2966,7 +2966,7 @@ int i915_gem_set_tiling(struct drm_device *dev, void *data,
>   			struct drm_file *file_priv);
>   int i915_gem_get_tiling(struct drm_device *dev, void *data,
>   			struct drm_file *file_priv);
> -int i915_gem_init_userptr(struct drm_device *dev);
> +void i915_gem_init_userptr(struct drm_i915_private *dev_priv);
>   int i915_gem_userptr_ioctl(struct drm_device *dev, void *data,
>   			   struct drm_file *file);
>   int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 24cab8802c2e..6a31445a0471 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4913,10 +4913,7 @@ int i915_gem_init(struct drm_device *dev)
>   	 */
>   	intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
>
> -	ret = i915_gem_init_userptr(dev);
> -	if (ret)
> -		goto out_unlock;
> -
> +	i915_gem_init_userptr(dev_priv);
>   	i915_gem_init_ggtt(dev);
>
>   	ret = i915_gem_context_init(dev);
> diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
> index 32d9726e38b1..380d15cf7ff0 100644
> --- a/drivers/gpu/drm/i915/i915_gem_userptr.c
> +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
> @@ -855,10 +855,8 @@ i915_gem_userptr_ioctl(struct drm_device *dev, void *data, struct drm_file *file
>   	return 0;
>   }
>
> -int
> -i915_gem_init_userptr(struct drm_device *dev)
> +void i915_gem_init_userptr(struct drm_i915_private *dev_priv)
>   {
> -	struct drm_i915_private *dev_priv = to_i915(dev);
>   	mutex_init(&dev_priv->mm_lock);
>   	hash_init(dev_priv->mm_structs);
>   	return 0;
>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko