From ea185aef032f99da21a1797f38d8f34b1816bba7 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 7 Apr 2022 17:51:04 -0500 Subject: [PATCH] iris: Handle resource offsets in buffer copies Fixes: c5b22441f1c ("iris: Fix buffer -> buffer copy_region") Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/iris_blit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/iris/iris_blit.c b/src/gallium/drivers/iris/iris_blit.c index 3b32d65eeb1..0b505268ff1 100644 --- a/src/gallium/drivers/iris/iris_blit.c +++ b/src/gallium/drivers/iris/iris_blit.c @@ -684,13 +684,13 @@ iris_copy_region(struct blorp_context *blorp, if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) { struct blorp_address src_addr = { - .buffer = src_res->bo, .offset = src_box->x, + .buffer = src_res->bo, .offset = src_res->offset + src_box->x, .mocs = iris_mocs(src_res->bo, &screen->isl_dev, ISL_SURF_USAGE_TEXTURE_BIT), .local_hint = iris_bo_likely_local(src_res->bo), }; struct blorp_address dst_addr = { - .buffer = dst_res->bo, .offset = dstx, + .buffer = dst_res->bo, .offset = dst_res->offset + dstx, .reloc_flags = EXEC_OBJECT_WRITE, .mocs = iris_mocs(dst_res->bo, &screen->isl_dev, ISL_SURF_USAGE_RENDER_TARGET_BIT),