tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm: define drm_compat_ioctl NULL on CONFIG_COMPAT=n and reduce #ifdefs
If we define drm_compat_ioctl NULL on CONFIG_COMPAT=n, we don't have to
check for the config everywhere.
Reviewed-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1478014844-27454-1-git-send-email-jani.nikula@intel.com
authored by
Jani Nikula
and committed by
Sean Paul
55edf41b
0a97c81a
+13
-71
-2
drivers/gpu/drm/arc/arcpgu_drv.c
-2
drivers/gpu/drm/arc/arcpgu_drv.c
-2
drivers/gpu/drm/arm/hdlcd_drv.c
-2
drivers/gpu/drm/arm/hdlcd_drv.c
-2
drivers/gpu/drm/arm/malidp_drv.c
-2
drivers/gpu/drm/arm/malidp_drv.c
-2
drivers/gpu/drm/ast/ast_drv.c
-2
drivers/gpu/drm/ast/ast_drv.c
-2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
-2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
-2
drivers/gpu/drm/bochs/bochs_drv.c
-2
drivers/gpu/drm/bochs/bochs_drv.c
-2
drivers/gpu/drm/cirrus/cirrus_drv.c
-2
drivers/gpu/drm/cirrus/cirrus_drv.c
+6
-7
drivers/gpu/drm/drm_fops.c
+6
-7
drivers/gpu/drm/drm_fops.c
···
51
51
* Drivers must define the file operations structure that forms the DRM
52
52
* userspace API entry point, even though most of those operations are
53
53
* implemented in the DRM core. The mandatory functions are drm_open(),
54
-
* drm_read(), drm_ioctl() and drm_compat_ioctl if CONFIG_COMPAT is enabled.
55
-
* Drivers which implement private ioctls that require 32/64 bit compatibility
56
-
* support must provided their onw .compat_ioctl() handler that processes
57
-
* private ioctls and calls drm_compat_ioctl() for core ioctls.
54
+
* drm_read(), drm_ioctl() and drm_compat_ioctl() if CONFIG_COMPAT is enabled
55
+
* (note that drm_compat_ioctl will be NULL if CONFIG_COMPAT=n). Drivers which
56
+
* implement private ioctls that require 32/64 bit compatibility support must
57
+
* provide their own .compat_ioctl() handler that processes private ioctls and
58
+
* calls drm_compat_ioctl() for core ioctls.
58
59
*
59
60
* In addition drm_read() and drm_poll() provide support for DRM events. DRM
60
61
* events are a generic and extensible means to send asynchronous events to
···
76
75
* .open = drm_open,
77
76
* .release = drm_release,
78
77
* .unlocked_ioctl = drm_ioctl,
79
-
* #ifdef CONFIG_COMPAT
80
-
* .compat_ioctl = drm_compat_ioctl,
81
-
* #endif
78
+
* .compat_ioctl = drm_compat_ioctl, // NULL if CONFIG_COMPAT=n
82
79
* .poll = drm_poll,
83
80
* .read = drm_read,
84
81
* .llseek = no_llseek,
-2
drivers/gpu/drm/exynos/exynos_drm_drv.c
-2
drivers/gpu/drm/exynos/exynos_drm_drv.c
-2
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
-2
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
-2
drivers/gpu/drm/gma500/psb_drv.c
-2
drivers/gpu/drm/gma500/psb_drv.c
-2
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
-2
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c
-2
drivers/gpu/drm/i810/i810_dma.c
-2
drivers/gpu/drm/i810/i810_dma.c
-2
drivers/gpu/drm/i810/i810_drv.c
-2
drivers/gpu/drm/i810/i810_drv.c
-2
drivers/gpu/drm/i915/i915_drv.c
-2
drivers/gpu/drm/i915/i915_drv.c
+2
drivers/gpu/drm/i915/i915_drv.h
+2
drivers/gpu/drm/i915/i915_drv.h
-2
drivers/gpu/drm/mediatek/mtk_drm_drv.c
-2
drivers/gpu/drm/mediatek/mtk_drm_drv.c
-2
drivers/gpu/drm/mgag200/mgag200_drv.c
-2
drivers/gpu/drm/mgag200/mgag200_drv.c
-2
drivers/gpu/drm/msm/msm_drv.c
-2
drivers/gpu/drm/msm/msm_drv.c
-2
drivers/gpu/drm/rcar-du/rcar_du_drv.c
-2
drivers/gpu/drm/rcar-du/rcar_du_drv.c
-2
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
-2
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
-2
drivers/gpu/drm/savage/savage_drv.c
-2
drivers/gpu/drm/savage/savage_drv.c
-2
drivers/gpu/drm/shmobile/shmob_drm_drv.c
-2
drivers/gpu/drm/shmobile/shmob_drm_drv.c
-2
drivers/gpu/drm/sis/sis_drv.c
-2
drivers/gpu/drm/sis/sis_drv.c
-2
drivers/gpu/drm/sti/sti_drv.c
-2
drivers/gpu/drm/sti/sti_drv.c
-2
drivers/gpu/drm/sun4i/sun4i_drv.c
-2
drivers/gpu/drm/sun4i/sun4i_drv.c
-2
drivers/gpu/drm/tdfx/tdfx_drv.c
-2
drivers/gpu/drm/tdfx/tdfx_drv.c
-2
drivers/gpu/drm/tegra/drm.c
-2
drivers/gpu/drm/tegra/drm.c
-2
drivers/gpu/drm/tilcdc/tilcdc_drv.c
-2
drivers/gpu/drm/tilcdc/tilcdc_drv.c
-2
drivers/gpu/drm/udl/udl_drv.c
-2
drivers/gpu/drm/udl/udl_drv.c
-2
drivers/gpu/drm/vc4/vc4_drv.c
-2
drivers/gpu/drm/vc4/vc4_drv.c
-2
drivers/gpu/drm/via/via_drv.c
-2
drivers/gpu/drm/via/via_drv.c
-2
drivers/gpu/drm/virtio/virtgpu_drv.c
-2
drivers/gpu/drm/virtio/virtgpu_drv.c
+5
include/drm/drmP.h
+5
include/drm/drmP.h
···
941
941
extern int drm_ioctl_permit(u32 flags, struct drm_file *file_priv);
942
942
extern long drm_ioctl(struct file *filp,
943
943
unsigned int cmd, unsigned long arg);
944
+
#ifdef CONFIG_COMPAT
944
945
extern long drm_compat_ioctl(struct file *filp,
945
946
unsigned int cmd, unsigned long arg);
947
+
#else
948
+
/* Let drm_compat_ioctl be assigned to .compat_ioctl unconditionally */
949
+
#define drm_compat_ioctl NULL
950
+
#endif
946
951
extern bool drm_ioctl_flags(unsigned int nr, unsigned int *flags);
947
952
948
953
/* File Operations (drm_fops.c) */