From c12444ab8894e7d755401eb26523bb0e2ae63697 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 2 Aug 2021 02:26:46 -0400 Subject: [PATCH] crocus/gen45: fix mapping compressed textures I don't think iris ever hits this path, but probably has the same bug if it did. Fixes texsubimage on gfx4 + gfx4.5 Fixes: 5bf6ec31ccf6 ("crocus/gen4: restrict memcpy mapping to gen5") Part-of: --- src/gallium/drivers/crocus/crocus_resource.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/crocus/crocus_resource.c b/src/gallium/drivers/crocus/crocus_resource.c index f189f1a4f99..5adca55233f 100644 --- a/src/gallium/drivers/crocus/crocus_resource.c +++ b/src/gallium/drivers/crocus/crocus_resource.c @@ -1542,12 +1542,17 @@ crocus_map_direct(struct crocus_transfer *map) const unsigned cpp = fmtl->bpb / 8; unsigned x0_el, y0_el; + assert(box->x % fmtl->bw == 0); + assert(box->y % fmtl->bh == 0); get_image_offset_el(surf, xfer->level, box->z, &x0_el, &y0_el); + x0_el += box->x / fmtl->bw; + y0_el += box->y / fmtl->bh; + xfer->stride = isl_surf_get_row_pitch_B(surf); xfer->layer_stride = isl_surf_get_array_pitch(surf); - map->ptr = ptr + (y0_el + box->y) * xfer->stride + (x0_el + box->x) * cpp; + map->ptr = ptr + y0_el * xfer->stride + x0_el * cpp; } }