aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_state.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-11-02 20:56:05 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 00:11:39 -0500
commit5178d40dff23b5eef7f0a3be2411fa6a347e750d (patch)
tree67b58fc1d23ed15074f2d80d97aae366ade1a558 /drivers/gpu/drm/nouveau/nouveau_state.c
parent25b85783da8c71e577c676173e9d60a1b7e6113a (diff)
drm/nouveau: move PFIFO ISR into nv04_fifo.c
Reviewed-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 84bff459491e..262545b58d96 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -75,7 +75,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
75 engine->graph.unload_context = nv04_graph_unload_context; 75 engine->graph.unload_context = nv04_graph_unload_context;
76 engine->fifo.channels = 16; 76 engine->fifo.channels = 16;
77 engine->fifo.init = nv04_fifo_init; 77 engine->fifo.init = nv04_fifo_init;
78 engine->fifo.takedown = nouveau_stub_takedown; 78 engine->fifo.takedown = nv04_fifo_fini;
79 engine->fifo.disable = nv04_fifo_disable; 79 engine->fifo.disable = nv04_fifo_disable;
80 engine->fifo.enable = nv04_fifo_enable; 80 engine->fifo.enable = nv04_fifo_enable;
81 engine->fifo.reassign = nv04_fifo_reassign; 81 engine->fifo.reassign = nv04_fifo_reassign;
@@ -132,7 +132,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
132 engine->graph.set_tile_region = nv10_graph_set_tile_region; 132 engine->graph.set_tile_region = nv10_graph_set_tile_region;
133 engine->fifo.channels = 32; 133 engine->fifo.channels = 32;
134 engine->fifo.init = nv10_fifo_init; 134 engine->fifo.init = nv10_fifo_init;
135 engine->fifo.takedown = nouveau_stub_takedown; 135 engine->fifo.takedown = nv04_fifo_fini;
136 engine->fifo.disable = nv04_fifo_disable; 136 engine->fifo.disable = nv04_fifo_disable;
137 engine->fifo.enable = nv04_fifo_enable; 137 engine->fifo.enable = nv04_fifo_enable;
138 engine->fifo.reassign = nv04_fifo_reassign; 138 engine->fifo.reassign = nv04_fifo_reassign;
@@ -189,7 +189,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
189 engine->graph.set_tile_region = nv20_graph_set_tile_region; 189 engine->graph.set_tile_region = nv20_graph_set_tile_region;
190 engine->fifo.channels = 32; 190 engine->fifo.channels = 32;
191 engine->fifo.init = nv10_fifo_init; 191 engine->fifo.init = nv10_fifo_init;
192 engine->fifo.takedown = nouveau_stub_takedown; 192 engine->fifo.takedown = nv04_fifo_fini;
193 engine->fifo.disable = nv04_fifo_disable; 193 engine->fifo.disable = nv04_fifo_disable;
194 engine->fifo.enable = nv04_fifo_enable; 194 engine->fifo.enable = nv04_fifo_enable;
195 engine->fifo.reassign = nv04_fifo_reassign; 195 engine->fifo.reassign = nv04_fifo_reassign;
@@ -246,7 +246,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
246 engine->graph.set_tile_region = nv20_graph_set_tile_region; 246 engine->graph.set_tile_region = nv20_graph_set_tile_region;
247 engine->fifo.channels = 32; 247 engine->fifo.channels = 32;
248 engine->fifo.init = nv10_fifo_init; 248 engine->fifo.init = nv10_fifo_init;
249 engine->fifo.takedown = nouveau_stub_takedown; 249 engine->fifo.takedown = nv04_fifo_fini;
250 engine->fifo.disable = nv04_fifo_disable; 250 engine->fifo.disable = nv04_fifo_disable;
251 engine->fifo.enable = nv04_fifo_enable; 251 engine->fifo.enable = nv04_fifo_enable;
252 engine->fifo.reassign = nv04_fifo_reassign; 252 engine->fifo.reassign = nv04_fifo_reassign;
@@ -306,7 +306,7 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev)
306 engine->graph.set_tile_region = nv40_graph_set_tile_region; 306 engine->graph.set_tile_region = nv40_graph_set_tile_region;
307 engine->fifo.channels = 32; 307 engine->fifo.channels = 32;
308 engine->fifo.init = nv40_fifo_init; 308 engine->fifo.init = nv40_fifo_init;
309 engine->fifo.takedown = nouveau_stub_takedown; 309 engine->fifo.takedown = nv04_fifo_fini;
310 engine->fifo.disable = nv04_fifo_disable; 310 engine->fifo.disable = nv04_fifo_disable;
311 engine->fifo.enable = nv04_fifo_enable; 311 engine->fifo.enable = nv04_fifo_enable;
312 engine->fifo.reassign = nv04_fifo_reassign; 312 engine->fifo.reassign = nv04_fifo_reassign;