3 files changed, 18 insertions, 11 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 2720ce009664..d48c02a36527 100644
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -242,14 +242,26 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS)
         if (unlikely(!abi16))
                 return -ENOMEM;
         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--)
@@ -264,11 +276,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);
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 049c6b23e1d7..1363578bf945 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -346,7 +346,7 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
         /* allocate software object class (used for fences on <= nv05, and
          * to signal flip completion), bind it to a subchannel.
          */
-        if (chan != chan->drm->cechan) {
+        if ((device->card_type < NV_E0) || gart /* nve0: want_nvsw */) {
                 ret = nouveau_object_new(nv_object(client), chan->handle,
                                          NvSw, nouveau_abi16_swclass(chan->drm),
                                          NULL, 0, &object);
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index f62dbd2733bf..919186c4651b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -148,7 +148,7 @@ nouveau_accel_init(struct nouveau_drm *drm)
                         NV_ERROR(drm, "failed to create ce channel, %d\n", ret);
 
                 arg0 = NVE0_CHANNEL_IND_ENGINE_GR;
-                arg1 = 0;
+                arg1 = 1;
         } else {
                 arg0 = NvDmaFB;
                 arg1 = NvDmaTT;