diff options
| author | Matthieu Castet <castet.matthieu@free.fr> | 2007-08-26 20:48:32 +0200 |
|---|---|---|
| committer | Matthieu Castet <castet.matthieu@free.fr> | 2007-08-26 20:48:32 +0200 |
| commit | a331d2e352675be260254e8abef412540ead9c30 (patch) | |
| tree | fe304a8c516a1e6643e06cf34eed6136c83823e9 /shared-core/nv10_graph.c | |
| parent | 4182fce4084f4d884a7435b8ad2acb5c209f4544 (diff) | |
nouveau : add NV04_PGRAPH_TRAPPED_ADDR definition
- fix offset for nv04
- use it in nv10 graph ctx switch for getting next channel
- dump NV10_PGRAPH_TRAPPED_DATA_HIGH on nv10+
Diffstat (limited to 'shared-core/nv10_graph.c')
| -rw-r--r-- | shared-core/nv10_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/nv10_graph.c b/shared-core/nv10_graph.c index c604ff2e..e470ff06 100644 --- a/shared-core/nv10_graph.c +++ b/shared-core/nv10_graph.c @@ -594,7 +594,7 @@ void nouveau_nv10_context_switch(struct drm_device *dev) return; } - chid = NV_READ(NV03_PFIFO_CACHE1_PUSH1)&(nouveau_fifo_number(dev)-1); + chid = (NV_READ(NV04_PGRAPH_TRAPPED_ADDR) >> 20)&(nouveau_fifo_number(dev)-1); next = dev_priv->fifos[chid]; if (!next) { |