aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-03-29 06:24:34 -0400
committerBen Skeggs <bskeggs@redhat.com>2012-03-29 09:16:35 -0400
commit02bfc2881e0d5b23147211bb6420798d946a7b5c (patch)
tree19c8a6cd4373c84f4c9dab2ab19a21fd73cb0de5 /drivers/gpu
parentacde2d8037f4502669af251e44b05579681e0dc1 (diff)
drm/nouveau: inform userspace of relaxed kernel subchannel requirements
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_channel.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 337e228629ed..846afb0bfef4 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,
436 } 436 }
437 437
438 if (dev_priv->card_type < NV_C0) { 438 if (dev_priv->card_type < NV_C0) {
439 init->subchan[0].handle = NvM2MF; 439 init->subchan[0].handle = 0x00000000;
440 if (dev_priv->card_type < NV_50) 440 init->subchan[0].grclass = 0x0000;
441 init->subchan[0].grclass = 0x0039;
442 else
443 init->subchan[0].grclass = 0x5039;
444 init->subchan[1].handle = NvSw; 441 init->subchan[1].handle = NvSw;
445 init->subchan[1].grclass = NV_SW; 442 init->subchan[1].grclass = NV_SW;
446 init->nr_subchan = 2; 443 init->nr_subchan = 2;
447 } else {
448 init->subchan[0].handle = 0x9039;
449 init->subchan[0].grclass = 0x9039;
450 init->nr_subchan = 1;
451 } 444 }
452 445
453 /* Named memory object area */ 446 /* Named memory object area */