From af7afbd2e1409168698bde2f2846848b07d05d12 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 13 Jul 2012 16:14:25 +1000 Subject: drm/nv04-nv40/instmem: duplicate nv04 code as nv40, remove alternate paths A ton of duplication for the moment, will go away when they become subdevs. Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nouveau_state.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c') diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index d8d9e5c527a..14998ee89c9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -135,15 +135,15 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) break; case 0x40: case 0x60: - engine->instmem.init = nv04_instmem_init; - engine->instmem.takedown = nv04_instmem_takedown; - engine->instmem.suspend = nv04_instmem_suspend; - engine->instmem.resume = nv04_instmem_resume; - engine->instmem.get = nv04_instmem_get; - engine->instmem.put = nv04_instmem_put; - engine->instmem.map = nv04_instmem_map; - engine->instmem.unmap = nv04_instmem_unmap; - engine->instmem.flush = nv04_instmem_flush; + engine->instmem.init = nv40_instmem_init; + engine->instmem.takedown = nv40_instmem_takedown; + engine->instmem.suspend = nv40_instmem_suspend; + engine->instmem.resume = nv40_instmem_resume; + engine->instmem.get = nv40_instmem_get; + engine->instmem.put = nv40_instmem_put; + engine->instmem.map = nv40_instmem_map; + engine->instmem.unmap = nv40_instmem_unmap; + engine->instmem.flush = nv40_instmem_flush; engine->display.early_init = nv04_display_early_init; engine->display.late_takedown = nv04_display_late_takedown; engine->display.create = nv04_display_create; -- cgit v1.2.3-70-g09d2