diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-07 17:23:31 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-07 17:23:31 +1100 |
| commit | 3d248cd7e4538ced5c0b652a784eb4ef309d5e11 (patch) | |
| tree | 8524193c9f160c3675749141bfac9b872115e1e6 /shared-core | |
| parent | 7a4ba7273c740503b6f254f74b2e06312c15790a (diff) | |
nv50: hook up timer funcs...
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/nouveau_state.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c index 75353603..8fe128c5 100644 --- a/shared-core/nouveau_state.c +++ b/shared-core/nouveau_state.c @@ -88,7 +88,6 @@ static int nouveau_init_card_mappings(struct drm_device *dev) static int nouveau_stub_init(struct drm_device *dev) { return 0; } static void nouveau_stub_takedown(struct drm_device *dev) {} -static uint64_t nouveau_stub_timer_read(struct drm_device *dev) { return 0; } static int nouveau_init_engine_ptrs(struct drm_device *dev) { @@ -251,9 +250,9 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) engine->instmem.unbind = nv50_instmem_unbind; engine->mc.init = nv50_mc_init; engine->mc.takedown = nv50_mc_takedown; - engine->timer.init = nouveau_stub_init; - engine->timer.read = nouveau_stub_timer_read; - engine->timer.takedown = nouveau_stub_takedown; + engine->timer.init = nv04_timer_init; + engine->timer.read = nv04_timer_read; + engine->timer.takedown = nv04_timer_takedown; engine->fb.init = nouveau_stub_init; engine->fb.takedown = nouveau_stub_takedown; engine->graph.init = nv50_graph_init; |