Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99da6d86 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm: allow for more generic drm ioctls 



Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 6244270e

drivers/char/drm/drm.h

+3 −1
Original line number Diff line number Diff line
@@ -654,11 +654,13 @@ typedef struct drm_set_version { 


/**

 * 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

 * drmCommandReadWrite().

 */

#define DRM_COMMAND_BASE                0x40

#define DRM_COMMAND_END			0xA0



#endif

drivers/char/drm/drm_drv.c

+6 −3
Original line number Diff line number Diff line
@@ -496,11 +496,14 @@ int drm_ioctl(struct inode *inode, struct file *filp, 
		  (long)old_encode_dev(priv->head->device),

		  priv->authenticated);



	if (nr < DRIVER_IOCTL_COUNT)

		ioctl = &drm_ioctls[nr];

	else if ((nr >= DRM_COMMAND_BASE)

	if ((nr >= DRIVER_IOCTL_COUNT) &&

	    ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END)))

		goto err_i1;

	if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)

		 && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))

		ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];

	else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE))

		ioctl = &drm_ioctls[nr];

	else

		goto err_i1;