Commit f1f3e375 authored by Zack Rusin's avatar Zack Rusin
Browse files

drm/vmwgfx: Switch to using DRM_IOCTL_DEF_DRV 



The macro has been accounting for DRM_COMMAND_BASE for a long time
now so there's no reason to still be duplicating it. Plus we were
leaving the name undefined which meant that all the DRM ioctl
warnings/errors were always listing "null" ioctl at the culprit.

This fixes the undefined ioctl name and removes duplicated code.

Signed-off-by: default avatarZack Rusin <zackr@vmware.com>
Reviewed-by: default avatarMartin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210723165153.113198-1-zackr@vmware.com
parent 92bd92c4

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+84 −92
Original line number Diff line number Diff line
@@ -159,64 +159,56 @@ 
	DRM_IOW(DRM_COMMAND_BASE + DRM_VMW_MKSSTAT_REMOVE,	\

		struct drm_vmw_mksstat_remove_arg)



/*

 * The core DRM version of this macro doesn't account for

 * DRM_COMMAND_BASE.

 */



#define VMW_IOCTL_DEF(ioctl, func, flags) \

  [DRM_IOCTL_NR(DRM_IOCTL_##ioctl) - DRM_COMMAND_BASE] = {DRM_IOCTL_##ioctl, flags, func}



/*

 * Ioctl definitions.

 */



static const struct drm_ioctl_desc vmw_ioctls[] = {

	VMW_IOCTL_DEF(VMW_GET_PARAM, vmw_getparam_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_GET_PARAM, vmw_getparam_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_ALLOC_DMABUF, vmw_bo_alloc_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_ALLOC_DMABUF, vmw_bo_alloc_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_UNREF_DMABUF, vmw_bo_unref_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_UNREF_DMABUF, vmw_bo_unref_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_CURSOR_BYPASS,

	DRM_IOCTL_DEF_DRV(VMW_CURSOR_BYPASS,

			  vmw_kms_cursor_bypass_ioctl,

			  DRM_MASTER),



	VMW_IOCTL_DEF(VMW_CONTROL_STREAM, vmw_overlay_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_CONTROL_STREAM, vmw_overlay_ioctl,

			  DRM_MASTER),

	VMW_IOCTL_DEF(VMW_CLAIM_STREAM, vmw_stream_claim_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_CLAIM_STREAM, vmw_stream_claim_ioctl,

			  DRM_MASTER),

	VMW_IOCTL_DEF(VMW_UNREF_STREAM, vmw_stream_unref_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_UNREF_STREAM, vmw_stream_unref_ioctl,

			  DRM_MASTER),



	VMW_IOCTL_DEF(VMW_CREATE_CONTEXT, vmw_context_define_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_CREATE_CONTEXT, vmw_context_define_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_UNREF_CONTEXT, vmw_context_destroy_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_UNREF_CONTEXT, vmw_context_destroy_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_CREATE_SURFACE, vmw_surface_define_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_CREATE_SURFACE, vmw_surface_define_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_UNREF_SURFACE, vmw_surface_destroy_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_UNREF_SURFACE, vmw_surface_destroy_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_REF_SURFACE, vmw_surface_reference_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_REF_SURFACE, vmw_surface_reference_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_EXECBUF, vmw_execbuf_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_EXECBUF, vmw_execbuf_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_FENCE_WAIT, vmw_fence_obj_wait_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_FENCE_WAIT, vmw_fence_obj_wait_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_FENCE_SIGNALED,

	DRM_IOCTL_DEF_DRV(VMW_FENCE_SIGNALED,

			  vmw_fence_obj_signaled_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_FENCE_UNREF, vmw_fence_obj_unref_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_FENCE_UNREF, vmw_fence_obj_unref_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_FENCE_EVENT, vmw_fence_event_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_FENCE_EVENT, vmw_fence_event_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_GET_3D_CAP, vmw_get_cap_3d_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_GET_3D_CAP, vmw_get_cap_3d_ioctl,

			  DRM_RENDER_ALLOW),



	/* these allow direct access to the framebuffers mark as master only */

	VMW_IOCTL_DEF(VMW_PRESENT, vmw_present_ioctl,

	DRM_IOCTL_DEF_DRV(VMW_PRESENT, vmw_present_ioctl,

			  DRM_MASTER | DRM_AUTH),

	VMW_IOCTL_DEF(VMW_PRESENT_READBACK,

	DRM_IOCTL_DEF_DRV(VMW_PRESENT_READBACK,

			  vmw_present_readback_ioctl,

			  DRM_MASTER | DRM_AUTH),

	/*
@@ -224,43 +216,43 @@ static const struct drm_ioctl_desc vmw_ioctls[] = { 
	 * vmw_generic_ioctl(). We require either

	 * DRM_MASTER or capable(CAP_SYS_ADMIN).

	 */

	VMW_IOCTL_DEF(VMW_UPDATE_LAYOUT,

	DRM_IOCTL_DEF_DRV(VMW_UPDATE_LAYOUT,

			  vmw_kms_update_layout_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_CREATE_SHADER,

	DRM_IOCTL_DEF_DRV(VMW_CREATE_SHADER,

			  vmw_shader_define_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_UNREF_SHADER,

	DRM_IOCTL_DEF_DRV(VMW_UNREF_SHADER,

			  vmw_shader_destroy_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_GB_SURFACE_CREATE,

	DRM_IOCTL_DEF_DRV(VMW_GB_SURFACE_CREATE,

			  vmw_gb_surface_define_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_GB_SURFACE_REF,

	DRM_IOCTL_DEF_DRV(VMW_GB_SURFACE_REF,

			  vmw_gb_surface_reference_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_SYNCCPU,

	DRM_IOCTL_DEF_DRV(VMW_SYNCCPU,

			  vmw_user_bo_synccpu_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_CREATE_EXTENDED_CONTEXT,

	DRM_IOCTL_DEF_DRV(VMW_CREATE_EXTENDED_CONTEXT,

			  vmw_extended_context_define_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_GB_SURFACE_CREATE_EXT,

	DRM_IOCTL_DEF_DRV(VMW_GB_SURFACE_CREATE_EXT,

			  vmw_gb_surface_define_ext_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_GB_SURFACE_REF_EXT,

	DRM_IOCTL_DEF_DRV(VMW_GB_SURFACE_REF_EXT,

			  vmw_gb_surface_reference_ext_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_MSG,

	DRM_IOCTL_DEF_DRV(VMW_MSG,

			  vmw_msg_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_MKSSTAT_RESET,

	DRM_IOCTL_DEF_DRV(VMW_MKSSTAT_RESET,

			  vmw_mksstat_reset_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_MKSSTAT_ADD,

	DRM_IOCTL_DEF_DRV(VMW_MKSSTAT_ADD,

			  vmw_mksstat_add_ioctl,

			  DRM_RENDER_ALLOW),

	VMW_IOCTL_DEF(VMW_MKSSTAT_REMOVE,

	DRM_IOCTL_DEF_DRV(VMW_MKSSTAT_REMOVE,

			  vmw_mksstat_remove_ioctl,

			  DRM_RENDER_ALLOW),

};