X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ffreedreno%2Ffreedreno_context.c;h=9c6a21ca5b8bd8ef6e8f7c4dd921adc43980400f;hb=6bb0f87c6003e1d80aa79f6a591620aecc7b031d;hp=599f94ffec118e0b61b39fde99b0f883c34da615;hpb=00bed8a794de3d80a46b65b9ab23c6df83e416a8;p=mesa.git diff --git a/src/gallium/drivers/freedreno/freedreno_context.c b/src/gallium/drivers/freedreno/freedreno_context.c index 599f94ffec1..9c6a21ca5b8 100644 --- a/src/gallium/drivers/freedreno/freedreno_context.c +++ b/src/gallium/drivers/freedreno/freedreno_context.c @@ -27,6 +27,7 @@ */ #include "freedreno_context.h" +#include "freedreno_blitter.h" #include "freedreno_draw.h" #include "freedreno_fence.h" #include "freedreno_program.h" @@ -37,28 +38,53 @@ #include "freedreno_query.h" #include "freedreno_query_hw.h" #include "freedreno_util.h" +#include "util/u_upload_mgr.h" static void -fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence, +fd_context_flush(struct pipe_context *pctx, struct pipe_fence_handle **fencep, unsigned flags) { struct fd_context *ctx = fd_context(pctx); - uint32_t timestamp; + struct pipe_fence_handle *fence = NULL; + + DBG("%p: flush: flags=%x\n", ctx->batch, flags); + + /* Take a ref to the batch's fence (batch can be unref'd when flushed: */ + fd_fence_ref(pctx->screen, &fence, ctx->batch->fence); + + if (flags & PIPE_FLUSH_FENCE_FD) + ctx->batch->needs_out_fence_fd = true; if (!ctx->screen->reorder) { - struct fd_batch *batch = NULL; - fd_batch_reference(&batch, ctx->batch); - fd_batch_flush(batch, true); - timestamp = fd_ringbuffer_timestamp(batch->gmem); - fd_batch_reference(&batch, NULL); + fd_batch_flush(ctx->batch, true, false); + } else if (flags & PIPE_FLUSH_DEFERRED) { + fd_bc_flush_deferred(&ctx->screen->batch_cache, ctx); } else { - timestamp = fd_bc_flush(&ctx->screen->batch_cache, ctx); + fd_bc_flush(&ctx->screen->batch_cache, ctx); } - if (fence) { - fd_screen_fence_ref(pctx->screen, fence, NULL); - *fence = fd_fence_create(pctx, timestamp); - } + if (fencep) + fd_fence_ref(pctx->screen, fencep, fence); + + fd_fence_ref(pctx->screen, &fence, NULL); +} + +static void +fd_texture_barrier(struct pipe_context *pctx, unsigned flags) +{ + /* On devices that could sample from GMEM we could possibly do better. + * Or if we knew that we were doing GMEM bypass we could just emit a + * cache flush, perhaps? But we don't know if future draws would cause + * us to use GMEM, and a flush in bypass isn't the end of the world. + */ + fd_context_flush(pctx, NULL, 0); +} + +static void +fd_memory_barrier(struct pipe_context *pctx, unsigned flags) +{ + fd_context_flush(pctx, NULL, 0); + /* TODO do we need to check for persistently mapped buffers and fd_bo_cpu_prep()?? */ } /** @@ -80,7 +106,10 @@ fd_emit_string_marker(struct pipe_context *pctx, const char *string, int len) /* max packet size is 0x3fff dwords: */ len = MIN2(len, 0x3fff * 4); - OUT_PKT3(ring, CP_NOP, align(len, 4) / 4); + if (ctx->screen->gpu_id >= 500) + OUT_PKT7(ring, CP_NOP, align(len, 4) / 4); + else + OUT_PKT3(ring, CP_NOP, align(len, 4) / 4); while (len >= 4) { OUT_RING(ring, *buf); buf++; @@ -103,36 +132,43 @@ fd_context_destroy(struct pipe_context *pctx) DBG(""); - if (ctx->screen->reorder) + if (ctx->screen->reorder && util_queue_is_initialized(&ctx->flush_queue)) util_queue_destroy(&ctx->flush_queue); fd_batch_reference(&ctx->batch, NULL); /* unref current batch */ fd_bc_invalidate_context(ctx); fd_prog_fini(pctx); - fd_hw_query_fini(pctx); if (ctx->blitter) util_blitter_destroy(ctx->blitter); + if (pctx->stream_uploader) + u_upload_destroy(pctx->stream_uploader); + + if (ctx->clear_rs_state) + pctx->delete_rasterizer_state(pctx, ctx->clear_rs_state); + if (ctx->primconvert) util_primconvert_destroy(ctx->primconvert); - util_slab_destroy(&ctx->transfer_pool); + slab_destroy_child(&ctx->transfer_pool); - for (i = 0; i < ARRAY_SIZE(ctx->pipe); i++) { - struct fd_vsc_pipe *pipe = &ctx->pipe[i]; + for (i = 0; i < ARRAY_SIZE(ctx->vsc_pipe); i++) { + struct fd_vsc_pipe *pipe = &ctx->vsc_pipe[i]; if (!pipe->bo) break; fd_bo_del(pipe->bo); } fd_device_del(ctx->dev); + fd_pipe_del(ctx->pipe); if (fd_mesa_debug & (FD_DBG_BSTAT | FD_DBG_MSGS)) { - printf("batch_total=%u, batch_sysmem=%u, batch_gmem=%u, batch_restore=%u\n", + printf("batch_total=%u, batch_sysmem=%u, batch_gmem=%u, batch_nondraw=%u, batch_restore=%u\n", (uint32_t)ctx->stats.batch_total, (uint32_t)ctx->stats.batch_sysmem, - (uint32_t)ctx->stats.batch_gmem, (uint32_t)ctx->stats.batch_restore); + (uint32_t)ctx->stats.batch_gmem, (uint32_t)ctx->stats.batch_nondraw, + (uint32_t)ctx->stats.batch_restore); } FREE(ctx); @@ -150,15 +186,101 @@ fd_set_debug_callback(struct pipe_context *pctx, memset(&ctx->debug, 0, sizeof(ctx->debug)); } +/* TODO we could combine a few of these small buffers (solid_vbuf, + * blit_texcoord_vbuf, and vsc_size_mem, into a single buffer and + * save a tiny bit of memory + */ + +static struct pipe_resource * +create_solid_vertexbuf(struct pipe_context *pctx) +{ + static const float init_shader_const[] = { + -1.000000, +1.000000, +1.000000, + +1.000000, -1.000000, +1.000000, + }; + struct pipe_resource *prsc = pipe_buffer_create(pctx->screen, + PIPE_BIND_CUSTOM, PIPE_USAGE_IMMUTABLE, sizeof(init_shader_const)); + pipe_buffer_write(pctx, prsc, 0, + sizeof(init_shader_const), init_shader_const); + return prsc; +} + +static struct pipe_resource * +create_blit_texcoord_vertexbuf(struct pipe_context *pctx) +{ + struct pipe_resource *prsc = pipe_buffer_create(pctx->screen, + PIPE_BIND_CUSTOM, PIPE_USAGE_DYNAMIC, 16); + return prsc; +} + +void +fd_context_setup_common_vbos(struct fd_context *ctx) +{ + struct pipe_context *pctx = &ctx->base; + + ctx->solid_vbuf = create_solid_vertexbuf(pctx); + ctx->blit_texcoord_vbuf = create_blit_texcoord_vertexbuf(pctx); + + /* setup solid_vbuf_state: */ + ctx->solid_vbuf_state.vtx = pctx->create_vertex_elements_state( + pctx, 1, (struct pipe_vertex_element[]){{ + .vertex_buffer_index = 0, + .src_offset = 0, + .src_format = PIPE_FORMAT_R32G32B32_FLOAT, + }}); + ctx->solid_vbuf_state.vertexbuf.count = 1; + ctx->solid_vbuf_state.vertexbuf.vb[0].stride = 12; + ctx->solid_vbuf_state.vertexbuf.vb[0].buffer.resource = ctx->solid_vbuf; + + /* setup blit_vbuf_state: */ + ctx->blit_vbuf_state.vtx = pctx->create_vertex_elements_state( + pctx, 2, (struct pipe_vertex_element[]){{ + .vertex_buffer_index = 0, + .src_offset = 0, + .src_format = PIPE_FORMAT_R32G32_FLOAT, + }, { + .vertex_buffer_index = 1, + .src_offset = 0, + .src_format = PIPE_FORMAT_R32G32B32_FLOAT, + }}); + ctx->blit_vbuf_state.vertexbuf.count = 2; + ctx->blit_vbuf_state.vertexbuf.vb[0].stride = 8; + ctx->blit_vbuf_state.vertexbuf.vb[0].buffer.resource = ctx->blit_texcoord_vbuf; + ctx->blit_vbuf_state.vertexbuf.vb[1].stride = 12; + ctx->blit_vbuf_state.vertexbuf.vb[1].buffer.resource = ctx->solid_vbuf; +} + +void +fd_context_cleanup_common_vbos(struct fd_context *ctx) +{ + struct pipe_context *pctx = &ctx->base; + + pctx->delete_vertex_elements_state(pctx, ctx->solid_vbuf_state.vtx); + pctx->delete_vertex_elements_state(pctx, ctx->blit_vbuf_state.vtx); + + pipe_resource_reference(&ctx->solid_vbuf, NULL); + pipe_resource_reference(&ctx->blit_texcoord_vbuf, NULL); +} + struct pipe_context * fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen, - const uint8_t *primtypes, void *priv) + const uint8_t *primtypes, void *priv, unsigned flags) { struct fd_screen *screen = fd_screen(pscreen); struct pipe_context *pctx; + unsigned prio = 1; int i; + /* lower numerical value == higher priority: */ + if (fd_mesa_debug & FD_DBG_HIPRIO) + prio = 0; + else if (flags & PIPE_CONTEXT_HIGH_PRIORITY) + prio = 0; + else if (flags & PIPE_CONTEXT_LOW_PRIORITY) + prio = 2; + ctx->screen = screen; + ctx->pipe = fd_pipe_new2(screen->dev, FD_PIPE_3D, prio); ctx->primtypes = primtypes; ctx->primtype_mask = 0; @@ -177,28 +299,28 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen, pctx->flush = fd_context_flush; pctx->emit_string_marker = fd_emit_string_marker; pctx->set_debug_callback = fd_set_debug_callback; + pctx->create_fence_fd = fd_create_fence_fd; + pctx->fence_server_sync = fd_fence_server_sync; + pctx->texture_barrier = fd_texture_barrier; + pctx->memory_barrier = fd_memory_barrier; - /* TODO what about compute? Ideally it creates it's own independent - * batches per compute job (since it isn't using tiling, so no point - * in getting involved with the re-ordering madness).. - */ - if (!screen->reorder) { - ctx->batch = fd_bc_alloc_batch(&screen->batch_cache, ctx); - } else { - util_queue_init(&ctx->flush_queue, "flush_queue", 16, 1); - } + pctx->stream_uploader = u_upload_create_default(pctx); + if (!pctx->stream_uploader) + goto fail; + pctx->const_uploader = pctx->stream_uploader; - fd_reset_wfi(ctx); + ctx->batch = fd_bc_alloc_batch(&screen->batch_cache, ctx); - util_slab_create(&ctx->transfer_pool, sizeof(struct fd_transfer), - 16, UTIL_SLAB_SINGLETHREADED); + slab_create_child(&ctx->transfer_pool, &screen->transfer_pool); + + if (!ctx->blit) + ctx->blit = fd_blitter_blit; fd_draw_init(pctx); fd_resource_context_init(pctx); fd_query_context_init(pctx); fd_texture_init(pctx); fd_state_init(pctx); - fd_hw_query_init(pctx); ctx->blitter = util_blitter_create(pctx); if (!ctx->blitter) @@ -208,6 +330,9 @@ fd_context_init(struct fd_context *ctx, struct pipe_screen *pscreen, if (!ctx->primconvert) goto fail; + list_inithead(&ctx->hw_active_queries); + list_inithead(&ctx->acc_active_queries); + return pctx; fail: