aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv04_graph.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-10-06 02:16:59 -0400
committerBen Skeggs <bskeggs@redhat.com>2010-12-03 00:05:18 -0500
commitcff5c1332486ced8ff4180e957e04983cb72a39e (patch)
treeec1f6687156277632aef96693c1b8eca0c022b7c /drivers/gpu/drm/nouveau/nv04_graph.c
parent6a6b73f254123851f7f73ab5e57344a569d6a0ab (diff)
drm/nouveau: add more fine-grained locking to channel list + structures
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_graph.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv04_graph.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
index c8973421b635..98b9525c1ebd 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
@@ -357,7 +357,7 @@ nv04_graph_channel(struct drm_device *dev)
357 if (chid >= dev_priv->engine.fifo.channels) 357 if (chid >= dev_priv->engine.fifo.channels)
358 return NULL; 358 return NULL;
359 359
360 return dev_priv->fifos[chid]; 360 return dev_priv->channels.ptr[chid];
361} 361}
362 362
363void 363void
@@ -376,7 +376,7 @@ nv04_graph_context_switch(struct drm_device *dev)
376 376
377 /* Load context for next channel */ 377 /* Load context for next channel */
378 chid = dev_priv->engine.fifo.channel_id(dev); 378 chid = dev_priv->engine.fifo.channel_id(dev);
379 chan = dev_priv->fifos[chid]; 379 chan = dev_priv->channels.ptr[chid];
380 if (chan) 380 if (chan)
381 nv04_graph_load_context(chan); 381 nv04_graph_load_context(chan);
382 382