diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/vc4/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_cl.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_cl_dump.c | 132 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_context.c | 7 |
4 files changed, 141 insertions, 0 deletions
diff --git a/src/gallium/drivers/vc4/Makefile.sources b/src/gallium/drivers/vc4/Makefile.sources index 71a28a5da20..f128af345ee 100644 --- a/src/gallium/drivers/vc4/Makefile.sources +++ b/src/gallium/drivers/vc4/Makefile.sources @@ -2,6 +2,7 @@ C_SOURCES := \ vc4_bufmgr.c \ vc4_bufmgr.h \ vc4_cl.c \ + vc4_cl_dump.c \ vc4_cl.h \ vc4_context.c \ vc4_context.h \ diff --git a/src/gallium/drivers/vc4/vc4_cl.h b/src/gallium/drivers/vc4/vc4_cl.h index 4e699df9391..2cdd77dd301 100644 --- a/src/gallium/drivers/vc4/vc4_cl.h +++ b/src/gallium/drivers/vc4/vc4_cl.h @@ -43,6 +43,7 @@ struct vc4_cl { void vc4_init_cl(struct vc4_context *vc4, struct vc4_cl *cl); void vc4_grow_cl(struct vc4_cl *cl); void vc4_reset_cl(struct vc4_cl *cl); +void vc4_dump_cl(struct vc4_cl *cl, bool is_render); uint32_t vc4_gem_hindex(struct vc4_context *vc4, struct vc4_bo *bo); static inline void diff --git a/src/gallium/drivers/vc4/vc4_cl_dump.c b/src/gallium/drivers/vc4/vc4_cl_dump.c new file mode 100644 index 00000000000..40bcf011874 --- /dev/null +++ b/src/gallium/drivers/vc4/vc4_cl_dump.c @@ -0,0 +1,132 @@ +/* + * Copyright © 2014 Broadcom + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include "util/u_math.h" +#include "util/macros.h" +#include "vc4_context.h" + +#define PACKET(name, size) [name] = { #name, size } + +static const struct packet_info { + const char *name; + uint8_t size; +} packet_info[] = { + PACKET(VC4_PACKET_HALT, 1), + PACKET(VC4_PACKET_NOP, 1), + + PACKET(VC4_PACKET_FLUSH, 1), + PACKET(VC4_PACKET_FLUSH_ALL, 1), + PACKET(VC4_PACKET_START_TILE_BINNING, 1), + PACKET(VC4_PACKET_INCREMENT_SEMAPHORE, 1), + PACKET(VC4_PACKET_WAIT_ON_SEMAPHORE, 1), + + PACKET(VC4_PACKET_BRANCH, 5), + PACKET(VC4_PACKET_BRANCH_TO_SUB_LIST, 5), + + PACKET(VC4_PACKET_STORE_MS_TILE_BUFFER, 1), + PACKET(VC4_PACKET_STORE_MS_TILE_BUFFER_AND_EOF, 1), + PACKET(VC4_PACKET_STORE_FULL_RES_TILE_BUFFER, 5), + PACKET(VC4_PACKET_LOAD_FULL_RES_TILE_BUFFER, 5), + PACKET(VC4_PACKET_STORE_TILE_BUFFER_GENERAL, 7), + PACKET(VC4_PACKET_LOAD_TILE_BUFFER_GENERAL, 7), + + PACKET(VC4_PACKET_GL_INDEXED_PRIMITIVE, 14), + PACKET(VC4_PACKET_GL_ARRAY_PRIMITIVE, 10), + + PACKET(VC4_PACKET_COMPRESSED_PRIMITIVE, 48), + PACKET(VC4_PACKET_CLIPPED_COMPRESSED_PRIMITIVE, 49), + + PACKET(VC4_PACKET_PRIMITIVE_LIST_FORMAT, 2), + + PACKET(VC4_PACKET_GL_SHADER_STATE, 5), + PACKET(VC4_PACKET_NV_SHADER_STATE, 5), + PACKET(VC4_PACKET_VG_SHADER_STATE, 5), + + PACKET(VC4_PACKET_CONFIGURATION_BITS, 4), + PACKET(VC4_PACKET_FLAT_SHADE_FLAGS, 5), + PACKET(VC4_PACKET_POINT_SIZE, 5), + PACKET(VC4_PACKET_LINE_WIDTH, 5), + PACKET(VC4_PACKET_RHT_X_BOUNDARY, 3), + PACKET(VC4_PACKET_DEPTH_OFFSET, 5), + PACKET(VC4_PACKET_CLIP_WINDOW, 9), + PACKET(VC4_PACKET_VIEWPORT_OFFSET, 5), + PACKET(VC4_PACKET_Z_CLIPPING, 9), + PACKET(VC4_PACKET_CLIPPER_XY_SCALING, 9), + PACKET(VC4_PACKET_CLIPPER_Z_SCALING, 9), + + PACKET(VC4_PACKET_TILE_BINNING_MODE_CONFIG, 16), + PACKET(VC4_PACKET_TILE_RENDERING_MODE_CONFIG, 11), + PACKET(VC4_PACKET_CLEAR_COLORS, 14), + PACKET(VC4_PACKET_TILE_COORDINATES, 3), + + PACKET(VC4_PACKET_GEM_HANDLES, 9), +}; + +void +vc4_dump_cl(struct vc4_cl *cl, bool is_render) +{ + uint32_t offset = 0, hw_offset = 0; + uint8_t *cmds = cl->base; + + while (offset < cl->end - cl->base) { + uint8_t header = cmds[offset]; + + if (header > ARRAY_SIZE(packet_info) || + !packet_info[header].name) { + fprintf(stderr, "0x%08x 0x%08x: Unknown packet 0x%02x (%d)!\n", + offset, hw_offset, header, header); + return; + } + + const struct packet_info *p = packet_info + header; + fprintf(stderr, "0x%08x 0x%08x: 0x%02x %s\n", + offset, + header != VC4_PACKET_GEM_HANDLES ? hw_offset : 0, + header, p->name); + + for (uint32_t i = 1; i < p->size; i++) { + if (offset + i >= cl->end - cl->base) { + fprintf(stderr, "0x%08x 0x%08x: CL overflow!\n", + offset + i, hw_offset + i); + return; + } + fprintf(stderr, "0x%08x 0x%08x: 0x%02x\n", + offset + i, + header != VC4_PACKET_GEM_HANDLES ? hw_offset + i : 0, + cmds[offset + i]); + } + + switch (header) { + case VC4_PACKET_HALT: + case VC4_PACKET_STORE_MS_TILE_BUFFER_AND_EOF: + return; + default: + break; + } + + offset += p->size; + if (header != VC4_PACKET_GEM_HANDLES) + hw_offset += p->size; + } +} + diff --git a/src/gallium/drivers/vc4/vc4_context.c b/src/gallium/drivers/vc4/vc4_context.c index 6ecc2cab2ab..5133ecadff4 100644 --- a/src/gallium/drivers/vc4/vc4_context.c +++ b/src/gallium/drivers/vc4/vc4_context.c @@ -216,6 +216,13 @@ vc4_flush(struct pipe_context *pctx) vc4_setup_rcl(vc4); + if (vc4_debug & VC4_DEBUG_CL) { + fprintf(stderr, "BCL:\n"); + vc4_dump_cl(&vc4->bcl, false); + fprintf(stderr, "RCL:\n"); + vc4_dump_cl(&vc4->rcl, true); + } + struct drm_vc4_submit_cl submit; memset(&submit, 0, sizeof(submit)); |