drm/nouveau: inform userspace of new kernel subchannel requirements

All available subchannels are now available for userspace to do with as it
pleases on NVC0+.

On all earlier chipsets, the kernel still uses a software object on subc 0
to implement the page flip completion method.  I hope to find some decent
way of addressing this too, but it's a tad tricker prior to fermi.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

2 files changed, 6 insertions, 13 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 337e228629ed..44e6416d4a33 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -436,18 +436,11 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
         }
 
         if (dev_priv->card_type < NV_C0) {
-                init->subchan[0].handle = NvM2MF;
-                if (dev_priv->card_type < NV_50)
-                        init->subchan[0].grclass = 0x0039;
-                else
-                        init->subchan[0].grclass = 0x5039;
-                init->subchan[1].handle = NvSw;
-                init->subchan[1].grclass = NV_SW;
-                init->nr_subchan = 2;
-        } else {
-                init->subchan[0].handle  = 0x9039;
-                init->subchan[0].grclass = 0x9039;
+                init->subchan[0].handle = NvSw;
+                init->subchan[0].grclass = NV_SW;
                 init->nr_subchan = 1;
+        } else {
+                init->nr_subchan = 0;
         }
 
         /* Named memory object area */
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h
index 23d4edf992b7..bcf0fd9e313e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_dma.h
+++ b/drivers/gpu/drm/nouveau/nouveau_dma.h
@@ -48,8 +48,8 @@ void nv50_dma_push(struct nouveau_channel *, struct nouveau_bo *,
 
 /* Hardcoded object assignments to subchannels (subchannel id). */
 enum {
-        NvSubM2MF       = 0,
-        NvSubSw         = 1,
+        NvSubSw         = 0,
+        NvSubM2MF       = 1,
         NvSub2D         = 2,
         NvSubCtxSurf2D  = 2,
         NvSubGdiRect    = 3,