r600c: oq updates

diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.h b/src/mesa/drivers/dri/r600/r600_cmdbuf.h
index 801bb013f6ed9587be5fb740452e801e1cbd01cb..ffd6c8b09212c87275d9ce14e10d962b1a377c31 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_cmdbuf.h
+++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.h
@@ -105,6 +105,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R600_IT_ME_INITIALIZE                     0x00004400
 #define R600_IT_COND_WRITE                        0x00004500
 #define R600_IT_EVENT_WRITE                       0x00004600
+#       define R600_EVENT_TYPE(x)                 ((x) << 0)
+#       define R600_EVENT_INDEX(x)                ((x) << 8)
 #define R600_IT_EVENT_WRITE_EOP                   0x00004700
 #define R600_IT_ONE_REG_WRITE                     0x00005700
 #define R600_IT_SET_CONFIG_REG                    0x00006800

diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 27731ffaf63b64362b1d1c86ff766411be838806..9c8fe2a24faba61496cae3896a295afb315e84c9 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -228,7 +228,7 @@ static void r600_emit_query_finish(radeonContextPtr radeon)
 
        BEGIN_BATCH_NO_AUTOSTATE(4 + 2);
        R600_OUT_BATCH(CP_PACKET3(R600_IT_EVENT_WRITE, 2));
-       R600_OUT_BATCH(ZPASS_DONE);
+       R600_OUT_BATCH(R600_EVENT_TYPE(ZPASS_DONE) | R600_EVENT_INDEX(1));
        R600_OUT_BATCH(query->curr_offset + 8); /* hw writes qwords */
        R600_OUT_BATCH(0x00000000);
        R600_OUT_BATCH_RELOC(VGT_EVENT_INITIATOR, query->bo, 0, 0, RADEON_GEM_DOMAIN_GTT, 0);

diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index 71f1af7562632a1e3d3acdf9aa76606034fa18ea..51dad61297eb69fb5f07fc2c94c7211ac149e75a 100644 (file)
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -1416,7 +1416,7 @@ static void r700SendQueryBegin(GLcontext *ctx, struct radeon_state_atom *atom)
 
        BEGIN_BATCH_NO_AUTOSTATE(4 + 2);
        R600_OUT_BATCH(CP_PACKET3(R600_IT_EVENT_WRITE, 2));
-       R600_OUT_BATCH(ZPASS_DONE);
+       R600_OUT_BATCH(R600_EVENT_TYPE(ZPASS_DONE) | R600_EVENT_INDEX(1));
        R600_OUT_BATCH(query->curr_offset); /* hw writes qwords */
        R600_OUT_BATCH(0x00000000);
        R600_OUT_BATCH_RELOC(VGT_EVENT_INITIATOR, query->bo, 0, 0, RADEON_GEM_DOMAIN_GTT, 0);