diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
| commit | f0fe478c1587780690edc465d957a762e02acc8a (patch) | |
| tree | de129251264e7c4fa5c8c7119583dc18af9a3fab /shared-core/nv04_graph.c | |
| parent | e1bc147ac9aa8ac2ac271b0a21f4138b17875ce5 (diff) | |
| parent | 62cdc6dbb3545d21bc3a68987d0781f277ae6ee4 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
shared-core/i915_dma.c
tests/ttmtest/src/ttmtest.c
Diffstat (limited to 'shared-core/nv04_graph.c')
| -rw-r--r-- | shared-core/nv04_graph.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-core/nv04_graph.c b/shared-core/nv04_graph.c index 04dbf0ed..81a6d5c8 100644 --- a/shared-core/nv04_graph.c +++ b/shared-core/nv04_graph.c @@ -353,6 +353,7 @@ struct graph_state { void nouveau_nv04_context_switch(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nouveau_engine *engine = &dev_priv->Engine; struct nouveau_channel *next, *last; int chid; @@ -370,7 +371,7 @@ void nouveau_nv04_context_switch(struct drm_device *dev) return; } - chid = NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1); + chid = engine->fifo.channel_id(dev); next = dev_priv->fifos[chid]; if (!next) { @@ -378,7 +379,7 @@ void nouveau_nv04_context_switch(struct drm_device *dev) return; } - chid = (NV_READ(NV04_PGRAPH_CTX_USER) >> 24) & (nouveau_fifo_number(dev)-1); + chid = (NV_READ(NV04_PGRAPH_CTX_USER) >> 24) & (engine->fifo.channels - 1); last = dev_priv->fifos[chid]; if (!last) { |