diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-09-05 10:10:09 +0200 |
|---|---|---|
| committer | Luca Barbieri <luca@luca-barbieri.com> | 2010-09-05 17:52:26 +0200 |
| commit | d46c5ce7b6a707b491a28345e3ee2adfce201632 (patch) | |
| tree | 49bcdfa7790d50ec141e3b6c8dc42604fb3c8428 /src/gallium/drivers/nvfx/nvfx_query.c | |
| parent | 3bca263a92ab206d371e18ac65f6d36cadbc62a5 (diff) | |
nvfx: switch to rules-ng-ng register headers
This is the new register generation toolkit in use by nouveau.
As far as I know, this is the best register description toolkit in
existence, and you should use it too for your hardware :)
Thanks to Marcin Kościelnicki for inventing it and performing
invaluable reverse engineering work of nVidia chips.
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_query.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_query.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_query.c b/src/gallium/drivers/nvfx/nvfx_query.c index eeeb897661..3935ffd7f9 100644 --- a/src/gallium/drivers/nvfx/nvfx_query.c +++ b/src/gallium/drivers/nvfx/nvfx_query.c @@ -73,9 +73,9 @@ nvfx_query_begin(struct pipe_context *pipe, struct pipe_query *pq) nouveau_notifier_reset(nvfx->screen->query, q->object->start); WAIT_RING(chan, 4); - OUT_RING(chan, RING_3D(NV34TCL_QUERY_RESET, 1)); + OUT_RING(chan, RING_3D(NV30_3D_QUERY_RESET, 1)); OUT_RING(chan, 1); - OUT_RING(chan, RING_3D(NV34TCL_QUERY_ENABLE, 1)); + OUT_RING(chan, RING_3D(NV30_3D_QUERY_ENABLE, 1)); OUT_RING(chan, 1); q->ready = FALSE; @@ -93,10 +93,10 @@ nvfx_query_end(struct pipe_context *pipe, struct pipe_query *pq) assert(nvfx->query == pq); WAIT_RING(chan, 4); - OUT_RING(chan, RING_3D(NV34TCL_QUERY_GET, 1)); - OUT_RING (chan, (0x01 << NV34TCL_QUERY_GET_UNK24_SHIFT) | - ((q->object->start * 32) << NV34TCL_QUERY_GET_OFFSET_SHIFT)); - OUT_RING(chan, RING_3D(NV34TCL_QUERY_ENABLE, 1)); + OUT_RING(chan, RING_3D(NV30_3D_QUERY_GET, 1)); + OUT_RING (chan, (0x01 << NV30_3D_QUERY_GET_UNK24__SHIFT) | + ((q->object->start * 32) << NV30_3D_QUERY_GET_OFFSET__SHIFT)); + OUT_RING(chan, RING_3D(NV30_3D_QUERY_ENABLE, 1)); OUT_RING(chan, 0); FIRE_RING(chan); |