Skip to content

L
linux-davinci-2.6.23
Commit 99da6d86 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files
Options

drm: allow for more generic drm ioctls 

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 6244270e
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 4 deletions
drivers/char/drm/drm.h
View file @ 99da6d86
...@@ -654,11 +654,13 @@ typedef struct drm_set_version { ...@@ -654,11 +654,13 @@ typedef struct drm_set_version {
/** /**
* Device specific ioctls should only be in their respective headers * Device specific ioctls should only be in their respective headers
* The device specific ioctl range is from 0x40 to 0x79. * The device specific ioctl range is from 0x40 to 0x99.
* Generic IOCTLS restart at 0xA0.
* *
* \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and
* drmCommandReadWrite(). * drmCommandReadWrite().
*/ */
#define DRM_COMMAND_BASE 0x40 #define DRM_COMMAND_BASE 0x40
#define DRM_COMMAND_END 0xA0
#endif #endif
drivers/char/drm/drm_drv.c
View file @ 99da6d86
...@@ -496,11 +496,14 @@ int drm_ioctl(struct inode *inode, struct file *filp, ...@@ -496,11 +496,14 @@ int drm_ioctl(struct inode *inode, struct file *filp,
(long)old_encode_dev(priv->head->device), (long)old_encode_dev(priv->head->device),
priv->authenticated); priv->authenticated);
if (nr < DRIVER_IOCTL_COUNT) if ((nr >= DRIVER_IOCTL_COUNT) &&
ioctl = &drm_ioctls[nr]; ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))
else if ((nr >= DRM_COMMAND_BASE) goto err_i1;
if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
&& (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE]; ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE))
ioctl = &drm_ioctls[nr];
else else
goto err_i1; goto err_i1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment