diff options
author | Erico Nunes <[email protected]> | 2019-08-23 06:34:36 +0200 |
---|---|---|
committer | Erico Nunes <[email protected]> | 2019-08-25 20:08:59 +0200 |
commit | 27e7603c344a31d5b2f0ef45ac54ee4c643910fc (patch) | |
tree | 2581cc500ada9aa29502200a2c3909912803c387 | |
parent | f58e0405b6ca15d9b82122d82311e8b82f4a0939 (diff) |
lima: fix ppir spill stack allocation
The previous spill stack was fixed and too small, and caused instability
in programs requiring spilling for roughly more than one value.
This patch adds a dynamic calculation of the buffer size based on stack
utilization and switches it to a separate allocation at flush time that
will fit the shader that requires the largest buffer.
Signed-off-by: Erico Nunes <[email protected]>
Reviewed-by: Vasily Khoruzhick <[email protected]>
Reviewed-by: Qiang Yu <[email protected]>
-rw-r--r-- | src/gallium/drivers/lima/lima_context.h | 3 | ||||
-rw-r--r-- | src/gallium/drivers/lima/lima_draw.c | 24 | ||||
-rw-r--r-- | src/gallium/drivers/lima/lima_program.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/lima/lima_screen.h | 5 |
4 files changed, 25 insertions, 9 deletions
diff --git a/src/gallium/drivers/lima/lima_context.h b/src/gallium/drivers/lima/lima_context.h index 0b232d72d1d..cb070f021a2 100644 --- a/src/gallium/drivers/lima/lima_context.h +++ b/src/gallium/drivers/lima/lima_context.h @@ -129,6 +129,7 @@ enum lima_ctx_buff { lima_ctx_buff_pp_uniform_array, lima_ctx_buff_pp_uniform, lima_ctx_buff_pp_tex_desc, + lima_ctx_buff_pp_stack, lima_ctx_buff_num, }; @@ -244,6 +245,8 @@ struct lima_context { int id; struct pipe_debug_callback debug; + + int pp_max_stack_size; }; static inline struct lima_context * diff --git a/src/gallium/drivers/lima/lima_draw.c b/src/gallium/drivers/lima/lima_draw.c index 33b01212f43..d39e198cd9b 100644 --- a/src/gallium/drivers/lima/lima_draw.c +++ b/src/gallium/drivers/lima/lima_draw.c @@ -1535,6 +1535,8 @@ lima_pack_pp_frame_reg(struct lima_context *ctx, uint32_t *frame_reg, static void _lima_flush(struct lima_context *ctx, bool end_of_frame) { + #define pp_stack_pp_size 0x400 + lima_finish_plbu_cmd(ctx); int vs_cmd_size = ctx->vs_cmd_array.size; @@ -1600,6 +1602,14 @@ _lima_flush(struct lima_context *ctx, bool end_of_frame) } } + uint32_t pp_stack_va = 0; + if (ctx->pp_max_stack_size) { + lima_ctx_buff_alloc(ctx, lima_ctx_buff_pp_stack, screen->num_pp * + ctx->pp_max_stack_size * pp_stack_pp_size, true); + pp_stack_va = lima_ctx_buff_va(ctx, lima_ctx_buff_pp_stack, + LIMA_CTX_BUFF_SUBMIT_PP); + } + struct lima_pp_stream_state *ps = &ctx->pp_stream; if (screen->gpu_type == DRM_LIMA_PARAM_GPU_ID_MALI400) { struct drm_lima_m400_pp_frame pp_frame = {0}; @@ -1608,8 +1618,9 @@ _lima_flush(struct lima_context *ctx, bool end_of_frame) for (int i = 0; i < screen->num_pp; i++) { pp_frame.plbu_array_address[i] = ps->bo->va + ps->bo_offset + ps->offset[i]; - pp_frame.fragment_stack_address[i] = screen->pp_buffer->va + - pp_stack_offset + pp_stack_pp_size * i; + if (ctx->pp_max_stack_size) + pp_frame.fragment_stack_address[i] = pp_stack_va + + ctx->pp_max_stack_size * pp_stack_pp_size * i; } lima_dump_command_stream_print( @@ -1623,9 +1634,10 @@ _lima_flush(struct lima_context *ctx, bool end_of_frame) lima_pack_pp_frame_reg(ctx, pp_frame.frame, pp_frame.wb); pp_frame.num_pp = screen->num_pp; - for (int i = 0; i < screen->num_pp; i++) - pp_frame.fragment_stack_address[i] = screen->pp_buffer->va + - pp_stack_offset + pp_stack_pp_size * i; + if (ctx->pp_max_stack_size) + for (int i = 0; i < screen->num_pp; i++) + pp_frame.fragment_stack_address[i] = pp_stack_va + + ctx->pp_max_stack_size * pp_stack_pp_size * i; if (ps->bo) { for (int i = 0; i < screen->num_pp; i++) @@ -1663,6 +1675,8 @@ _lima_flush(struct lima_context *ctx, bool end_of_frame) struct lima_surface *surf = lima_surface(ctx->framebuffer.base.cbufs[0]); surf->reload = true; } + + ctx->pp_max_stack_size = 0; } void diff --git a/src/gallium/drivers/lima/lima_program.c b/src/gallium/drivers/lima/lima_program.c index 5695730c323..845d9535aac 100644 --- a/src/gallium/drivers/lima/lima_program.c +++ b/src/gallium/drivers/lima/lima_program.c @@ -303,6 +303,8 @@ lima_update_fs_state(struct lima_context *ctx) fs->shader = NULL; } + ctx->pp_max_stack_size = MAX2(ctx->pp_max_stack_size, ctx->fs->stack_size); + return true; } diff --git a/src/gallium/drivers/lima/lima_screen.h b/src/gallium/drivers/lima/lima_screen.h index 29693168828..547d083ecd0 100644 --- a/src/gallium/drivers/lima/lima_screen.h +++ b/src/gallium/drivers/lima/lima_screen.h @@ -73,10 +73,7 @@ struct lima_screen { #define pp_reload_program_offset 0x0080 #define pp_shared_index_offset 0x00c0 #define pp_clear_gl_pos_offset 0x0100 - #define pp_stack_offset 0x1000 - #define pp_stack_pp_size 0x400 /* per pp, up to 8 pp */ - #define pp_stack_offset_end 0x3000 - #define pp_buffer_size 0x3000 + #define pp_buffer_size 0x1000 }; |