Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 111dbcab authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Include ioctl in set-tiling and get-tiling function names 



Make it clear that these functions are the user entry points for
the tiling/fence registers.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170110121045.27144-1-chris@chris-wilson.co.uk
parent 8201c1fa

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -2549,8 +2549,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),

drivers/gpu/drm/i915/i915_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -3101,9 +3101,9 @@ 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,

int i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,

			      struct drm_file *file_priv);

int i915_gem_get_tiling(struct drm_device *dev, void *data,

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,

drivers/gpu/drm/i915/i915_gem_tiling.c

+8 −8
Original line number Diff line number Diff line
@@ -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
@@ -233,7 +233,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
@@ -247,7 +247,7 @@ 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,

i915_gem_set_tiling_ioctl(struct drm_device *dev, void *data,

			  struct drm_file *file)

{

	struct drm_i915_gem_set_tiling *args = data;
@@ -385,7 +385,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
@@ -398,7 +398,7 @@ 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,

i915_gem_get_tiling_ioctl(struct drm_device *dev, void *data,

			  struct drm_file *file)

{

	struct drm_i915_gem_get_tiling *args = data;