nouveau: Remove ALLOW_MULTI_SUBCHANNEL hack

Irrelevant, since we depend on working context switching now.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 9b92f2001d92fee6f97fe078ca7fa4cf718ac538..1e13324b9837eb0d6ceaa6dd763b32e84c2f2d0b 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -333,7 +333,6 @@ nouveauDoSwapBuffers(nouveauContextPtr nmesa, __DRIdrawablePrivate *dPriv)
                        fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
        }
 
-#ifdef ALLOW_MULTI_SUBCHANNEL
        LOCK_HARDWARE(nmesa);
        nbox = dPriv->numClipRects;
        box  = dPriv->pClipRects;
@@ -362,7 +361,6 @@ nouveauDoSwapBuffers(nouveauContextPtr nmesa, __DRIdrawablePrivate *dPriv)
        FIRE_RING();
 
        UNLOCK_HARDWARE(nmesa);
-#endif
 }
 
 void nouveauSwapBuffers(__DRIdrawablePrivate *dPriv)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.c b/src/mesa/drivers/dri/nouveau/nouveau_object.c
index a143488e8d5913e66197a9b4baad3dc5dcee4033..f6ff37848afe036c1b490cfcaa9fa8f342e10bfc 100644 (file)
--- 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);
 }

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.h b/src/mesa/drivers/dri/nouveau/nouveau_object.h
index 8c72d014daa2a32bac03570f5351e1c705b3c0b3..730738ad34b8de8cf68ac693a3ee3bfbf3f9ed54 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_object.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_object.h
@@ -3,8 +3,6 @@
 
 #include "nouveau_context.h"
 
-#define ALLOW_MULTI_SUBCHANNEL
-
 void nouveauObjectInit(nouveauContextPtr nmesa);
 
 enum DMAObjects {

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_sync.c b/src/mesa/drivers/dri/nouveau/nouveau_sync.c
index abb3088032ba140b486456b3c1a17e518b0af69f..e7abdd60eeb5f82c2693b52eaa33ec268c171a61 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_sync.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_sync.c
@@ -188,11 +188,9 @@ GLboolean nouveauSyncInitFuncs(GLcontext *ctx)
         */
        BEGIN_RING_CACHE(NvSub3D, 0x180, 1);
        OUT_RING_CACHE  (NvSyncNotify);
-#ifdef ALLOW_MULTI_SUBCHANNEL
        BEGIN_RING_SIZE(NvSubMemFormat,
                        NV_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 1);
        OUT_RING       (NvSyncNotify);
-#endif
 
        return GL_TRUE;
 }