X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fvc4%2Fvc4_context.c;h=eeadea0b1db3db03396e4805fbfd2e0b115dff99;hb=d794072b3e1f27b96aaf2c476fcd5dcc5fd9d445;hp=1ffaab12765e002a12f0d5eebac4d2c8a74b7293;hpb=f663102585f9654200e531b42d5e8831ba7ed77f;p=mesa.git diff --git a/src/gallium/drivers/vc4/vc4_context.c b/src/gallium/drivers/vc4/vc4_context.c index 1ffaab12765..eeadea0b1db 100644 --- a/src/gallium/drivers/vc4/vc4_context.c +++ b/src/gallium/drivers/vc4/vc4_context.c @@ -23,12 +23,13 @@ #include #include -#include #include "pipe/p_defines.h" +#include "util/ralloc.h" #include "util/u_inlines.h" #include "util/u_memory.h" #include "util/u_blitter.h" +#include "util/u_upload_mgr.h" #include "indices/u_primconvert.h" #include "pipe/p_screen.h" @@ -36,165 +37,94 @@ #include "vc4_context.h" #include "vc4_resource.h" -static void -vc4_setup_rcl(struct vc4_context *vc4) -{ - struct vc4_surface *csurf = vc4_surface(vc4->framebuffer.cbufs[0]); - struct vc4_resource *ctex = vc4_resource(csurf->base.texture); - uint32_t resolve_uncleared = vc4->resolve & ~vc4->cleared; - uint32_t width = vc4->framebuffer.width; - uint32_t height = vc4->framebuffer.height; - uint32_t xtiles = align(width, 64) / 64; - uint32_t ytiles = align(height, 64) / 64; - -#if 0 - fprintf(stderr, "RCL: resolve 0x%x clear 0x%x resolve uncleared 0x%x\n", - vc4->resolve, - vc4->cleared, - resolve_uncleared); -#endif - - cl_u8(&vc4->rcl, VC4_PACKET_CLEAR_COLORS); - cl_u32(&vc4->rcl, vc4->clear_color[0]); - cl_u32(&vc4->rcl, vc4->clear_color[1]); - cl_u32(&vc4->rcl, vc4->clear_depth); - cl_u8(&vc4->rcl, 0); - - cl_start_reloc(&vc4->rcl, 1); - cl_u8(&vc4->rcl, VC4_PACKET_TILE_RENDERING_MODE_CONFIG); - cl_reloc(vc4, &vc4->rcl, ctex->bo, csurf->offset); - cl_u16(&vc4->rcl, width); - cl_u16(&vc4->rcl, height); - cl_u16(&vc4->rcl, ((ctex->tiling << - VC4_RENDER_CONFIG_MEMORY_FORMAT_SHIFT) | - VC4_RENDER_CONFIG_FORMAT_RGBA8888 | - VC4_RENDER_CONFIG_EARLY_Z_COVERAGE_DISABLE)); - - /* The tile buffer normally gets cleared when the previous tile is - * stored. If the clear values changed between frames, then the tile - * buffer has stale clear values in it, so we have to do a store in - * None mode (no writes) so that we trigger the tile buffer clear. - */ - if (vc4->cleared & PIPE_CLEAR_COLOR0) { - cl_u8(&vc4->rcl, VC4_PACKET_TILE_COORDINATES); - cl_u8(&vc4->rcl, 0); - cl_u8(&vc4->rcl, 0); - - cl_u8(&vc4->rcl, VC4_PACKET_STORE_TILE_BUFFER_GENERAL); - cl_u16(&vc4->rcl, VC4_LOADSTORE_TILE_BUFFER_NONE); - cl_u32(&vc4->rcl, 0); /* no address, since we're in None mode */ - } - - for (int y = 0; y < ytiles; y++) { - for (int x = 0; x < xtiles; x++) { - bool end_of_frame = (x == xtiles - 1 && - y == ytiles - 1); - - /* Note that the load doesn't actually occur until the - * tile coords packet is processed. - */ - if (resolve_uncleared & PIPE_CLEAR_COLOR) { - cl_start_reloc(&vc4->rcl, 1); - cl_u8(&vc4->rcl, VC4_PACKET_LOAD_TILE_BUFFER_GENERAL); - cl_u8(&vc4->rcl, - VC4_LOADSTORE_TILE_BUFFER_COLOR | - (ctex->tiling << - VC4_LOADSTORE_TILE_BUFFER_FORMAT_SHIFT)); - cl_u8(&vc4->rcl, - VC4_LOADSTORE_TILE_BUFFER_RGBA8888); - cl_reloc(vc4, &vc4->rcl, ctex->bo, - csurf->offset); - } - - cl_u8(&vc4->rcl, VC4_PACKET_TILE_COORDINATES); - cl_u8(&vc4->rcl, x); - cl_u8(&vc4->rcl, y); - - cl_start_reloc(&vc4->rcl, 1); - cl_u8(&vc4->rcl, VC4_PACKET_BRANCH_TO_SUB_LIST); - cl_reloc(vc4, &vc4->rcl, vc4->tile_alloc, - (y * xtiles + x) * 32); - - if (vc4->resolve & PIPE_CLEAR_COLOR0) { - if (end_of_frame) { - cl_u8(&vc4->rcl, - VC4_PACKET_STORE_MS_TILE_BUFFER_AND_EOF); - } else { - cl_u8(&vc4->rcl, - VC4_PACKET_STORE_MS_TILE_BUFFER); - } - } else { - assert(!"unfinished: Need to end the frame\n"); - } - } - } -} - void vc4_flush(struct pipe_context *pctx) { struct vc4_context *vc4 = vc4_context(pctx); + struct pipe_surface *cbuf = vc4->framebuffer.cbufs[0]; + struct pipe_surface *zsbuf = vc4->framebuffer.zsbuf; if (!vc4->needs_flush) return; - cl_u8(&vc4->bcl, VC4_PACKET_FLUSH_ALL); - cl_u8(&vc4->bcl, VC4_PACKET_NOP); - cl_u8(&vc4->bcl, VC4_PACKET_HALT); - - vc4_setup_rcl(vc4); - - struct drm_vc4_submit_cl submit; - memset(&submit, 0, sizeof(submit)); - - submit.bo_handles = vc4->bo_handles.base; - submit.bo_handle_count = (vc4->bo_handles.next - - vc4->bo_handles.base) / 4; - submit.bin_cl = vc4->bcl.base; - submit.bin_cl_size = vc4->bcl.next - vc4->bcl.base; - submit.render_cl = vc4->rcl.base; - submit.render_cl_size = vc4->rcl.next - vc4->rcl.base; - submit.shader_rec = vc4->shader_rec.base; - submit.shader_rec_size = vc4->shader_rec.next - vc4->shader_rec.base; - submit.shader_rec_count = vc4->shader_rec_count; - submit.uniforms = vc4->uniforms.base; - submit.uniforms_size = vc4->uniforms.next - vc4->uniforms.base; - - if (!(vc4_debug & VC4_DEBUG_NORAST)) { - int ret; - -#ifndef USE_VC4_SIMULATOR - ret = drmIoctl(vc4->fd, DRM_IOCTL_VC4_SUBMIT_CL, &submit); -#else - ret = vc4_simulator_flush(vc4, &submit); -#endif - if (ret) - errx(1, "VC4 submit failed\n"); + /* The RCL setup would choke if the draw bounds cause no drawing, so + * just drop the drawing if that's the case. + */ + if (vc4->draw_max_x <= vc4->draw_min_x || + vc4->draw_max_y <= vc4->draw_min_y) { + vc4_job_reset(vc4); + return; } - vc4_reset_cl(&vc4->bcl); - vc4_reset_cl(&vc4->rcl); - vc4_reset_cl(&vc4->shader_rec); - vc4_reset_cl(&vc4->uniforms); - vc4_reset_cl(&vc4->bo_handles); - struct vc4_bo **referenced_bos = vc4->bo_pointers.base; - for (int i = 0; i < submit.bo_handle_count; i++) - vc4_bo_unreference(&referenced_bos[i]); - vc4_reset_cl(&vc4->bo_pointers); - vc4->shader_rec_count = 0; - - vc4->needs_flush = false; - vc4->draw_call_queued = false; - vc4->dirty = ~0; - vc4->resolve = 0; - vc4->cleared = 0; + /* Increment the semaphore indicating that binning is done and + * unblocking the render thread. Note that this doesn't act until the + * FLUSH completes. + */ + cl_ensure_space(&vc4->bcl, 8); + struct vc4_cl_out *bcl = cl_start(&vc4->bcl); + cl_u8(&bcl, VC4_PACKET_INCREMENT_SEMAPHORE); + /* The FLUSH caps all of our bin lists with a VC4_PACKET_RETURN. */ + cl_u8(&bcl, VC4_PACKET_FLUSH); + cl_end(&vc4->bcl, bcl); + + if (cbuf && (vc4->resolve & PIPE_CLEAR_COLOR0)) { + pipe_surface_reference(&vc4->color_write, + cbuf->texture->nr_samples > 1 ? + NULL : cbuf); + pipe_surface_reference(&vc4->msaa_color_write, + cbuf->texture->nr_samples > 1 ? + cbuf : NULL); + + if (!(vc4->cleared & PIPE_CLEAR_COLOR0)) { + pipe_surface_reference(&vc4->color_read, cbuf); + } else { + pipe_surface_reference(&vc4->color_read, NULL); + } + + } else { + pipe_surface_reference(&vc4->color_write, NULL); + pipe_surface_reference(&vc4->color_read, NULL); + pipe_surface_reference(&vc4->msaa_color_write, NULL); + } + + if (vc4->framebuffer.zsbuf && + (vc4->resolve & (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL))) { + pipe_surface_reference(&vc4->zs_write, + zsbuf->texture->nr_samples > 1 ? + NULL : zsbuf); + pipe_surface_reference(&vc4->msaa_zs_write, + zsbuf->texture->nr_samples > 1 ? + zsbuf : NULL); + + if (!(vc4->cleared & (PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL))) { + pipe_surface_reference(&vc4->zs_read, zsbuf); + } else { + pipe_surface_reference(&vc4->zs_read, NULL); + } + } else { + pipe_surface_reference(&vc4->zs_write, NULL); + pipe_surface_reference(&vc4->zs_read, NULL); + pipe_surface_reference(&vc4->msaa_zs_write, NULL); + } + + vc4_job_submit(vc4); } static void vc4_pipe_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence, unsigned flags) { + struct vc4_context *vc4 = vc4_context(pctx); + vc4_flush(pctx); + + if (fence) { + struct pipe_screen *screen = pctx->screen; + struct vc4_fence *f = vc4_fence_create(vc4->screen, + vc4->last_emit_seqno); + screen->fence_reference(screen, fence, NULL); + *fence = (struct pipe_fence_handle *)f; + } } /** @@ -202,23 +132,24 @@ vc4_pipe_flush(struct pipe_context *pctx, struct pipe_fence_handle **fence, * * This helps avoid flushing the command buffers when unnecessary. */ -void -vc4_flush_for_bo(struct pipe_context *pctx, struct vc4_bo *bo) +bool +vc4_cl_references_bo(struct pipe_context *pctx, struct vc4_bo *bo, + bool include_reads) { struct vc4_context *vc4 = vc4_context(pctx); if (!vc4->needs_flush) - return; + return false; /* Walk all the referenced BOs in the drawing command list to see if * they match. */ - struct vc4_bo **referenced_bos = vc4->bo_pointers.base; - for (int i = 0; i < (vc4->bo_handles.next - - vc4->bo_handles.base) / 4; i++) { - if (referenced_bos[i] == bo) { - vc4_flush(pctx); - return; + if (include_reads) { + struct vc4_bo **referenced_bos = vc4->bo_pointers.base; + for (int i = 0; i < cl_offset(&vc4->bo_handles) / 4; i++) { + if (referenced_bos[i] == bo) { + return true; + } } } @@ -229,8 +160,7 @@ vc4_flush_for_bo(struct pipe_context *pctx, struct vc4_bo *bo) if (csurf) { struct vc4_resource *ctex = vc4_resource(csurf->base.texture); if (ctex->bo == bo) { - vc4_flush(pctx); - return; + return true; } } @@ -239,10 +169,21 @@ vc4_flush_for_bo(struct pipe_context *pctx, struct vc4_bo *bo) struct vc4_resource *ztex = vc4_resource(zsurf->base.texture); if (ztex->bo == bo) { - vc4_flush(pctx); - return; + return true; } } + + return false; +} + +static void +vc4_invalidate_resource(struct pipe_context *pctx, struct pipe_resource *prsc) +{ + struct vc4_context *vc4 = vc4_context(pctx); + struct pipe_surface *zsurf = vc4->framebuffer.zsbuf; + + if (zsurf && zsurf->texture == prsc) + vc4->resolve &= ~(PIPE_CLEAR_DEPTH | PIPE_CLEAR_STENCIL); } static void @@ -256,13 +197,24 @@ vc4_context_destroy(struct pipe_context *pctx) if (vc4->primconvert) util_primconvert_destroy(vc4->primconvert); + if (vc4->uploader) + u_upload_destroy(vc4->uploader); + util_slab_destroy(&vc4->transfer_pool); - free(vc4); + pipe_surface_reference(&vc4->framebuffer.cbufs[0], NULL); + pipe_surface_reference(&vc4->framebuffer.zsbuf, NULL); + + pipe_surface_reference(&vc4->color_write, NULL); + pipe_surface_reference(&vc4->color_read, NULL); + + vc4_program_fini(pctx); + + ralloc_free(vc4); } struct pipe_context * -vc4_context_create(struct pipe_screen *pscreen, void *priv) +vc4_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) { struct vc4_screen *screen = vc4_screen(pscreen); struct vc4_context *vc4; @@ -271,8 +223,8 @@ vc4_context_create(struct pipe_screen *pscreen, void *priv) uint32_t saved_shaderdb_flag = vc4_debug & VC4_DEBUG_SHADERDB; vc4_debug &= ~VC4_DEBUG_SHADERDB; - vc4 = CALLOC_STRUCT(vc4_context); - if (vc4 == NULL) + vc4 = rzalloc(NULL, struct vc4_context); + if (!vc4) return NULL; struct pipe_context *pctx = &vc4->base; @@ -282,21 +234,19 @@ vc4_context_create(struct pipe_screen *pscreen, void *priv) pctx->priv = priv; pctx->destroy = vc4_context_destroy; pctx->flush = vc4_pipe_flush; + pctx->invalidate_resource = vc4_invalidate_resource; vc4_draw_init(pctx); vc4_state_init(pctx); vc4_program_init(pctx); + vc4_query_init(pctx); vc4_resource_context_init(pctx); - vc4_init_cl(vc4, &vc4->bcl); - vc4_init_cl(vc4, &vc4->rcl); - vc4_init_cl(vc4, &vc4->shader_rec); - vc4_init_cl(vc4, &vc4->bo_handles); + vc4_job_init(vc4); - vc4->dirty = ~0; vc4->fd = screen->fd; - util_slab_create(&vc4->transfer_pool, sizeof(struct pipe_transfer), + util_slab_create(&vc4->transfer_pool, sizeof(struct vc4_transfer), 16, UTIL_SLAB_SINGLETHREADED); vc4->blitter = util_blitter_create(pctx); if (!vc4->blitter) @@ -307,8 +257,14 @@ vc4_context_create(struct pipe_screen *pscreen, void *priv) if (!vc4->primconvert) goto fail; + vc4->uploader = u_upload_create(pctx, 16 * 1024, + PIPE_BIND_INDEX_BUFFER, + PIPE_USAGE_STREAM); + vc4_debug |= saved_shaderdb_flag; + vc4->sample_mask = (1 << VC4_MAX_SAMPLES) - 1; + return &vc4->base; fail: