38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From: Ben Skeggs <bskeggs@redhat.com>
|
|
Date: Thu, 29 Mar 2012 20:24:34 +1000
|
|
Subject: [6/9] drm/nouveau: inform userspace of relaxed kernel subchannel
|
|
requirements
|
|
|
|
commit 02bfc2881e0d5b23147211bb6420798d946a7b5c upstream.
|
|
|
|
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
|
|
---
|
|
drivers/gpu/drm/nouveau/nouveau_channel.c | 11 ++---------
|
|
1 file 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 */
|