diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
| commit | ef204fb5c24f9bd09192a9abebad6a06dd0b88db (patch) | |
| tree | a72ee9071462457b27475c2cc86e3c6256388ea9 /shared-core/nouveau_state.c | |
| parent | 7f269bec7ed49385de394fdbd970f463ef2060f0 (diff) | |
| parent | b44f2da380e78769b58c751e81f376f0fa1f48aa (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
Diffstat (limited to 'shared-core/nouveau_state.c')
| -rw-r--r-- | shared-core/nouveau_state.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 555955d4..0183b0b4 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -243,6 +243,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) break; case 0x50: case 0x80: /* gotta love NVIDIA's consistency.. */ + case 0x90: engine->instmem.init = nv50_instmem_init; engine->instmem.takedown= nv50_instmem_takedown; engine->instmem.populate = nv50_instmem_populate; |