Module: Mesa Branch: staging/21.3 Commit: ce237f30a75a5c1b2f76b88789c573ce152311b6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce237f30a75a5c1b2f76b88789c573ce152311b6
Author: Kenneth Graunke <[email protected]> Date: Fri Oct 1 13:15:10 2021 -0700 iris: Fix parameters to iris_copy_region in reallocate_resource_inplace We had accidentally passed <x, y, z, l> instead of <l, x, y, z>. Fixes: b8ef3271c870 ("iris: Move suballocated resources to a dedicated allocation on export") Reviewed-by: Nanley Chery <[email protected]> Reviewed-by: Paulo Zanoni <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13815> (cherry picked from commit f4004fde262964351f72656f396e1cca491ee955) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_resource.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cc12f1a7535..2d41ee01518 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -409,7 +409,7 @@ "description": "iris: Fix parameters to iris_copy_region in reallocate_resource_inplace", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b8ef3271c870a4e8c0d641cbe4114f827015b75b" }, diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 4a126fb43d1..7eef060a4ed 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -1446,7 +1446,7 @@ iris_reallocate_resource_inplace(struct iris_context *ice, .depth = util_num_layers(&templ, l), }; - iris_copy_region(&ice->blorp, batch, &new_res->base.b, 0, 0, 0, l, + iris_copy_region(&ice->blorp, batch, &new_res->base.b, l, 0, 0, 0, &old_res->base.b, l, &box); } }
