Module: Mesa
Branch: master
Commit: 50f9a9aa960b6340b84aae2fa0e86e14c0e40fa8
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=50f9a9aa960b6340b84aae2fa0e86e14c0e40fa8
Author: Rob Clark <robdcl...@gmail.com>
Date: Mon Jan 8 13:40:22 2018 -0500
freedreno/a5xx: work around SWAP vs TILE_MODE constraint
If the blit isn't changing format, but is changing tiling, just lie and
call things ARGB (since the exact component order doesn't matter for a
tiling blit).
Signed-off-by: Rob Clark <robdcl...@gmail.com>
---
src/gallium/drivers/freedreno/a5xx/fd5_blitter.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
index 6d4fa2c684..6e8177d344 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
@@ -93,6 +93,16 @@ can_do_blit(const struct pipe_blit_info *info)
if (!ok_format(info->src.format))
return false;
+ /* hw ignores {SRC,DST}_INFO.COLOR_SWAP if {SRC,DST}_INFO.TILE_MODE
+ * is set (not linear). We can kind of get around that when tiling/
+ * untiling by setting both src and dst COLOR_SWAP=WZYX, but that
+ * means the formats must match:
+ */
+ if ((fd_resource(info->dst.resource)->tile_mode ||
+ fd_resource(info->src.resource)->tile_mode) &&
+ info->dst.format != info->src.format)
+ return false;
+
/* until we figure out a few more registers: */
if ((info->dst.box.width != info->src.box.width) ||
(info->dst.box.height != info->src.box.height))
@@ -342,6 +352,16 @@ emit_blit(struct fd_ringbuffer *ring, const struct
pipe_blit_info *info)
spitch = sslice->pitch * src->cpp;
dpitch = dslice->pitch * dst->cpp;
+ /* if dtile, then dswap ignored by hw, and likewise if stile then sswap
+ * ignored by hw.. but in this case we have already rejected the blit
+ * if src and dst formats differ, so juse use WZYX for both src and
+ * dst swap mode (so we don't change component order)
+ */
+ if (stile || dtile) {
+ debug_assert(info->src.format == info->dst.format);
+ sswap = dswap = WZYX;
+ }
+
sx1 = sbox->x;
sy1 = sbox->y;
sx2 = sbox->x + sbox->width - 1;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
