[Intel-gfx] [PATCH 21/26] drm/i915: Include ioctl in set-tiling and get-tiling function names

[Tvrtko Ursulin]

On 31/12/2016 12:06, Chris Wilson wrote:
> Make it clear that these functions are the user entry points for
> the tiling/fence registers.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/i915_drv.c        |  4 ++--
>  drivers/gpu/drm/i915/i915_drv.h        |  8 ++++----
>  drivers/gpu/drm/i915/i915_gem_tiling.c | 16 ++++++++--------
>  3 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 2c020eafada6..2cb8682ae57f 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -2548,8 +2548,8 @@ static const struct drm_ioctl_desc i915_ioctls[] = {
>  	DRM_IOCTL_DEF_DRV(I915_GEM_MMAP_GTT, i915_gem_mmap_gtt_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_SET_DOMAIN, i915_gem_set_domain_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_SW_FINISH, i915_gem_sw_finish_ioctl, DRM_RENDER_ALLOW),
> -	DRM_IOCTL_DEF_DRV(I915_GEM_SET_TILING, i915_gem_set_tiling, DRM_RENDER_ALLOW),
> -	DRM_IOCTL_DEF_DRV(I915_GEM_GET_TILING, i915_gem_get_tiling, DRM_RENDER_ALLOW),
> +	DRM_IOCTL_DEF_DRV(I915_GEM_SET_TILING, i915_gem_set_tiling_ioctl, DRM_RENDER_ALLOW),
> +	DRM_IOCTL_DEF_DRV(I915_GEM_GET_TILING, i915_gem_get_tiling_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_GET_APERTURE, i915_gem_get_aperture_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GET_PIPE_FROM_CRTC_ID, intel_get_pipe_from_crtc_id, 0),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_MADVISE, i915_gem_madvise_ioctl, DRM_RENDER_ALLOW),
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 4bfa3393c97b..5d7d1a9c0179 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3100,10 +3100,10 @@ int i915_gem_throttle_ioctl(struct drm_device *dev, void *data,
>  			    struct drm_file *file_priv);
>  int i915_gem_madvise_ioctl(struct drm_device *dev, void *data,
>  			   struct drm_file *file_priv);
> -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_set_tiling_ioctl(struct drm_device *dev, void *data,
> +			      struct drm_file *file_priv);
> +int i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
> +			      struct drm_file *file_priv);
>  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);
> diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
> index 23a896cd934f..6c5b8a0e8325 100644
> --- a/drivers/gpu/drm/i915/i915_gem_tiling.c
> +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
> @@ -34,8 +34,8 @@
>  /**
>   * DOC: buffer object tiling
>   *
> - * i915_gem_set_tiling() and i915_gem_get_tiling() is the userspace interface to
> - * declare fence register requirements.
> + * i915_gem_set_tiling_ioctl() and i915_gem_get_tiling_ioctl() is the userspace
> + * interface to declare fence register requirements.
>   *
>   * In principle GEM doesn't care at all about the internal data layout of an
>   * object, and hence it also doesn't care about tiling or swizzling. There's two
> @@ -164,7 +164,7 @@ i915_gem_object_fence_prepare(struct drm_i915_gem_object *obj,
>  }
>
>  /**
> - * i915_gem_set_tiling - IOCTL handler to set tiling mode
> + * i915_gem_set_tiling_ioctl - IOCTL handler to set tiling mode
>   * @dev: DRM device
>   * @data: data pointer for the ioctl
>   * @file: DRM file for the ioctl call
> @@ -178,8 +178,8 @@ i915_gem_object_fence_prepare(struct drm_i915_gem_object *obj,
>   * Zero on success, negative errno on failure.
>   */
>  int
> -i915_gem_set_tiling(struct drm_device *dev, void *data,
> -		   struct drm_file *file)
> +i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
> +			  struct drm_file *file)
>  {
>  	struct drm_i915_gem_set_tiling *args = data;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
> @@ -316,7 +316,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
>  }
>
>  /**
> - * i915_gem_get_tiling - IOCTL handler to get tiling mode
> + * i915_gem_get_tiling_ioctl - IOCTL handler to get tiling mode
>   * @dev: DRM device
>   * @data: data pointer for the ioctl
>   * @file: DRM file for the ioctl call
> @@ -329,8 +329,8 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
>   * Zero on success, negative errno on failure.
>   */
>  int
> -i915_gem_get_tiling(struct drm_device *dev, void *data,
> -		   struct drm_file *file)
> +i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
> +			  struct drm_file *file)
>  {
>  	struct drm_i915_gem_get_tiling *args = data;
>  	struct drm_i915_private *dev_priv = to_i915(dev);
>

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

Regards,

Tvrtko