Commit 4b63539b authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Define a drm_invalid_op ioctl implementation 



And use it in radeon to replace all the ioctls no longer valid in kms
mode. I plan to also use this later on when nuking the ums support for
i915.

Note that setting the function pointer in the ioctl table to NULL
would amount to the same, but that results in some debug output from
the drm_ioctl() function. I've figured it's cleaner to have a
special-purpose function.

Cc: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a7fb8a23

drivers/gpu/drm/drm_ioctl.c

+7 −0
Original line number Diff line number Diff line
@@ -415,6 +415,13 @@ int drm_noop(struct drm_device *dev, void *data, 
}

EXPORT_SYMBOL(drm_noop);



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

		   struct drm_file *file_priv)

{

	return -EINVAL;

}

EXPORT_SYMBOL(drm_invalid_op);



/**

 * Copy and IOCTL return string to user space

 */

drivers/gpu/drm/radeon/radeon_kms.c

+27 −67
Original line number Diff line number Diff line
@@ -844,74 +844,34 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc, 
						     &drmcrtc->hwmode);

}



#define KMS_INVALID_IOCTL(name)						\

static int name(struct drm_device *dev, void *data, struct drm_file	\

		*file_priv)						\

{									\

	DRM_ERROR("invalid ioctl with kms %s\n", __func__);		\

	return -EINVAL;							\

}



/*

 * All these ioctls are invalid in kms world.

 */

KMS_INVALID_IOCTL(radeon_cp_init_kms)

KMS_INVALID_IOCTL(radeon_cp_start_kms)

KMS_INVALID_IOCTL(radeon_cp_stop_kms)

KMS_INVALID_IOCTL(radeon_cp_reset_kms)

KMS_INVALID_IOCTL(radeon_cp_idle_kms)

KMS_INVALID_IOCTL(radeon_cp_resume_kms)

KMS_INVALID_IOCTL(radeon_engine_reset_kms)

KMS_INVALID_IOCTL(radeon_fullscreen_kms)

KMS_INVALID_IOCTL(radeon_cp_swap_kms)

KMS_INVALID_IOCTL(radeon_cp_clear_kms)

KMS_INVALID_IOCTL(radeon_cp_vertex_kms)

KMS_INVALID_IOCTL(radeon_cp_indices_kms)

KMS_INVALID_IOCTL(radeon_cp_texture_kms)

KMS_INVALID_IOCTL(radeon_cp_stipple_kms)

KMS_INVALID_IOCTL(radeon_cp_indirect_kms)

KMS_INVALID_IOCTL(radeon_cp_vertex2_kms)

KMS_INVALID_IOCTL(radeon_cp_cmdbuf_kms)

KMS_INVALID_IOCTL(radeon_cp_getparam_kms)

KMS_INVALID_IOCTL(radeon_cp_flip_kms)

KMS_INVALID_IOCTL(radeon_mem_alloc_kms)

KMS_INVALID_IOCTL(radeon_mem_free_kms)

KMS_INVALID_IOCTL(radeon_mem_init_heap_kms)

KMS_INVALID_IOCTL(radeon_irq_emit_kms)

KMS_INVALID_IOCTL(radeon_irq_wait_kms)

KMS_INVALID_IOCTL(radeon_cp_setparam_kms)

KMS_INVALID_IOCTL(radeon_surface_alloc_kms)

KMS_INVALID_IOCTL(radeon_surface_free_kms)





const struct drm_ioctl_desc radeon_ioctls_kms[] = {

	DRM_IOCTL_DEF_DRV(RADEON_CP_INIT, radeon_cp_init_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_START, radeon_cp_start_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_STOP, radeon_cp_stop_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_RESET, radeon_cp_reset_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_IDLE, radeon_cp_idle_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_CP_RESUME, radeon_cp_resume_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_RESET, radeon_engine_reset_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_FULLSCREEN, radeon_fullscreen_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SWAP, radeon_cp_swap_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_CLEAR, radeon_cp_clear_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_VERTEX, radeon_cp_vertex_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_INDICES, radeon_cp_indices_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_TEXTURE, radeon_cp_texture_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_STIPPLE, radeon_cp_stipple_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_INDIRECT, radeon_cp_indirect_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_VERTEX2, radeon_cp_vertex2_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_CMDBUF, radeon_cp_cmdbuf_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_GETPARAM, radeon_cp_getparam_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_FLIP, radeon_cp_flip_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_ALLOC, radeon_mem_alloc_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_FREE, radeon_mem_free_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_INIT_HEAP, radeon_mem_init_heap_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_IRQ_EMIT, radeon_irq_emit_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_IRQ_WAIT, radeon_irq_wait_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SETPARAM, radeon_cp_setparam_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SURF_ALLOC, radeon_surface_alloc_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SURF_FREE, radeon_surface_free_kms, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_CP_INIT, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_START, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_STOP, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_RESET, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_CP_IDLE, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_CP_RESUME, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_RESET, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_FULLSCREEN, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SWAP, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_CLEAR, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_VERTEX, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_INDICES, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_TEXTURE, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_STIPPLE, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_INDIRECT, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_VERTEX2, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_CMDBUF, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_GETPARAM, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_FLIP, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_ALLOC, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_FREE, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_INIT_HEAP, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF_DRV(RADEON_IRQ_EMIT, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_IRQ_WAIT, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SETPARAM, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SURF_ALLOC, drm_invalid_op, DRM_AUTH),

	DRM_IOCTL_DEF_DRV(RADEON_SURF_FREE, drm_invalid_op, DRM_AUTH),

	/* KMS */

	DRM_IOCTL_DEF_DRV(RADEON_GEM_INFO, radeon_gem_info_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(RADEON_GEM_CREATE, radeon_gem_create_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),

include/drm/drmP.h

+2 −0
Original line number Diff line number Diff line
@@ -910,6 +910,8 @@ extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); 
/* Misc. IOCTL support (drm_ioctl.c) */

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

	     struct drm_file *file_priv);

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

		   struct drm_file *file_priv);



/* Cache management (drm_cache.c) */

void drm_clflush_pages(struct page *pages[], unsigned long num_pages);

CRA Git | Maintained and supported by SUSTech CRA and CCSE