summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-03-29 20:24:34 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-03-29 23:16:35 +1000
commit02bfc2881e0d5b23147211bb6420798d946a7b5c (patch)
tree19c8a6cd4373c84f4c9dab2ab19a21fd73cb0de5 /drivers/gpu
parentacde2d8037f4502669af251e44b05579681e0dc1 (diff)
downloadop-kernel-dev-02bfc2881e0d5b23147211bb6420798d946a7b5c.zip
op-kernel-dev-02bfc2881e0d5b23147211bb6420798d946a7b5c.tar.gz
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 337e228..846afb0 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[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 */
OpenPOWER on IntegriCloud