From 7ff8ce7a3f080b4016fa6239e9d0b406b69310e5 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sat, 25 Jan 2020 14:44:55 -0800 Subject: [PATCH] freedreno/a6xx: convert blend state to stateobj And move to new register builders while we are at it. Signed-off-by: Rob Clark Tested-by: Marge Bot Part-of: --- src/gallium/drivers/freedreno/a6xx/fd6_blend.c | 79 ++++++++++++++---------- src/gallium/drivers/freedreno/a6xx/fd6_blend.h | 10 +-- src/gallium/drivers/freedreno/a6xx/fd6_context.c | 1 + src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 16 +---- src/gallium/drivers/freedreno/a6xx/fd6_emit.h | 1 + 5 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blend.c b/src/gallium/drivers/freedreno/a6xx/fd6_blend.c index 0a9d5f4..734f186 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blend.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blend.c @@ -33,6 +33,7 @@ #include "fd6_blend.h" #include "fd6_context.h" #include "fd6_format.h" +#include "fd6_pack.h" // XXX move somewhere common.. same across a3xx/a4xx/a5xx.. static enum a3xx_rb_blend_opcode @@ -59,6 +60,7 @@ void * fd6_blend_state_create(struct pipe_context *pctx, const struct pipe_blend_state *cso) { + struct fd_context *ctx = fd_context(pctx); struct fd6_blend_stateobj *so; enum a3xx_rop_code rop = ROP_COPY; bool reads_dest = false; @@ -90,10 +92,13 @@ fd6_blend_state_create(struct pipe_context *pctx, return NULL; so->base = *cso; + struct fd_ringbuffer *ring = fd_ringbuffer_new_object(ctx->pipe, + ((A6XX_MAX_RENDER_TARGETS * 4) + 4) * 4); + so->stateobj = ring; so->lrz_write = true; /* unless blend enabled for any MRT */ - for (i = 0; i < ARRAY_SIZE(so->rb_mrt); i++) { + for (i = 0; i < A6XX_MAX_RENDER_TARGETS; i++) { const struct pipe_rt_blend_state *rt; if (cso->independent_blend_enable) @@ -101,52 +106,64 @@ fd6_blend_state_create(struct pipe_context *pctx, else rt = &cso->rt[0]; - so->rb_mrt[i].blend_control= - A6XX_RB_MRT_BLEND_CONTROL_RGB_SRC_FACTOR(fd_blend_factor(rt->rgb_src_factor)) | - A6XX_RB_MRT_BLEND_CONTROL_RGB_BLEND_OPCODE(blend_func(rt->rgb_func)) | - A6XX_RB_MRT_BLEND_CONTROL_RGB_DEST_FACTOR(fd_blend_factor(rt->rgb_dst_factor)) | - A6XX_RB_MRT_BLEND_CONTROL_ALPHA_SRC_FACTOR(fd_blend_factor(rt->alpha_src_factor)) | - A6XX_RB_MRT_BLEND_CONTROL_ALPHA_BLEND_OPCODE(blend_func(rt->alpha_func)) | - A6XX_RB_MRT_BLEND_CONTROL_ALPHA_DEST_FACTOR(fd_blend_factor(rt->alpha_dst_factor)); - - so->rb_mrt[i].control = - A6XX_RB_MRT_CONTROL_ROP_CODE(rop) | - COND(cso->logicop_enable, A6XX_RB_MRT_CONTROL_ROP_ENABLE) | - A6XX_RB_MRT_CONTROL_COMPONENT_ENABLE(rt->colormask); + OUT_REG(ring, A6XX_RB_MRT_BLEND_CONTROL(i, + .rgb_src_factor = fd_blend_factor(rt->rgb_src_factor), + .rgb_blend_opcode = blend_func(rt->rgb_func), + .rgb_dest_factor = fd_blend_factor(rt->rgb_dst_factor), + .alpha_src_factor = fd_blend_factor(rt->alpha_src_factor), + .alpha_blend_opcode = blend_func(rt->alpha_func), + .alpha_dest_factor = fd_blend_factor(rt->alpha_dst_factor), + )); + + OUT_REG(ring, A6XX_RB_MRT_CONTROL(i, + .rop_code = rop, + .rop_enable = cso->logicop_enable, + .component_enable = rt->colormask, + .blend = rt->blend_enable, + .blend2 = rt->blend_enable, + )); if (rt->blend_enable) { - so->rb_mrt[i].control |= -// A6XX_RB_MRT_CONTROL_READ_DEST_ENABLE | - A6XX_RB_MRT_CONTROL_BLEND | - A6XX_RB_MRT_CONTROL_BLEND2; mrt_blend |= (1 << i); so->lrz_write = false; } if (reads_dest) { -// so->rb_mrt[i].control |= A6XX_RB_MRT_CONTROL_READ_DEST_ENABLE; mrt_blend |= (1 << i); so->lrz_write = false; } } - if (cso->dither) { - so->rb_dither_cntl = A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT0(DITHER_ALWAYS) | - A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT1(DITHER_ALWAYS) | - A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT2(DITHER_ALWAYS) | - A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT3(DITHER_ALWAYS) | - A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT4(DITHER_ALWAYS) | - A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT5(DITHER_ALWAYS) | - A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT6(DITHER_ALWAYS) | - A6XX_RB_DITHER_CNTL_DITHER_MODE_MRT7(DITHER_ALWAYS); - } + OUT_REG(ring, A6XX_RB_DITHER_CNTL( + .dither_mode_mrt0 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + .dither_mode_mrt1 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + .dither_mode_mrt2 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + .dither_mode_mrt3 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + .dither_mode_mrt4 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + .dither_mode_mrt5 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + .dither_mode_mrt6 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + .dither_mode_mrt7 = cso->dither ? DITHER_ALWAYS : DITHER_DISABLE, + )); so->rb_blend_cntl = A6XX_RB_BLEND_CNTL_ENABLE_BLEND(mrt_blend) | COND(cso->alpha_to_coverage, A6XX_RB_BLEND_CNTL_ALPHA_TO_COVERAGE) | COND(cso->independent_blend_enable, A6XX_RB_BLEND_CNTL_INDEPENDENT_BLEND); - so->sp_blend_cntl = A6XX_SP_BLEND_CNTL_UNK8 | - COND(cso->alpha_to_coverage, A6XX_SP_BLEND_CNTL_ALPHA_TO_COVERAGE) | - COND(mrt_blend, A6XX_SP_BLEND_CNTL_ENABLED); + + OUT_REG(ring, A6XX_SP_BLEND_CNTL( + .unk8 = true, + .alpha_to_coverage = cso->alpha_to_coverage, + .enabled = !!mrt_blend, + )); return so; } + +void +fd6_blend_state_delete(struct pipe_context *pctx, void *hwcso) +{ + struct fd6_blend_stateobj *so = hwcso; + + fd_ringbuffer_del(so->stateobj); + + FREE(hwcso); +} diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_blend.h b/src/gallium/drivers/freedreno/a6xx/fd6_blend.h index 878178d..75e905f 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_blend.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_blend.h @@ -37,15 +37,10 @@ struct fd6_blend_stateobj { struct pipe_blend_state base; - struct { - uint32_t control; - uint32_t buf_info; - uint32_t blend_control; - } rb_mrt[A6XX_MAX_RENDER_TARGETS]; uint32_t rb_blend_cntl; - uint32_t rb_dither_cntl; - uint32_t sp_blend_cntl; + bool lrz_write; + struct fd_ringbuffer *stateobj; }; static inline struct fd6_blend_stateobj * @@ -56,5 +51,6 @@ fd6_blend_stateobj(struct pipe_blend_state *blend) void * fd6_blend_state_create(struct pipe_context *pctx, const struct pipe_blend_state *cso); +void fd6_blend_state_delete(struct pipe_context *, void *hwcso); #endif /* FD6_BLEND_H_ */ diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.c b/src/gallium/drivers/freedreno/a6xx/fd6_context.c index 9bd3e34..63d7ece 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_context.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.c @@ -165,6 +165,7 @@ PC_UNKNOWN_9805: /* fd_context_init overwrites delete_rasterizer_state, so set this * here. */ pctx->delete_rasterizer_state = fd6_rasterizer_state_delete; + pctx->delete_blend_state = fd6_blend_state_delete; pctx->delete_depth_stencil_alpha_state = fd6_depth_stencil_alpha_state_delete; /* initial sizes for VSC buffers (or rather the per-pipe sizes diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c index 3af96d9..767c233 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c @@ -1075,21 +1075,7 @@ fd6_emit_state(struct fd_ringbuffer *ring, struct fd6_emit *emit) if (dirty & FD_DIRTY_BLEND) { struct fd6_blend_stateobj *blend = fd6_blend_stateobj(ctx->blend); - uint32_t i; - - for (i = 0; i < pfb->nr_cbufs; i++) { - OUT_PKT4(ring, REG_A6XX_RB_MRT_CONTROL(i), 1); - OUT_RING(ring, blend->rb_mrt[i].control); - - OUT_PKT4(ring, REG_A6XX_RB_MRT_BLEND_CONTROL(i), 1); - OUT_RING(ring, blend->rb_mrt[i].blend_control); - } - - OUT_PKT4(ring, REG_A6XX_RB_DITHER_CNTL, 1); - OUT_RING(ring, blend->rb_dither_cntl); - - OUT_PKT4(ring, REG_A6XX_SP_BLEND_CNTL, 1); - OUT_RING(ring, blend->sp_blend_cntl); + fd6_emit_add_group(emit, blend->stateobj, FD6_GROUP_BLEND, ENABLE_DRAW); } if (dirty & (FD_DIRTY_BLEND | FD_DIRTY_SAMPLE_MASK)) { diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h index 04674c7..2314ea7 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h @@ -66,6 +66,7 @@ enum fd6_state_id { FD6_GROUP_IBO, FD6_GROUP_RASTERIZER, FD6_GROUP_ZSA, + FD6_GROUP_BLEND, }; #define ENABLE_ALL (CP_SET_DRAW_STATE__0_BINNING | CP_SET_DRAW_STATE__0_GMEM | CP_SET_DRAW_STATE__0_SYSMEM) -- 2.7.4