Merge branch 'origin' into bo-set-pin

1 files changed, 6 insertions, 1 deletions

diff --git a/linux-core/drm_ioc32.c b/linux-core/drm_ioc32.c
index 558376de..0188154e 100644
--- a/linux-core/drm_ioc32.c
+++ b/linux-core/drm_ioc32.c
@@ -1051,8 +1051,13 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 	drm_ioctl_compat_t *fn;
 	int ret;
 
+
+	/* Assume that ioctls without an explicit compat routine will "just
+	 * work".  This may not always be a good assumption, but it's better
+	 * than always failing.
+	 */
 	if (nr >= DRM_ARRAY_SIZE(drm_compat_ioctls))
-		return -ENOTTY;
+		return drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
 
 	fn = drm_compat_ioctls[nr];