nv40: some more nv67 changes

With some luck the drm-side will be OK now for this chipset.

diff --git a/shared-core/nouveau_fifo.c b/shared-core/nouveau_fifo.c
index d00f193..0daf9ac 100644 (file)
--- a/shared-core/nouveau_fifo.c
+++ b/shared-core/nouveau_fifo.c
@@ -64,7 +64,6 @@ static int nouveau_fifo_instmem_configure(struct drm_device *dev)
 
        switch(dev_priv->card_type)
        {
-               case NV_50:
                case NV_40:
                        switch (dev_priv->chipset) {
                        case 0x47:

diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 7086a0a..1216216 100644 (file)
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -212,6 +212,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
                engine->fifo.save_context       = nv10_fifo_save_context;
                break;
        case 0x40:
+       case 0x60:
                engine->instmem.init    = nv04_instmem_init;
                engine->instmem.takedown= nv04_instmem_takedown;
                engine->instmem.populate        = nv04_instmem_populate;

diff --git a/shared-core/nv40_graph.c b/shared-core/nv40_graph.c
index fdf5151..6ef02bf 100644 (file)
--- a/shared-core/nv40_graph.c
+++ b/shared-core/nv40_graph.c
@@ -1511,6 +1511,7 @@ nv40_graph_create_context(struct nouveau_channel *chan)
                ctx_init = nv4b_graph_context_init;
                break;
        case 0x4c:
+       case 0x67:
                ctx_size = NV4C_GRCTX_SIZE;
                ctx_init = nv4c_graph_context_init;
                break;
@@ -2007,7 +2008,8 @@ nv40_graph_init(struct drm_device *dev)
        case 0x49: ctx_voodoo = nv49_4b_ctx_voodoo; break;
        case 0x4a: ctx_voodoo = nv4a_ctx_voodoo; break;
        case 0x4b: ctx_voodoo = nv49_4b_ctx_voodoo; break;
-       case 0x4c: ctx_voodoo = nv4c_ctx_voodoo; break;
+       case 0x4c:
+       case 0x67: ctx_voodoo = nv4c_ctx_voodoo; break;
        case 0x4e: ctx_voodoo = nv4e_ctx_voodoo; break;
        default:
                DRM_ERROR("Unknown ctx_voodoo for chipset 0x%02x\n",