aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/nouveau/nouveau_object.c
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2007-08-13 22:05:15 +1000
committerBen Skeggs <[email protected]>2007-08-15 14:31:25 +1000
commitfcbd06d201754bf4f69a0262dcd04b4c287a173b (patch)
tree5b8674d9e26ba8471fc56a8cae07bc8c82442b16 /src/mesa/drivers/dri/nouveau/nouveau_object.c
parentfef3dcbee60b041df64a12511c8aa3c304a04652 (diff)
nouveau: Remove ALLOW_MULTI_SUBCHANNEL hack
Irrelevant, since we depend on working context switching now.
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_object.c')
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_object.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.c b/src/mesa/drivers/dri/nouveau/nouveau_object.c
index a143488e8d5..f6ff37848af 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_object.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_object.c
@@ -45,7 +45,6 @@ void nouveauObjectInit(nouveauContextPtr nmesa)
}
nouveauCreateContextObject(nmesa, NvMemFormat, NV_MEMORY_TO_MEMORY_FORMAT);
-#ifdef ALLOW_MULTI_SUBCHANNEL
nouveauObjectOnSubchannel(nmesa, NvSubCtxSurf2D, NvCtxSurf2D);
BEGIN_RING_SIZE(NvSubCtxSurf2D, NV10_CONTEXT_SURFACES_2D_SET_DMA_IN_MEMORY0, 2);
OUT_RING(NvDmaFB);
@@ -58,7 +57,6 @@ void nouveauObjectInit(nouveauContextPtr nmesa)
OUT_RING(3); /* SRCCOPY */
nouveauObjectOnSubchannel(nmesa, NvSubMemFormat, NvMemFormat);
-#endif
nouveauObjectOnSubchannel(nmesa, NvSub3D, Nv3D);
}