Mesa (master): radeonsi: fix surf_pitch for subsampled surface

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 69aadc493310bb7306d10559bf48412eb5865962
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69aadc493310bb7306d10559bf48412eb5865962

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Tue Feb  4 18:56:59 2020 +0100

radeonsi: fix surf_pitch for subsampled surface

gfx9.surf_pitch is supposed to be in blocks (or elements) but addrlib
returns a pitch in pixels.
This cause a mismatch between surface->bpe and surface.u.gfx9.surf_pitch.

For subsampled formats like uyvy (bpe is 2) this breaks in various places:
 - sdma copy
 - video rendering (see issue https://gitlab.freedesktop.org/mesa/mesa/issues/2363)
   when the vl_compositor_gfx_render method is used

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3738>

---

 src/amd/common/ac_surface.c                    |  5 +++++
 src/gallium/drivers/radeonsi/si_compute_blit.c | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c
index 8a39f8b02d0..545ef420756 100644
--- a/src/amd/common/ac_surface.c
+++ b/src/amd/common/ac_surface.c
@@ -1071,6 +1071,11 @@ static int gfx9_compute_miptree(ADDR_HANDLE addrlib,
 
 	surf->u.gfx9.surf_slice_size = out.sliceSize;
 	surf->u.gfx9.surf_pitch = out.pitch;
+	if (!compressed && surf->blk_w > 1 && out.pitch == out.pixelPitch) {
+		/* Adjust surf_pitch to be in elements units,
+		 * not in pixels */
+		surf->u.gfx9.surf_pitch /= surf->blk_w;
+	}
 	surf->u.gfx9.surf_height = out.height;
 	surf->surf_size = out.surfSize;
 	surf->surf_alignment = out.baseAlign;
diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/si_compute_blit.c
index 73020f9d3b4..de020bfaf8c 100644
--- a/src/gallium/drivers/radeonsi/si_compute_blit.c
+++ b/src/gallium/drivers/radeonsi/si_compute_blit.c
@@ -398,17 +398,17 @@ void si_compute_copy_image(struct si_context *sctx,
 	assert(util_format_is_subsampled_422(src_format) ==
 	       util_format_is_subsampled_422(dst_format));
 
-	if (util_format_is_subsampled_422(src_format))
+	if (util_format_is_subsampled_422(src_format)) {
 		src_format = dst_format = PIPE_FORMAT_R32_UINT;
-
-	unsigned x_div = util_format_get_blockwidth(src->format) /
-	                 util_format_get_blockwidth(src_format);
-	assert(src_box->x % x_div == 0);
-	assert(width % x_div == 0);
-
-	unsigned data[] = {src_box->x / x_div, src_box->y, src_box->z, 0,
-	                   dstx / x_div, dsty, dstz, 0};
-	width /= x_div;
+		/* Interpreting 422 subsampled format (16 bpp) as 32 bpp
+		 * should force us to divide src_box->x, dstx and width by 2.
+		 * But given that ac_surface allocates this format as 32 bpp
+		 * and that surf_size is then modified to pack the values
+		 * we must keep the original values to get the correct results.
+		 */
+	}
+	unsigned data[] = {src_box->x, src_box->y, src_box->z, 0,
+	                   dstx, dsty, dstz, 0};
 
 	if (width == 0 || height == 0)
 		return;