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

Commit b6dcaaac authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/vblank: _ioctl posfix for ioctl handler 



I alwasy get confused about drm_wait_vblank for a split second until I
realize it's the ioctl handler. Unconfuse me, and do it for the legacy
modeset vblank control ioctl too.

While at it also noticed that I misplaced the irq ioctl handler in the
internal header file.

Acked-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170524145212.27837-12-daniel.vetter@ffwll.ch
parent 57d30230

drivers/gpu/drm/drm_internal.h

+8 −4
Original line number Diff line number Diff line
@@ -58,11 +58,15 @@ extern unsigned int drm_timestamp_monotonic; 
void drm_vblank_disable_and_save(struct drm_device *dev, unsigned int pipe);



/* IOCTLS */

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

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

			  struct drm_file *filp);

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

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

				 struct drm_file *file_priv);

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



/* drm_irq.c */



/* IOCTLS */

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

			   struct drm_file *file_priv);



/* drm_auth.c */

drivers/gpu/drm/drm_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -600,9 +600,9 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_legacy_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_legacy_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),



	DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank_ioctl, DRM_UNLOCKED),



	DRM_IOCTL_DEF(DRM_IOCTL_MODESET_CTL, drm_legacy_modeset_ctl, 0),

	DRM_IOCTL_DEF(DRM_IOCTL_MODESET_CTL, drm_legacy_modeset_ctl_ioctl, 0),



	DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

drivers/gpu/drm/drm_vblank.c

+4 −18
Original line number Diff line number Diff line
@@ -1293,7 +1293,7 @@ static void drm_legacy_vblank_post_modeset(struct drm_device *dev, 
	}

}



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

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

				 struct drm_file *file_priv)

{

	struct drm_modeset_ctl *modeset = data;
@@ -1413,21 +1413,7 @@ static bool drm_wait_vblank_is_query(union drm_wait_vblank *vblwait) 
					  _DRM_VBLANK_NEXTONMISS));

}



/*

 * Wait for VBLANK.

 *

 * \param inode device inode.

 * \param file_priv DRM file private.

 * \param cmd command.

 * \param data user argument, pointing to a drm_wait_vblank structure.

 * \return zero on success or a negative number on failure.

 *

 * This function enables the vblank interrupt on the pipe requested, then

 * sleeps waiting for the requested sequence number to occur, and drops

 * the vblank interrupt refcount afterwards. (vblank IRQ disable follows that

 * after a timeout with no further vblank waits scheduled).

 */

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

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

			  struct drm_file *file_priv)

{

	struct drm_vblank_crtc *vblank;