1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index cbf1fc60a386..41241922263f 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -246,14 +246,26 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
                 return nouveau_abi16_put(abi16, -ENODEV);
 
         client = nv_client(abi16->client);
-
-        if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)
-                return nouveau_abi16_put(abi16, -EINVAL);
-
         device = nv_device(abi16->device);
         imem   = nouveau_instmem(device);
         pfb    = nouveau_fb(device);
 
+        /* hack to allow channel engine type specification on kepler */
+        if (device->card_type >= NV_E0) {
+                if (init->fb_ctxdma_handle != ~0)
+                        init->fb_ctxdma_handle = NVE0_CHANNEL_IND_ENGINE_GR;
+                else
+                        init->fb_ctxdma_handle = init->tt_ctxdma_handle;
+
+                /* allow flips to be executed if this is a graphics channel */
+                init->tt_ctxdma_handle = 0;
+                if (init->fb_ctxdma_handle == NVE0_CHANNEL_IND_ENGINE_GR)
+                        init->tt_ctxdma_handle = 1;
+        }
+
+        if (init->fb_ctxdma_handle == ~0 || init->tt_ctxdma_handle == ~0)
+                return nouveau_abi16_put(abi16, -EINVAL);
+
         /* allocate "abi16 channel" data and make up a handle for it */
         init->channel = ffsll(~abi16->handles);
         if (!init->channel--)
@@ -268,11 +280,6 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
         abi16->handles |= (1 << init->channel);
 
         /* create channel object and initialise dma and fence management */
-        if (device->card_type >= NV_E0) {
-                init->fb_ctxdma_handle = NVE0_CHANNEL_IND_ENGINE_GR;
-                init->tt_ctxdma_handle = 0;
-        }
-
         ret = nouveau_channel_new(drm, cli, NVDRM_DEVICE, NVDRM_CHAN |
                                   init->channel, init->fb_ctxdma_handle,
                                   init->tt_ctxdma_handle, &chan->chan);
@@ -382,7 +389,7 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS)
         struct nouveau_abi16_chan *chan, *temp;
         struct nouveau_abi16_ntfy *ntfy;
         struct nouveau_object *object;
-        struct nv_dma_class args;
+        struct nv_dma_class args = {};
         int ret;
 
         if (unlikely(!abi16))