diff options
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_cl.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_cl_dump.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_context.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_simulator.c | 21 |
4 files changed, 26 insertions, 9 deletions
diff --git a/src/gallium/drivers/vc4/vc4_cl.h b/src/gallium/drivers/vc4/vc4_cl.h index 2cdd77dd301..634a4b0a421 100644 --- a/src/gallium/drivers/vc4/vc4_cl.h +++ b/src/gallium/drivers/vc4/vc4_cl.h @@ -43,7 +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); +void vc4_dump_cl(void *cl, uint32_t size, 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 index 40bcf011874..a55c04fc144 100644 --- a/src/gallium/drivers/vc4/vc4_cl_dump.c +++ b/src/gallium/drivers/vc4/vc4_cl_dump.c @@ -83,12 +83,12 @@ static const struct packet_info { }; void -vc4_dump_cl(struct vc4_cl *cl, bool is_render) +vc4_dump_cl(void *cl, uint32_t size, bool is_render) { uint32_t offset = 0, hw_offset = 0; - uint8_t *cmds = cl->base; + uint8_t *cmds = cl; - while (offset < cl->end - cl->base) { + while (offset < size) { uint8_t header = cmds[offset]; if (header > ARRAY_SIZE(packet_info) || @@ -105,7 +105,7 @@ vc4_dump_cl(struct vc4_cl *cl, bool is_render) header, p->name); for (uint32_t i = 1; i < p->size; i++) { - if (offset + i >= cl->end - cl->base) { + if (offset + i >= size) { fprintf(stderr, "0x%08x 0x%08x: CL overflow!\n", offset + i, hw_offset + i); return; diff --git a/src/gallium/drivers/vc4/vc4_context.c b/src/gallium/drivers/vc4/vc4_context.c index 7779c461c76..cc57486e103 100644 --- a/src/gallium/drivers/vc4/vc4_context.c +++ b/src/gallium/drivers/vc4/vc4_context.c @@ -273,9 +273,9 @@ vc4_flush(struct pipe_context *pctx) if (vc4_debug & VC4_DEBUG_CL) { fprintf(stderr, "BCL:\n"); - vc4_dump_cl(&vc4->bcl, false); + vc4_dump_cl(vc4->bcl.base, vc4->bcl.end - vc4->bcl.base, false); fprintf(stderr, "RCL:\n"); - vc4_dump_cl(&vc4->rcl, true); + vc4_dump_cl(vc4->rcl.base, vc4->rcl.end - vc4->rcl.base, true); } struct drm_vc4_submit_cl submit; diff --git a/src/gallium/drivers/vc4/vc4_simulator.c b/src/gallium/drivers/vc4/vc4_simulator.c index 34262f5362c..1040ae8f5c4 100644 --- a/src/gallium/drivers/vc4/vc4_simulator.c +++ b/src/gallium/drivers/vc4/vc4_simulator.c @@ -108,6 +108,7 @@ vc4_simulator_unpin_bos(struct exec_info *exec) int vc4_simulator_flush(struct vc4_context *vc4, struct drm_vc4_submit_cl *args) { + struct vc4_screen *screen = vc4->screen; struct vc4_surface *csurf = vc4_surface(vc4->framebuffer.cbufs[0]); struct vc4_resource *ctex = csurf ? vc4_resource(csurf->base.texture) : NULL; uint32_t winsys_stride = ctex ? ctex->bo->simulator_winsys_stride : 0; @@ -149,8 +150,24 @@ vc4_simulator_flush(struct vc4_context *vc4, struct drm_vc4_submit_cl *args) if (ret) return ret; - simpenrose_do_binning(exec.ct0ca, exec.ct0ea); - simpenrose_do_rendering(exec.ct1ca, exec.ct1ea); + int bfc = simpenrose_do_binning(exec.ct0ca, exec.ct0ea); + if (bfc != 1) { + fprintf(stderr, "Binning returned %d flushes, should be 1.\n", + bfc); + fprintf(stderr, "Relocated binning command list:\n"); + vc4_dump_cl(screen->simulator_mem_base + exec.ct0ca, + exec.ct0ea - exec.ct0ca, false); + abort(); + } + int rfc = simpenrose_do_rendering(exec.ct1ca, exec.ct1ea); + if (rfc != 1) { + fprintf(stderr, "Rendering returned %d frames, should be 1.\n", + rfc); + fprintf(stderr, "Relocated render command list:\n"); + vc4_dump_cl(screen->simulator_mem_base + exec.ct1ca, + exec.ct1ea - exec.ct1ca, true); + abort(); + } ret = vc4_simulator_unpin_bos(&exec); if (ret) |