Skip to content

Commit

Permalink
freedreno: don't flush when new and old pfb is identical
Browse files Browse the repository at this point in the history
In the 'inorder' case (ie. FD_MESA_DEBUG=inorder, or old kernel), if the
u_blitter clear path is used (a3xx, a4xx, and some fallback cases on
newer gens), util_blitter_restore_fb_state() will set_framebuffer_state()
to something that is identical to the current fb state, which triggers
an unnecessary flush, and then eventually an assert:

  (gdb) bt
  #0  0x0000007fbf24a078 in kill () from /lib64/libc.so.6
  grate-driver#1  0x0000007fbe061278 in _debug_assert_fail (expr=0x7fbe93a820 "!batch->flushed", file=0x7fbe93a628 "../src/gallium/drivers/freedreno/freedreno_batch.c", line=491, function=0x7fbe93a990 <__func__.17380> "fd_batch_check_size") at ../src/gallium/auxiliary/util/u_debug.c:322
  grate-driver#2  0x0000007fbe1ccb8c in fd_batch_check_size (batch=0x55556d5a70) at ../src/gallium/drivers/freedreno/freedreno_batch.c:491
  grate-driver#3  0x0000007fbe1d0e08 in fd_clear (pctx=0x55555c61e0, buffers=5, color=0x55556e388c, depth=1, stencil=0) at ../src/gallium/drivers/freedreno/freedreno_draw.c:463
  grate-driver#4  0x0000007fbe57afa4 in st_Clear (ctx=0x55556e17b0, mask=18) at ../src/mesa/state_tracker/st_cb_clear.c:452

The assert was introduced in 4b847b3, so from a functionality
standpoint this patch fixes that commit.  But it should also avoid an
unnecessary flush in the 'inorder' case, fixing a performance bug.

Fixes: 4b847b3 freedreno: make fd_batch a one-shot thing
Signed-off-by: Rob Clark <robdclark@gmail.com>
(cherry picked from commit a61952e)
  • Loading branch information
robclark authored and jasuarez committed Oct 29, 2018
1 parent b8ddd70 commit c4bb9bc
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/gallium/drivers/freedreno/freedreno_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,9 @@ fd_set_framebuffer_state(struct pipe_context *pctx,

cso = &ctx->batch->framebuffer;

if (util_framebuffer_state_equal(cso, framebuffer))
return;

util_copy_framebuffer_state(cso, framebuffer);

cso->samples = util_framebuffer_get_num_samples(cso);
Expand Down

0 comments on commit c4bb9bc

Please sign in to comment.