1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouveau/nouveau_usif.c
index cb1182d7e80e..89dc4ce63490 100644
--- a/drivers/gpu/drm/nouveau/nouveau_usif.c
+++ b/drivers/gpu/drm/nouveau/nouveau_usif.c
@@ -24,6 +24,7 @@
 
 #include "nouveau_drm.h"
 #include "nouveau_usif.h"
+#include "nouveau_abi16.h"
 
 #include <nvif/notify.h>
 #include <nvif/unpack.h>
@@ -316,11 +317,21 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc)
         } else
                 goto done;
 
+        /* USIF slightly abuses some return-only ioctl members in order
+         * to provide interoperability with the older ABI16 objects
+         */
         mutex_lock(&cli->mutex);
+        if (argv->v0.route) {
+                if (ret = -EINVAL, argv->v0.route == 0xff)
+                        ret = nouveau_abi16_usif(filp, argv, argc);
+                if (ret) {
+                        mutex_unlock(&cli->mutex);
+                        goto done;
+                }
+        }
+
         switch (argv->v0.type) {
         case NVIF_IOCTL_V0_NEW:
-                /* ... except if we're creating children */
-                argv->v0.owner = NVIF_IOCTL_V0_OWNER_ANY;
                 ret = usif_object_new(filp, data, size, argv, argc);
                 break;
         case NVIF_IOCTL_V0_NTFY_NEW: