r600/eg: add crap indirect compute support.

I think the cp packets can be made work, but I think it might
need a kernel change, so for now just do the worst thing.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 7880d0f723b2c36a5a7f4fea45d7d32f4f514df7..b2c724feb051d87ef2294d70d865dcbfd5425505 100644 (file)
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -630,13 +630,25 @@ static void evergreen_emit_dispatch(struct r600_context *rctx,
        radeon_compute_set_context_reg(cs, R_0288E8_SQ_LDS_ALLOC,
                                        lds_size | (num_waves << 14));
 
-       /* Dispatch packet */
-       radeon_emit(cs, PKT3C(PKT3_DISPATCH_DIRECT, 3, 0));
-       radeon_emit(cs, info->grid[0]);
-       radeon_emit(cs, info->grid[1]);
-       radeon_emit(cs, info->grid[2]);
-       /* VGT_DISPATCH_INITIATOR = COMPUTE_SHADER_EN */
-       radeon_emit(cs, 1);
+       if (info->indirect) {
+               struct r600_resource *indirect_resource = (struct r600_resource *)info->indirect;
+               unsigned *data = r600_buffer_map_sync_with_rings(&rctx->b, indirect_resource, PIPE_TRANSFER_READ);
+               if (data) {
+                       radeon_emit(cs, PKT3C(PKT3_DISPATCH_DIRECT, 3, 0));
+                       radeon_emit(cs, data[0]);
+                       radeon_emit(cs, data[1]);
+                       radeon_emit(cs, data[2]);
+                       radeon_emit(cs, 1);
+               }
+       } else {
+               /* Dispatch packet */
+               radeon_emit(cs, PKT3C(PKT3_DISPATCH_DIRECT, 3, 0));
+               radeon_emit(cs, info->grid[0]);
+               radeon_emit(cs, info->grid[1]);
+               radeon_emit(cs, info->grid[2]);
+               /* VGT_DISPATCH_INITIATOR = COMPUTE_SHADER_EN */
+               radeon_emit(cs, 1);
+       }
 
        if (rctx->is_debug)
                eg_trace_emit(rctx);