diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-03-29 06:21:32 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-03-29 09:16:31 -0400 |
commit | acde2d8037f4502669af251e44b05579681e0dc1 (patch) | |
tree | b01f174e2a29a04a0e625c443df9bc7cd162004d /drivers/gpu | |
parent | 4a206ffc0bfe8e8c3fc0468a052f5b0bb625a57b (diff) |
Revert "drm/nouveau: inform userspace of new kernel subchannel requirements"
This reverts commit a81f15499887d3f9f24ec70bb9b7e778942a6b7b.
Gah, we have a released userspace component using fixed subc assignment
that conflicts with this. To avoid breaking ABI this needs to be
reverted.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_channel.c | 15 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_dma.h | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index 44e6416d4a33..337e228629ed 100644 --- a/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c | |||
@@ -436,11 +436,18 @@ 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 = NvSw; | 439 | init->subchan[0].handle = NvM2MF; |
440 | init->subchan[0].grclass = NV_SW; | 440 | if (dev_priv->card_type < NV_50) |
441 | init->nr_subchan = 1; | 441 | init->subchan[0].grclass = 0x0039; |
442 | else | ||
443 | init->subchan[0].grclass = 0x5039; | ||
444 | init->subchan[1].handle = NvSw; | ||
445 | init->subchan[1].grclass = NV_SW; | ||
446 | init->nr_subchan = 2; | ||
442 | } else { | 447 | } else { |
443 | init->nr_subchan = 0; | 448 | init->subchan[0].handle = 0x9039; |
449 | init->subchan[0].grclass = 0x9039; | ||
450 | init->nr_subchan = 1; | ||
444 | } | 451 | } |
445 | 452 | ||
446 | /* Named memory object area */ | 453 | /* Named memory object area */ |
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.h b/drivers/gpu/drm/nouveau/nouveau_dma.h index bcf0fd9e313e..23d4edf992b7 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 *, | |||
48 | 48 | ||
49 | /* Hardcoded object assignments to subchannels (subchannel id). */ | 49 | /* Hardcoded object assignments to subchannels (subchannel id). */ |
50 | enum { | 50 | enum { |
51 | NvSubSw = 0, | 51 | NvSubM2MF = 0, |
52 | NvSubM2MF = 1, | 52 | NvSubSw = 1, |
53 | NvSub2D = 2, | 53 | NvSub2D = 2, |
54 | NvSubCtxSurf2D = 2, | 54 | NvSubCtxSurf2D = 2, |
55 | NvSubGdiRect = 3, | 55 | NvSubGdiRect = 3, |