drm: Remove locking for legacy ioctls and DRM_UNLOCKED

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_ioctl.c

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index ebba34b..e368fc0 100644 (file)
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -596,7 +596,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
 
        DRM_IOCTL_DEF(DRM_IOCTL_FINISH, drm_noop, DRM_AUTH),
 
-       DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank_ioctl, DRM_UNLOCKED),
+       DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank_ioctl, 0),
 
        DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 
@@ -729,7 +729,7 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata,
 {
        struct drm_file *file_priv = file->private_data;
        struct drm_device *dev = file_priv->minor->dev;
-       int retcode;
+       int ret;
 
        /* Update drm_file owner if fd was passed along. */
        drm_file_update_pid(file_priv);
@@ -737,20 +737,11 @@ long drm_ioctl_kernel(struct file *file, drm_ioctl_t *func, void *kdata,
        if (drm_dev_is_unplugged(dev))
                return -ENODEV;
 
-       retcode = drm_ioctl_permit(flags, file_priv);
-       if (unlikely(retcode))
-               return retcode;
-
-       /* Enforce sane locking for modern driver ioctls. */
-       if (likely(!drm_core_check_feature(dev, DRIVER_LEGACY)) ||
-           (flags & DRM_UNLOCKED))
-               retcode = func(dev, kdata, file_priv);
-       else {
-               mutex_lock(&drm_global_mutex);
-               retcode = func(dev, kdata, file_priv);
-               mutex_unlock(&drm_global_mutex);
-       }
-       return retcode;
+       ret = drm_ioctl_permit(flags, file_priv);
+       if (unlikely(ret))
+               return ret;
+
+       return func(dev, kdata, file_priv);
 }
 EXPORT_SYMBOL(drm_ioctl_kernel);