summaryrefslogtreecommitdiff
path: root/shared-core/nv50_graph.c
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2009-02-15 21:52:19 +1000
committerBen Skeggs <skeggsb@gmail.com>2009-02-15 21:52:19 +1000
commita4ac60a10239bb6d19f6d89f2c044e9b7b29837c (patch)
tree3e19fae370deb55c9a7c0f31d5fc0bf1f4db6d33 /shared-core/nv50_graph.c
parent7e5c512104c3ae9b4ddd121f6bbf9464f8d73181 (diff)
nv50: context info for chipset 0xa0
Diffstat (limited to 'shared-core/nv50_graph.c')
-rw-r--r--shared-core/nv50_graph.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/shared-core/nv50_graph.c b/shared-core/nv50_graph.c
index 41a9da72..cbf6fd62 100644
--- a/shared-core/nv50_graph.c
+++ b/shared-core/nv50_graph.c
@@ -112,6 +112,9 @@ nv50_graph_init_ctxctl(struct drm_device *dev)
case 0x98:
voodoo = nv98_ctxprog;
break;
+ case 0xa0:
+ voodoo = nva0_ctxprog;
+ break;
case 0xaa:
voodoo = nvaa_ctxprog;
break;
@@ -210,6 +213,9 @@ nv50_graph_create_context(struct nouveau_channel *chan)
case 0x98:
ctxvals = nv98_ctxvals;
break;
+ case 0xa0:
+ ctxvals = nva0_ctxvals;
+ break;
case 0xaa:
ctxvals = nvaa_ctxvals;
break;
@@ -241,7 +247,7 @@ nv50_graph_create_context(struct nouveau_channel *chan)
}
INSTANCE_WR(ctx, 0x00000/4, chan->ramin->instance >> 12);
- if (dev_priv->chipset == 0xaa)
+ if ((dev_priv->chipset & 0xf0) == 0xa0)
INSTANCE_WR(ctx, 0x00004/4, 0x00000002);
else
INSTANCE_WR(ctx, 0x0011c/4, 0x00000002);