Merge branch 'master' into modesetting-gem

This commit is contained in:
Jesse Barnes 2008-12-03 11:53:36 -08:00
commit d5d5aca7f9
2 changed files with 2417 additions and 131 deletions

View file

@ -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;

File diff suppressed because it is too large Load diff