]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drm/nouveau: inform userspace of relaxed kernel subchannel requirements
authorBen Skeggs <bskeggs@redhat.com>
Thu, 29 Mar 2012 10:24:34 +0000 (20:24 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 29 Mar 2012 13:16:35 +0000 (23:16 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_channel.c

index 337e228629ed66860c1d919fa26992c18580c28a..846afb0bfef4b5dff1ce87f06f6bd985a8fc1650 100644 (file)
@@ -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[0].handle = 0x00000000;
+               init->subchan[0].grclass = 0x0000;
                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->nr_subchan = 1;
        }
 
        /* Named memory object area */