batch_init(struct fd_batch *batch)
{
struct fd_context *ctx = batch->ctx;
+ enum fd_ringbuffer_flags flags = 0;
unsigned size = 0;
- if (ctx->screen->reorder)
- util_queue_fence_init(&batch->flush_fence);
-
/* if kernel is too old to support unlimited # of cmd buffers, we
* have no option but to allocate large worst-case sizes so that
* we don't need to grow the ringbuffer. Performance is likely to
if ((fd_device_version(ctx->screen->dev) < FD_VERSION_UNLIMITED_CMDS) ||
(fd_mesa_debug & FD_DBG_NOGROW)){
size = 0x100000;
+ } else {
+ flags = FD_RINGBUFFER_GROWABLE;
}
batch->submit = fd_submit_new(ctx->pipe);
if (batch->nondraw) {
batch->draw = fd_submit_new_ringbuffer(batch->submit, size,
- FD_RINGBUFFER_PRIMARY | FD_RINGBUFFER_GROWABLE);
+ FD_RINGBUFFER_PRIMARY | flags);
} else {
batch->gmem = fd_submit_new_ringbuffer(batch->submit, size,
- FD_RINGBUFFER_PRIMARY | FD_RINGBUFFER_GROWABLE);
+ FD_RINGBUFFER_PRIMARY | flags);
batch->draw = fd_submit_new_ringbuffer(batch->submit, size,
- FD_RINGBUFFER_GROWABLE);
+ flags);
if (ctx->screen->gpu_id < 600) {
batch->binning = fd_submit_new_ringbuffer(batch->submit,
- size, FD_RINGBUFFER_GROWABLE);
+ size, flags);
}
}
batch->gmem_reason = 0;
batch->num_draws = 0;
batch->num_vertices = 0;
+ batch->num_bins_per_pipe = 0;
+ batch->prim_strm_bits = 0;
+ batch->draw_strm_bits = 0;
batch->stage = FD_STAGE_NULL;
fd_reset_wfi(batch);
assert(batch->resources->entries == 0);
util_dynarray_init(&batch->samples, NULL);
+
+ list_inithead(&batch->log_chunks);
}
struct fd_batch *
batch_init(batch);
+ fd_screen_assert_locked(ctx->screen);
+ if (BATCH_DEBUG) {
+ _mesa_set_add(ctx->screen->live_batches, batch);
+ }
+
return batch;
}
batch->lrz_clear = NULL;
}
+ if (batch->epilogue) {
+ fd_ringbuffer_del(batch->epilogue);
+ batch->epilogue = NULL;
+ }
+
if (batch->tile_setup) {
fd_ringbuffer_del(batch->tile_setup);
batch->tile_setup = NULL;
batch->tile_fini = NULL;
}
+ if (batch->tessellation) {
+ fd_bo_del(batch->tessfactor_bo);
+ fd_bo_del(batch->tessparam_bo);
+ fd_ringbuffer_del(batch->tess_addrs_constobj);
+ }
+
fd_submit_del(batch->submit);
util_dynarray_fini(&batch->draw_patches);
}
util_dynarray_fini(&batch->samples);
- if (batch->ctx->screen->reorder)
- util_queue_fence_destroy(&batch->flush_fence);
+ assert(list_is_empty(&batch->log_chunks));
}
static void
foreach_batch(dep, cache, batch->dependents_mask) {
if (flush)
- fd_batch_flush(dep, false);
+ fd_batch_flush(dep);
fd_batch_reference(&dep, NULL);
}
static void
batch_reset_resources_locked(struct fd_batch *batch)
{
- pipe_mutex_assert_locked(batch->ctx->screen->lock);
+ fd_screen_assert_locked(batch->ctx->screen);
set_foreach(batch->resources, entry) {
struct fd_resource *rsc = (struct fd_resource *)entry->key;
static void
batch_reset_resources(struct fd_batch *batch)
{
- mtx_lock(&batch->ctx->screen->lock);
+ fd_screen_lock(batch->ctx->screen);
batch_reset_resources_locked(batch);
- mtx_unlock(&batch->ctx->screen->lock);
+ fd_screen_unlock(batch->ctx->screen);
}
static void
{
DBG("%p", batch);
- fd_batch_sync(batch);
-
batch_flush_reset_dependencies(batch, false);
batch_reset_resources(batch);
fd_context_assert_locked(batch->ctx);
+ if (BATCH_DEBUG) {
+ _mesa_set_remove_key(ctx->screen->live_batches, batch);
+ }
+
fd_bc_invalidate_batch(batch, true);
batch_reset_resources_locked(batch);
sprintf(buf, "fd_batch<%u>", batch->seqno);
}
-void
-fd_batch_sync(struct fd_batch *batch)
-{
- if (!batch->ctx->screen->reorder)
- return;
- util_queue_fence_wait(&batch->flush_fence);
-}
-
-static void
-batch_flush_func(void *job, int id)
-{
- struct fd_batch *batch = job;
-
- DBG("%p", batch);
-
- fd_gmem_render_tiles(batch);
- batch_reset_resources(batch);
-}
-
-static void
-batch_cleanup_func(void *job, int id)
-{
- struct fd_batch *batch = job;
- fd_batch_reference(&batch, NULL);
-}
-
static void
batch_flush(struct fd_batch *batch)
{
fd_fence_ref(&batch->ctx->last_fence, batch->fence);
- if (batch->ctx->screen->reorder) {
- struct fd_batch *tmp = NULL;
- fd_batch_reference(&tmp, batch);
-
- if (!util_queue_is_initialized(&batch->ctx->flush_queue))
- util_queue_init(&batch->ctx->flush_queue, "flush_queue", 16, 1, 0);
-
- util_queue_add_job(&batch->ctx->flush_queue,
- batch, &batch->flush_fence,
- batch_flush_func, batch_cleanup_func);
- } else {
- fd_gmem_render_tiles(batch);
- batch_reset_resources(batch);
- }
+ fd_gmem_render_tiles(batch);
+ batch_reset_resources(batch);
debug_assert(batch->reference.count > 0);
- mtx_lock(&batch->ctx->screen->lock);
+ fd_screen_lock(batch->ctx->screen);
fd_bc_invalidate_batch(batch, false);
- mtx_unlock(&batch->ctx->screen->lock);
+ fd_screen_unlock(batch->ctx->screen);
}
/* NOTE: could drop the last ref to batch
* a fence to sync on
*/
void
-fd_batch_flush(struct fd_batch *batch, bool sync)
+fd_batch_flush(struct fd_batch *batch)
{
struct fd_batch *tmp = NULL;
- bool newbatch = false;
/* NOTE: we need to hold an extra ref across the body of flush,
* since the last ref to this batch could be dropped when cleaning
*/
fd_batch_reference(&tmp, batch);
- if (batch == batch->ctx->batch) {
- batch->ctx->batch = NULL;
- newbatch = true;
- }
-
batch_flush(tmp);
- if (newbatch) {
- struct fd_context *ctx = batch->ctx;
- struct fd_batch *new_batch;
-
- if (ctx->screen->reorder) {
- /* defer allocating new batch until one is needed for rendering
- * to avoid unused batches for apps that create many contexts
- */
- new_batch = NULL;
- } else {
- new_batch = fd_bc_alloc_batch(&ctx->screen->batch_cache, ctx, false);
- util_copy_framebuffer_state(&new_batch->framebuffer, &batch->framebuffer);
- }
-
- fd_batch_reference(&batch, NULL);
- ctx->batch = new_batch;
- fd_context_all_dirty(ctx);
+ if (batch == batch->ctx->batch) {
+ fd_batch_reference(&batch->ctx->batch, NULL);
}
- if (sync)
- fd_batch_sync(tmp);
-
fd_batch_reference(&tmp, NULL);
}
void
fd_batch_add_dep(struct fd_batch *batch, struct fd_batch *dep)
{
- pipe_mutex_assert_locked(batch->ctx->screen->lock);
+ fd_screen_assert_locked(batch->ctx->screen);
if (batch->dependents_mask & (1 << dep->idx))
return;
struct fd_batch *b = NULL;
fd_batch_reference_locked(&b, rsc->write_batch);
- mtx_unlock(&b->ctx->screen->lock);
- fd_batch_flush(b, true);
- mtx_lock(&b->ctx->screen->lock);
+ fd_screen_unlock(b->ctx->screen);
+ fd_batch_flush(b);
+ fd_screen_lock(b->ctx->screen);
fd_bc_invalidate_batch(b, false);
fd_batch_reference_locked(&b, NULL);
}
+static void
+fd_batch_add_resource(struct fd_batch *batch, struct fd_resource *rsc)
+{
+
+ if (likely(fd_batch_references_resource(batch, rsc))) {
+ debug_assert(_mesa_set_search(batch->resources, rsc));
+ return;
+ }
+
+ debug_assert(!_mesa_set_search(batch->resources, rsc));
+
+ _mesa_set_add(batch->resources, rsc);
+ rsc->batch_mask |= (1 << batch->idx);
+}
+
void
-fd_batch_resource_used(struct fd_batch *batch, struct fd_resource *rsc, bool write)
+fd_batch_resource_write(struct fd_batch *batch, struct fd_resource *rsc)
{
- pipe_mutex_assert_locked(batch->ctx->screen->lock);
+ fd_screen_assert_locked(batch->ctx->screen);
if (rsc->stencil)
- fd_batch_resource_used(batch, rsc->stencil, write);
+ fd_batch_resource_write(batch, rsc->stencil);
- DBG("%p: %s %p", batch, write ? "write" : "read", rsc);
+ DBG("%p: write %p", batch, rsc);
- if (write)
- rsc->valid = true;
+ rsc->valid = true;
/* note, invalidate write batch, to avoid further writes to rsc
* resulting in a write-after-read hazard.
*/
+ /* if we are pending read or write by any other batch: */
+ if (unlikely(rsc->batch_mask & ~(1 << batch->idx))) {
+ struct fd_batch_cache *cache = &batch->ctx->screen->batch_cache;
+ struct fd_batch *dep;
- if (write) {
- /* if we are pending read or write by any other batch: */
- if (rsc->batch_mask & ~(1 << batch->idx)) {
- struct fd_batch_cache *cache = &batch->ctx->screen->batch_cache;
- struct fd_batch *dep;
-
- if (rsc->write_batch && rsc->write_batch != batch)
- flush_write_batch(rsc);
-
- foreach_batch(dep, cache, rsc->batch_mask) {
- struct fd_batch *b = NULL;
- if (dep == batch)
- continue;
- /* note that batch_add_dep could flush and unref dep, so
- * we need to hold a reference to keep it live for the
- * fd_bc_invalidate_batch()
- */
- fd_batch_reference(&b, dep);
- fd_batch_add_dep(batch, b);
- fd_bc_invalidate_batch(b, false);
- fd_batch_reference_locked(&b, NULL);
- }
- }
- fd_batch_reference_locked(&rsc->write_batch, batch);
- } else {
- /* If reading a resource pending a write, go ahead and flush the
- * writer. This avoids situations where we end up having to
- * flush the current batch in _resource_used()
- */
if (rsc->write_batch && rsc->write_batch != batch)
flush_write_batch(rsc);
- }
- if (rsc->batch_mask & (1 << batch->idx)) {
- debug_assert(_mesa_set_search(batch->resources, rsc));
- return;
+ foreach_batch(dep, cache, rsc->batch_mask) {
+ struct fd_batch *b = NULL;
+ if (dep == batch)
+ continue;
+ /* note that batch_add_dep could flush and unref dep, so
+ * we need to hold a reference to keep it live for the
+ * fd_bc_invalidate_batch()
+ */
+ fd_batch_reference(&b, dep);
+ fd_batch_add_dep(batch, b);
+ fd_bc_invalidate_batch(b, false);
+ fd_batch_reference_locked(&b, NULL);
+ }
}
+ fd_batch_reference_locked(&rsc->write_batch, batch);
- debug_assert(!_mesa_set_search(batch->resources, rsc));
+ fd_batch_add_resource(batch, rsc);
+}
- _mesa_set_add(batch->resources, rsc);
- rsc->batch_mask |= (1 << batch->idx);
+void
+fd_batch_resource_read_slowpath(struct fd_batch *batch, struct fd_resource *rsc)
+{
+ fd_screen_assert_locked(batch->ctx->screen);
+
+ if (rsc->stencil)
+ fd_batch_resource_read(batch, rsc->stencil);
+
+ DBG("%p: read %p", batch, rsc);
+
+ /* If reading a resource pending a write, go ahead and flush the
+ * writer. This avoids situations where we end up having to
+ * flush the current batch in _resource_used()
+ */
+ if (unlikely(rsc->write_batch && rsc->write_batch != batch))
+ flush_write_batch(rsc);
+
+ fd_batch_add_resource(batch, rsc);
}
void
debug_assert(!batch->flushed);
if (unlikely(fd_mesa_debug & FD_DBG_FLUSH)) {
- fd_batch_flush(batch, true);
+ fd_batch_flush(batch);
return;
}
struct fd_ringbuffer *ring = batch->draw;
if ((ring->cur - ring->start) > (ring->size/4 - 0x1000))
- fd_batch_flush(batch, true);
+ fd_batch_flush(batch);
}
/* emit a WAIT_FOR_IDLE only if needed, ie. if there has not already
projects / mesa.git / blobdiff