diff options
| author | Rob Clark <[email protected]> | 2019-07-24 13:31:13 -0700 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2019-07-29 15:15:31 -0700 |
| commit | 010d255656d21dbac80c3bfbddcd4dbc92faa988 (patch) | |
| tree | 7be67c8e323af0a19ca41b6d40e9a4edcc6652a2 | |
| parent | 73cc2dc08447a1be5cd23053d0d77465c589eb0e (diff) | |
freedreno/a6xx: fix MSAA resolve hangs
Seems like RB_BLIT_SCISSOR needs to be aligned to (minimum?) tile size.
Fixes intermittent GPU hangs triggered by some of the three.js samples
on https://threejs.org/
Signed-off-by: Rob Clark <[email protected]>
| -rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_gmem.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c index 27c57a0074c..f93dd570982 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c @@ -679,17 +679,10 @@ set_blit_scissor(struct fd_batch *batch, struct fd_ringbuffer *ring) struct pipe_scissor_state blit_scissor; struct pipe_framebuffer_state *pfb = &batch->framebuffer; - blit_scissor.minx = batch->max_scissor.minx; - blit_scissor.miny = batch->max_scissor.miny; - blit_scissor.maxx = MIN2(pfb->width, batch->max_scissor.maxx); - blit_scissor.maxy = MIN2(pfb->height, batch->max_scissor.maxy); - - /* NOTE: blob switches to CP_BLIT instead of CP_EVENT_WRITE:BLIT for - * small render targets. But since we align pitch to binw I think - * we can get away avoiding GPU hangs a simpler way, by just rounding - * up the blit scissor: - */ - blit_scissor.maxx = MAX2(blit_scissor.maxx, batch->ctx->screen->gmem_alignw); + blit_scissor.minx = 0; + blit_scissor.miny = 0; + blit_scissor.maxx = align(pfb->width, batch->ctx->screen->gmem_alignw); + blit_scissor.maxy = align(pfb->height, batch->ctx->screen->gmem_alignh); OUT_PKT4(ring, REG_A6XX_RB_BLIT_SCISSOR_TL, 2); OUT_RING(ring, |