diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-08 15:41:29 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-19 14:15:50 +1000 |
| commit | 6eb9278adabd17da3bc1cb843c729d1b10d79c93 (patch) | |
| tree | 06e8b2806147c85bf3a5399c7d69be5948de07c9 /drivers/gpu/drm/drm_bufs.c | |
| parent | 2ba5f7d538976a9d6a70339da4be49f6652fe753 (diff) | |
| download | op-kernel-dev-6eb9278adabd17da3bc1cb843c729d1b10d79c93.zip op-kernel-dev-6eb9278adabd17da3bc1cb843c729d1b10d79c93.tar.gz | |
drm: remove the dma_ioctl special-case
We might as well have a real ioctl function which checks for the
callbacks. This seems to be a remnant from back in the days when each
drm driver had their own complete ioctl table, with no shared core
drm table at all.
To make really sure no mis-guided user in a kms driver pops up again
explicitly check for that in the new ioctl implementation.
v2: Drop the unused variable I've accidentally left in the code,
spotted by David Herrmann.
Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_bufs.c')
| -rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index f63133b..471e051d 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -1455,6 +1455,18 @@ int drm_mapbufs(struct drm_device *dev, void *data, return retcode; } +int drm_dma_ioctl(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + if (drm_core_check_feature(dev, DRIVER_MODESET)) + return -EINVAL; + + if (dev->driver->dma_ioctl) + return dev->driver->dma_ioctl(dev, data, file_priv); + else + return -EINVAL; +} + struct drm_local_map *drm_getsarea(struct drm_device *dev) { struct drm_map_list *entry; |
