Commit 6a20fe7b authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Give all ioctl functions an _ioctl suffix 



Most of our ioctl functions have an _ioctl suffix in the name. I like
that idea since it makes it easy to figure out how the function is
going to get called. Rename the handful of exceptions to follow the
same pattern.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180207164841.19431-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 89746e79

drivers/gpu/drm/i915/i915_drv.c

+7 −7
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static void intel_detect_pch(struct drm_i915_private *dev_priv) 
	pci_dev_put(pch);

}



static int i915_getparam(struct drm_device *dev, void *data,

static int i915_getparam_ioctl(struct drm_device *dev, void *data,

			       struct drm_file *file_priv)

{

	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -2792,7 +2792,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_BATCHBUFFER, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_IRQ_EMIT, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_IRQ_WAIT, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_GETPARAM, i915_getparam, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GETPARAM, i915_getparam_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_SETPARAM, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_ALLOC, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_FREE, drm_noop, DRM_AUTH),
@@ -2804,8 +2804,8 @@ static const struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_VBLANK_SWAP, drm_noop, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_HWS_ADDR, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GEM_INIT, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER, i915_gem_execbuffer, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER2_WR, i915_gem_execbuffer2, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER, i915_gem_execbuffer_ioctl, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(I915_GEM_EXECBUFFER2_WR, i915_gem_execbuffer2_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_PIN, i915_gem_reject_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GEM_UNPIN, i915_gem_reject_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(I915_GEM_BUSY, i915_gem_busy_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),
@@ -2824,11 +2824,11 @@ static const struct drm_ioctl_desc i915_ioctls[] = { 
	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_GET_PIPE_FROM_CRTC_ID, intel_get_pipe_from_crtc_id_ioctl, 0),

	DRM_IOCTL_DEF_DRV(I915_GEM_MADVISE, i915_gem_madvise_ioctl, DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_OVERLAY_PUT_IMAGE, intel_overlay_put_image_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_OVERLAY_ATTRS, intel_overlay_attrs_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, drm_noop, DRM_MASTER|DRM_CONTROL_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW),

drivers/gpu/drm/i915/i915_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -3083,9 +3083,9 @@ int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, 
			      struct drm_file *file_priv);

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

			     struct drm_file *file_priv);

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

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

			      struct drm_file *file_priv);

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

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

			       struct drm_file *file_priv);

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

			struct drm_file *file_priv);

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+4 −4
Original line number Diff line number Diff line
@@ -2463,7 +2463,7 @@ static bool check_buffer_count(size_t count) 
 * list array and passes it to the real function.

 */

int

i915_gem_execbuffer(struct drm_device *dev, void *data,

i915_gem_execbuffer_ioctl(struct drm_device *dev, void *data,

			  struct drm_file *file)

{

	struct drm_i915_gem_execbuffer *args = data;
@@ -2554,7 +2554,7 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, 
}



int

i915_gem_execbuffer2(struct drm_device *dev, void *data,

i915_gem_execbuffer2_ioctl(struct drm_device *dev, void *data,

			   struct drm_file *file)

{

	struct drm_i915_gem_execbuffer2 *args = data;

drivers/gpu/drm/i915/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -13479,7 +13479,7 @@ enum pipe intel_get_pipe_from_connector(struct intel_connector *connector) 
	return to_intel_crtc(connector->base.state->crtc)->pipe;

}



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

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

				      struct drm_file *file)

{

	struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data;

drivers/gpu/drm/i915/intel_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ struct drm_display_mode * 
intel_encoder_current_mode(struct intel_encoder *encoder);



enum pipe intel_get_pipe_from_connector(struct intel_connector *connector);

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

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

				      struct drm_file *file_priv);

enum transcoder intel_pipe_to_cpu_transcoder(struct drm_i915_private *dev_priv,

					     enum pipe pipe);
@@ -1924,7 +1924,7 @@ int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode, 
			     int usecs);

struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *dev_priv,

					      enum pipe pipe, int plane);

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

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

				    struct drm_file *file_priv);

void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_state);

void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE