diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-03 11:53:36 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-03 11:53:36 -0800 |
| commit | d5d5aca7f959f0e357f99dd517a421c015d0712f (patch) | |
| tree | 17d25bddd12609fb908e0ee6af6c019c26aedd71 /shared-core/nv50_graph.c | |
| parent | 10c3e1a8b55355b1ae1697ebf3d77ac4702d61c9 (diff) | |
| parent | 7e4e0fbbb82b0467d46386bcac1115812aaa1393 (diff) | |
Merge branch 'master' into modesetting-gem
Diffstat (limited to 'shared-core/nv50_graph.c')
| -rw-r--r-- | shared-core/nv50_graph.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/shared-core/nv50_graph.c b/shared-core/nv50_graph.c index c177a7f2..4acc58de 100644 --- a/shared-core/nv50_graph.c +++ b/shared-core/nv50_graph.c @@ -105,6 +105,9 @@ nv50_graph_init_ctxctl(struct drm_device *dev) case 0x92: voodoo = nv92_ctxprog; break; + case 0x94: + voodoo = nv94_ctxprog; + break; case 0xaa: voodoo = nvaa_ctxprog; break; @@ -194,6 +197,9 @@ nv50_graph_create_context(struct nouveau_channel *chan) case 0x92: ctxvals = nv92_ctxvals; break; + case 0x94: + ctxvals = nv94_ctxvals; + break; case 0xaa: ctxvals = nvaa_ctxvals; break; |