From 9e6019bd46902987c677bb19142e7cc89e43d2b9 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 12 Oct 2018 16:27:59 -0400 Subject: [PATCH] freedreno/a6xx: remove fd6_emit_render_cntl() It was dead code carried over from a5xx Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/a6xx/fd6_draw.c | 4 --- src/gallium/drivers/freedreno/a6xx/fd6_emit.h | 30 ------------------- 2 files changed, 34 deletions(-) diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c index 252fdc354b4..d9e363575db 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_draw.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_draw.c @@ -146,8 +146,6 @@ draw_impl(struct fd_context *ctx, struct fd_ringbuffer *ring, OUT_RING(ring, info->primitive_restart ? /* PC_RESTART_INDEX */ info->restart_index : 0xffffffff); - fd6_emit_render_cntl(ctx, false, emit->key.binning_pass); - /* for debug after a lock up, write a unique counter value * to scratch7 for each draw, to make it easier to match up * register dumps to cmdstream. The combination of IB @@ -419,8 +417,6 @@ fd6_clear(struct fd_context *ctx, unsigned buffers, is_z32(pfb->zsbuf->format)) return false; - fd6_emit_render_cntl(ctx, true, false); - OUT_PKT4(ring, REG_A6XX_RB_BLIT_SCISSOR_TL, 2); OUT_RING(ring, A6XX_RB_BLIT_SCISSOR_TL_X(scissor->minx) | A6XX_RB_BLIT_SCISSOR_TL_Y(scissor->miny)); diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h index 743e5df196b..4ebb5987423 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h @@ -120,36 +120,6 @@ fd6_emit_blit(struct fd_batch *batch, struct fd_ringbuffer *ring) emit_marker6(ring, 7); } -static inline void -fd6_emit_render_cntl(struct fd_context *ctx, bool blit, bool binning) -{ -#if 0 - struct fd_ringbuffer *ring = binning ? ctx->batch->binning : ctx->batch->draw; - - /* TODO eventually this partially depends on the pfb state, ie. - * which of the cbuf(s)/zsbuf has an UBWC flag buffer.. that part - * we could probably cache and just regenerate if framebuffer - * state is dirty (or something like that).. - * - * Other bits seem to depend on query state, like if samples-passed - * query is active. - */ - bool samples_passed = (fd6_context(ctx)->samples_passed_queries > 0); - OUT_PKT4(ring, REG_A6XX_RB_RENDER_CNTL, 1); - OUT_RING(ring, 0x00000000 | /* RB_RENDER_CNTL */ - COND(binning, A6XX_RB_RENDER_CNTL_BINNING_PASS) | - COND(binning, A6XX_RB_RENDER_CNTL_DISABLE_COLOR_PIPE) | - COND(samples_passed, A6XX_RB_RENDER_CNTL_SAMPLES_PASSED) | - COND(!blit, 0x8)); - OUT_PKT4(ring, REG_A6XX_GRAS_SC_CNTL, 1); - OUT_RING(ring, 0x00000008 | /* GRAS_SC_CNTL */ - COND(binning, A6XX_GRAS_SC_CNTL_BINNING_PASS) | - COND(samples_passed, A6XX_GRAS_SC_CNTL_SAMPLES_PASSED)); -#else - DBG("render ctl stub"); -#endif -} - static inline void fd6_emit_lrz_flush(struct fd_ringbuffer *ring) { -- 2.30.2