nouveau: reenable all the non-nv50 pipe drivers

They still won't build yet, but anyway..

diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c
index 89824b22540e4069cb35c3c40eed48c07f582816..b6199f8e6db3005eb75be81df094d0249243f4d2 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c
+++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c
@@ -77,7 +77,6 @@ nouveau_pipe_create(struct nouveau_context *nv)
                return NULL;
 
        switch (chipset & 0xf0) {
-#if 0
        case 0x00:
                hws_create = nv04_screen_create;
                hw_create = nv04_create;
@@ -99,7 +98,6 @@ nouveau_pipe_create(struct nouveau_context *nv)
                hws_create = nv40_screen_create;
                hw_create = nv40_create;
                break;
-#endif
        case 0x50:
        case 0x80:
        case 0x90:

diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/winsys/drm/nouveau/dri/Makefile
index 2e7a3a79f8f73d3043cda513482cb88546f6b873..a73e8d5cb4b0d3dc757c40c9203c1f8e79deabd5 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/dri/Makefile
+++ b/src/gallium/winsys/drm/nouveau/dri/Makefile
@@ -7,12 +7,12 @@ MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+       $(TOP)/src/gallium/drivers/nv04/libnv04.a \
+       $(TOP)/src/gallium/drivers/nv10/libnv10.a \
+       $(TOP)/src/gallium/drivers/nv20/libnv20.a \
+       $(TOP)/src/gallium/drivers/nv30/libnv30.a \
+       $(TOP)/src/gallium/drivers/nv40/libnv40.a \
        $(TOP)/src/gallium/drivers/nv50/libnv50.a
-#      $(TOP)/src/gallium/drivers/nv04/libnv04.a \
-#      $(TOP)/src/gallium/drivers/nv10/libnv10.a \
-#      $(TOP)/src/gallium/drivers/nv20/libnv20.a \
-#      $(TOP)/src/gallium/drivers/nv30/libnv30.a \
-#      $(TOP)/src/gallium/drivers/nv40/libnv40.a \
        
 DRIVER_SOURCES = \
        nouveau_context_dri.c \