lkml.org 
[lkml]   [2009]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 4/5] drm: Add unlocked IOCTL functionality from the drm repo.
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/drm_drv.c | 9 +++++++--
    include/drm/drmP.h | 2 ++
    2 files changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/drm_drv.c
    +++ b/drivers/gpu/drm/drm_drv.c
    @@ -455,6 +455,12 @@ static int drm_version(struct drm_device
    int drm_ioctl(struct inode *inode, struct file *filp,
    unsigned int cmd, unsigned long arg)
    {
    + return drm_unlocked_ioctl(filp, cmd, arg);
    +}
    +EXPORT_SYMBOL(drm_ioctl);
    +
    +long drm_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
    +{
    struct drm_file *file_priv = filp->private_data;
    struct drm_device *dev = file_priv->minor->dev;
    struct drm_ioctl_desc *ioctl;
    @@ -530,8 +536,7 @@ int drm_ioctl(struct inode *inode, struc
    DRM_DEBUG("ret = %x\n", retcode);
    return retcode;
    }
    -
    -EXPORT_SYMBOL(drm_ioctl);
    +EXPORT_SYMBOL(drm_unlocked_ioctl);

    drm_local_map_t *drm_getsarea(struct drm_device *dev)
    {
    --- a/include/drm/drmP.h
    +++ b/include/drm/drmP.h
    @@ -1016,6 +1016,8 @@ extern int drm_init(struct drm_driver *d
    extern void drm_exit(struct drm_driver *driver);
    extern int drm_ioctl(struct inode *inode, struct file *filp,
    unsigned int cmd, unsigned long arg);
    +extern long drm_unlocked_ioctl(struct file *filp,
    + unsigned int cmd, unsigned long arg);
    extern long drm_compat_ioctl(struct file *filp,
    unsigned int cmd, unsigned long arg);
    extern int drm_lastclose(struct drm_device *dev);


    \
     
     \ /
      Last update: 2009-03-19 05:15    [W:4.861 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site