[PATCH] drm: const'ify ioctls table (v2)
Alex Deucher
alexdeucher at gmail.com
Fri Aug 2 13:22:39 PDT 2013
On Fri, Aug 2, 2013 at 1:27 PM, Rob Clark <robdclark at gmail.com> wrote:
> Because, there is no reason for it not to be const.
>
> v1: original
> v2: fix compile break in vmwgfx, and couple related cleanups suggested
> by Ville Syrjälä
>
> Signed-off-by: Rob Clark <robdclark at gmail.com>
Seems reasonable to me.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 ++--
> drivers/gpu/drm/gma500/psb_drv.c | 2 +-
> drivers/gpu/drm/i810/i810_dma.c | 2 +-
> drivers/gpu/drm/i810/i810_drv.h | 2 +-
> drivers/gpu/drm/i915/i915_dma.c | 2 +-
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/mga/mga_drv.h | 2 +-
> drivers/gpu/drm/mga/mga_state.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_drm.c | 5 ++---
> drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
> drivers/gpu/drm/qxl/qxl_drv.h | 2 +-
> drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +-
> drivers/gpu/drm/r128/r128_drv.h | 2 +-
> drivers/gpu/drm/r128/r128_state.c | 2 +-
> drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
> drivers/gpu/drm/radeon/radeon_kms.c | 2 +-
> drivers/gpu/drm/savage/savage_bci.c | 2 +-
> drivers/gpu/drm/savage/savage_drv.h | 2 +-
> drivers/gpu/drm/sis/sis_drv.h | 2 +-
> drivers/gpu/drm/sis/sis_mm.c | 2 +-
> drivers/gpu/drm/via/via_dma.c | 2 +-
> drivers/gpu/drm/via/via_drv.h | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 ++--
> drivers/gpu/host1x/drm/drm.c | 2 +-
> drivers/staging/imx-drm/imx-drm-core.c | 2 +-
> include/drm/drmP.h | 2 +-
> 26 files changed, 29 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> index ca2729a..7b9c879 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c
> @@ -213,7 +213,7 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = {
> .close = drm_gem_vm_close,
> };
>
> -static struct drm_ioctl_desc exynos_ioctls[] = {
> +static const struct drm_ioctl_desc exynos_ioctls[] = {
> DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl,
> DRM_UNLOCKED | DRM_AUTH),
> DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MAP_OFFSET,
> @@ -277,6 +277,7 @@ static struct drm_driver exynos_drm_driver = {
> .gem_prime_export = exynos_dmabuf_prime_export,
> .gem_prime_import = exynos_dmabuf_prime_import,
> .ioctls = exynos_ioctls,
> + .num_ioctls = ARRAY_SIZE(exynos_ioctls),
> .fops = &exynos_drm_driver_fops,
> .name = DRIVER_NAME,
> .desc = DRIVER_DESC,
> @@ -288,7 +289,6 @@ static struct drm_driver exynos_drm_driver = {
> static int exynos_drm_platform_probe(struct platform_device *pdev)
> {
> pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
> - exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls);
>
> return drm_platform_init(&exynos_drm_driver, pdev);
> }
> diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
> index bddea58..ffc9e25 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.c
> +++ b/drivers/gpu/drm/gma500/psb_drv.c
> @@ -131,7 +131,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
> static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,
> struct drm_file *file_priv);
>
> -static struct drm_ioctl_desc psb_ioctls[] = {
> +static const struct drm_ioctl_desc psb_ioctls[] = {
> DRM_IOCTL_DEF_DRV(GMA_ADB, psb_adb_ioctl, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(GMA_MODE_OPERATION, psb_mode_operation_ioctl,
> DRM_AUTH),
> diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
> index ada49ed..eac755b 100644
> --- a/drivers/gpu/drm/i810/i810_dma.c
> +++ b/drivers/gpu/drm/i810/i810_dma.c
> @@ -1241,7 +1241,7 @@ int i810_driver_dma_quiescent(struct drm_device *dev)
> return 0;
> }
>
> -struct drm_ioctl_desc i810_ioctls[] = {
> +const struct drm_ioctl_desc i810_ioctls[] = {
> DRM_IOCTL_DEF_DRV(I810_INIT, i810_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED),
> DRM_IOCTL_DEF_DRV(I810_VERTEX, i810_dma_vertex, DRM_AUTH|DRM_UNLOCKED),
> DRM_IOCTL_DEF_DRV(I810_CLEAR, i810_clear_bufs, DRM_AUTH|DRM_UNLOCKED),
> diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
> index 6e0acad..d4d16ed 100644
> --- a/drivers/gpu/drm/i810/i810_drv.h
> +++ b/drivers/gpu/drm/i810/i810_drv.h
> @@ -125,7 +125,7 @@ extern void i810_driver_preclose(struct drm_device *dev,
> extern int i810_driver_device_is_agp(struct drm_device *dev);
>
> extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
> -extern struct drm_ioctl_desc i810_ioctls[];
> +extern const struct drm_ioctl_desc i810_ioctls[];
> extern int i810_max_ioctl;
>
> #define I810_BASE(reg) ((unsigned long) \
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 6ce9033..78ad4dc 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1834,7 +1834,7 @@ void i915_driver_postclose(struct drm_device *dev, struct drm_file *file)
> kfree(file_priv);
> }
>
> -struct drm_ioctl_desc i915_ioctls[] = {
> +const struct drm_ioctl_desc i915_ioctls[] = {
> DRM_IOCTL_DEF_DRV(I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF_DRV(I915_FLUSH, i915_flush_ioctl, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(I915_FLIP, i915_flip_bufs, DRM_AUTH),
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index cef35d3..37d8c92 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1566,7 +1566,7 @@ struct drm_i915_file_private {
> #define INTEL_RC6p_ENABLE (1<<1)
> #define INTEL_RC6pp_ENABLE (1<<2)
>
> -extern struct drm_ioctl_desc i915_ioctls[];
> +extern const struct drm_ioctl_desc i915_ioctls[];
> extern int i915_max_ioctl;
> extern unsigned int i915_fbpercrtc __always_unused;
> extern int i915_panel_ignore_lid __read_mostly;
> diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
> index 54558a0..ca4bc54 100644
> --- a/drivers/gpu/drm/mga/mga_drv.h
> +++ b/drivers/gpu/drm/mga/mga_drv.h
> @@ -149,7 +149,7 @@ typedef struct drm_mga_private {
> unsigned int agp_size;
> } drm_mga_private_t;
>
> -extern struct drm_ioctl_desc mga_ioctls[];
> +extern const struct drm_ioctl_desc mga_ioctls[];
> extern int mga_max_ioctl;
>
> /* mga_dma.c */
> diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
> index 9c14514..37cc2fb 100644
> --- a/drivers/gpu/drm/mga/mga_state.c
> +++ b/drivers/gpu/drm/mga/mga_state.c
> @@ -1083,7 +1083,7 @@ file_priv)
> return 0;
> }
>
> -struct drm_ioctl_desc mga_ioctls[] = {
> +const struct drm_ioctl_desc mga_ioctls[] = {
> DRM_IOCTL_DEF_DRV(MGA_INIT, mga_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF_DRV(MGA_FLUSH, mga_dma_flush, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(MGA_RESET, mga_dma_reset, DRM_AUTH),
> diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
> index e990327..bcd0199 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
> @@ -640,7 +640,7 @@ nouveau_drm_postclose(struct drm_device *dev, struct drm_file *fpriv)
> nouveau_cli_destroy(cli);
> }
>
> -static struct drm_ioctl_desc
> +static const struct drm_ioctl_desc
> nouveau_ioctls[] = {
> DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam, DRM_UNLOCKED|DRM_AUTH),
> DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> @@ -695,6 +695,7 @@ driver = {
> .disable_vblank = nouveau_drm_vblank_disable,
>
> .ioctls = nouveau_ioctls,
> + .num_ioctls = ARRAY_SIZE(nouveau_ioctls),
> .fops = &nouveau_driver_fops,
>
> .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> @@ -765,8 +766,6 @@ nouveau_drm_pci_driver = {
> static int __init
> nouveau_drm_init(void)
> {
> - driver.num_ioctls = ARRAY_SIZE(nouveau_ioctls);
> -
> if (nouveau_modeset == -1) {
> #ifdef CONFIG_VGA_CONSOLE
> if (vgacon_text_force())
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> index a3004f1..22a9a5f 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -419,7 +419,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data,
> return ret;
> }
>
> -static struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
> +static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = {
> DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param, DRM_UNLOCKED|DRM_AUTH),
> DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new, DRM_UNLOCKED|DRM_AUTH),
> diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
> index aacb791..bb489c4 100644
> --- a/drivers/gpu/drm/qxl/qxl_drv.h
> +++ b/drivers/gpu/drm/qxl/qxl_drv.h
> @@ -319,7 +319,7 @@ struct qxl_device {
> /* forward declaration for QXL_INFO_IO */
> void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...);
>
> -extern struct drm_ioctl_desc qxl_ioctls[];
> +extern const struct drm_ioctl_desc qxl_ioctls[];
> extern int qxl_max_ioctl;
>
> int qxl_driver_load(struct drm_device *dev, unsigned long flags);
> diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
> index 27f45e4..6cd7273 100644
> --- a/drivers/gpu/drm/qxl/qxl_ioctl.c
> +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
> @@ -402,7 +402,7 @@ static int qxl_alloc_surf_ioctl(struct drm_device *dev, void *data,
> return ret;
> }
>
> -struct drm_ioctl_desc qxl_ioctls[] = {
> +const struct drm_ioctl_desc qxl_ioctls[] = {
> DRM_IOCTL_DEF_DRV(QXL_ALLOC, qxl_alloc_ioctl, DRM_AUTH|DRM_UNLOCKED),
>
> DRM_IOCTL_DEF_DRV(QXL_MAP, qxl_map_ioctl, DRM_AUTH|DRM_UNLOCKED),
> diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
> index 930c71b..56eb5e3 100644
> --- a/drivers/gpu/drm/r128/r128_drv.h
> +++ b/drivers/gpu/drm/r128/r128_drv.h
> @@ -131,7 +131,7 @@ typedef struct drm_r128_buf_priv {
> drm_r128_freelist_t *list_entry;
> } drm_r128_buf_priv_t;
>
> -extern struct drm_ioctl_desc r128_ioctls[];
> +extern const struct drm_ioctl_desc r128_ioctls[];
> extern int r128_max_ioctl;
>
> /* r128_cce.c */
> diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
> index 19bb7e6..01dd9ae 100644
> --- a/drivers/gpu/drm/r128/r128_state.c
> +++ b/drivers/gpu/drm/r128/r128_state.c
> @@ -1643,7 +1643,7 @@ void r128_driver_lastclose(struct drm_device *dev)
> r128_do_cleanup_cce(dev);
> }
>
> -struct drm_ioctl_desc r128_ioctls[] = {
> +const struct drm_ioctl_desc r128_ioctls[] = {
> DRM_IOCTL_DEF_DRV(R128_INIT, r128_cce_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF_DRV(R128_CCE_START, r128_cce_start, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF_DRV(R128_CCE_STOP, r128_cce_stop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
> index cb7f1a8..e2df2e9 100644
> --- a/drivers/gpu/drm/radeon/radeon_drv.c
> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
> @@ -109,7 +109,7 @@ void radeon_gem_object_close(struct drm_gem_object *obj,
> struct drm_file *file_priv);
> extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,
> int *vpos, int *hpos);
> -extern struct drm_ioctl_desc radeon_ioctls_kms[];
> +extern const struct drm_ioctl_desc radeon_ioctls_kms[];
> extern int radeon_max_kms_ioctl;
> int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
> int radeon_mode_dumb_mmap(struct drm_file *filp,
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
> index 07b0236..866c2b7 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -722,7 +722,7 @@ KMS_INVALID_IOCTL(radeon_surface_alloc_kms)
> KMS_INVALID_IOCTL(radeon_surface_free_kms)
>
>
> -struct drm_ioctl_desc radeon_ioctls_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),
> diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c
> index bd6b2cf..b17d071 100644
> --- a/drivers/gpu/drm/savage/savage_bci.c
> +++ b/drivers/gpu/drm/savage/savage_bci.c
> @@ -1072,7 +1072,7 @@ void savage_reclaim_buffers(struct drm_device *dev, struct drm_file *file_priv)
> drm_idlelock_release(&file_priv->master->lock);
> }
>
> -struct drm_ioctl_desc savage_ioctls[] = {
> +const struct drm_ioctl_desc savage_ioctls[] = {
> DRM_IOCTL_DEF_DRV(SAVAGE_BCI_INIT, savage_bci_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
> DRM_IOCTL_DEF_DRV(SAVAGE_BCI_CMDBUF, savage_bci_cmdbuf, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(SAVAGE_BCI_EVENT_EMIT, savage_bci_event_emit, DRM_AUTH),
> diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h
> index c05082a..335f8fc 100644
> --- a/drivers/gpu/drm/savage/savage_drv.h
> +++ b/drivers/gpu/drm/savage/savage_drv.h
> @@ -104,7 +104,7 @@ enum savage_family {
> S3_LAST
> };
>
> -extern struct drm_ioctl_desc savage_ioctls[];
> +extern const struct drm_ioctl_desc savage_ioctls[];
> extern int savage_max_ioctl;
>
> #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
> diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
> index 13b527b..c31c025 100644
> --- a/drivers/gpu/drm/sis/sis_drv.h
> +++ b/drivers/gpu/drm/sis/sis_drv.h
> @@ -70,7 +70,7 @@ extern void sis_reclaim_buffers_locked(struct drm_device *dev,
> struct drm_file *file_priv);
> extern void sis_lastclose(struct drm_device *dev);
>
> -extern struct drm_ioctl_desc sis_ioctls[];
> +extern const struct drm_ioctl_desc sis_ioctls[];
> extern int sis_max_ioctl;
>
> #endif
> diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c
> index 9a43d98..0f8b7eb 100644
> --- a/drivers/gpu/drm/sis/sis_mm.c
> +++ b/drivers/gpu/drm/sis/sis_mm.c
> @@ -348,7 +348,7 @@ void sis_reclaim_buffers_locked(struct drm_device *dev,
> return;
> }
>
> -struct drm_ioctl_desc sis_ioctls[] = {
> +const struct drm_ioctl_desc sis_ioctls[] = {
> DRM_IOCTL_DEF_DRV(SIS_FB_ALLOC, sis_fb_alloc, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(SIS_FB_FREE, sis_drm_free, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(SIS_AGP_INIT, sis_ioctl_agp_init, DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY),
> diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c
> index 13558f5..652f9b4 100644
> --- a/drivers/gpu/drm/via/via_dma.c
> +++ b/drivers/gpu/drm/via/via_dma.c
> @@ -720,7 +720,7 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *
> return ret;
> }
>
> -struct drm_ioctl_desc via_ioctls[] = {
> +const struct drm_ioctl_desc via_ioctls[] = {
> DRM_IOCTL_DEF_DRV(VIA_ALLOCMEM, via_mem_alloc, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(VIA_FREEMEM, via_mem_free, DRM_AUTH),
> DRM_IOCTL_DEF_DRV(VIA_AGP_INIT, via_agp_init, DRM_AUTH|DRM_MASTER),
> diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
> index 893a650..a811ef2 100644
> --- a/drivers/gpu/drm/via/via_drv.h
> +++ b/drivers/gpu/drm/via/via_drv.h
> @@ -114,7 +114,7 @@ enum via_family {
> #define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg)
> #define VIA_WRITE8(reg, val) DRM_WRITE8(VIA_BASE, reg, val)
>
> -extern struct drm_ioctl_desc via_ioctls[];
> +extern const struct drm_ioctl_desc via_ioctls[];
> extern int via_max_ioctl;
>
> extern int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv);
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> index 78e2164..5086150 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
> @@ -124,7 +124,7 @@
> * Ioctl definitions.
> */
>
> -static struct drm_ioctl_desc vmw_ioctls[] = {
> +static const struct drm_ioctl_desc vmw_ioctls[] = {
> VMW_IOCTL_DEF(VMW_GET_PARAM, vmw_getparam_ioctl,
> DRM_AUTH | DRM_UNLOCKED),
> VMW_IOCTL_DEF(VMW_ALLOC_DMABUF, vmw_dmabuf_alloc_ioctl,
> @@ -782,7 +782,7 @@ static long vmw_unlocked_ioctl(struct file *filp, unsigned int cmd,
>
> if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
> && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) {
> - struct drm_ioctl_desc *ioctl =
> + const struct drm_ioctl_desc *ioctl =
> &vmw_ioctls[nr - DRM_COMMAND_BASE];
>
> if (unlikely(ioctl->cmd_drv != cmd)) {
> diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c
> index e184b00..7a3c9f2 100644
> --- a/drivers/gpu/host1x/drm/drm.c
> +++ b/drivers/gpu/host1x/drm/drm.c
> @@ -487,7 +487,7 @@ static int tegra_submit(struct drm_device *drm, void *data,
> }
> #endif
>
> -static struct drm_ioctl_desc tegra_drm_ioctls[] = {
> +static const struct drm_ioctl_desc tegra_drm_ioctls[] = {
> #ifdef CONFIG_DRM_TEGRA_STAGING
> DRM_IOCTL_DEF_DRV(TEGRA_GEM_CREATE, tegra_gem_create, DRM_UNLOCKED | DRM_AUTH),
> DRM_IOCTL_DEF_DRV(TEGRA_GEM_MMAP, tegra_gem_mmap, DRM_UNLOCKED),
> diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
> index 9854a1d..9610229 100644
> --- a/drivers/staging/imx-drm/imx-drm-core.c
> +++ b/drivers/staging/imx-drm/imx-drm-core.c
> @@ -783,7 +783,7 @@ int imx_drm_remove_connector(struct imx_drm_connector *imx_drm_connector)
> }
> EXPORT_SYMBOL_GPL(imx_drm_remove_connector);
>
> -static struct drm_ioctl_desc imx_drm_ioctls[] = {
> +static const struct drm_ioctl_desc imx_drm_ioctls[] = {
> /* none so far */
> };
>
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 4b518e0..1cc765a 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -965,7 +965,7 @@ struct drm_driver {
>
> u32 driver_features;
> int dev_priv_size;
> - struct drm_ioctl_desc *ioctls;
> + const struct drm_ioctl_desc *ioctls;
> int num_ioctls;
> const struct file_operations *fops;
> union {
> --
> 1.8.3.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
More information about the dri-devel
mailing list