From 497afad855216a36c49bd110417548f7a3b3e9ec Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 2 Oct 2024 10:32:34 +0300 Subject: [PATCH] isl: remove duplicated copy for tileX/TileY Signed-off-by: Lionel Landwerlin Cc: mesa-stable Reviewed-by: Nanley Chery Part-of: (cherry picked from commit 52263413f47e9190d9f53c9ef336c3ab46070598) --- .pick_status.json | 2 +- src/intel/isl/isl_tiled_memcpy.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 68bf1b31de1..5b6e36baa2d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1544,7 +1544,7 @@ "description": "isl: remove duplicated copy for tileX/TileY", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/isl/isl_tiled_memcpy.c b/src/intel/isl/isl_tiled_memcpy.c index 33428ad1238..e8fa4f92391 100644 --- a/src/intel/isl/isl_tiled_memcpy.c +++ b/src/intel/isl/isl_tiled_memcpy.c @@ -1048,8 +1048,6 @@ linear_to_xtiled_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, else unreachable("not reached"); } - linear_to_xtiled(x0, x1, x2, x3, y0, y1, - dst, src, src_pitch, swizzle_bit, mem_copy, mem_copy); } /** @@ -1092,8 +1090,6 @@ linear_to_ytiled_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, else unreachable("not reached"); } - linear_to_ytiled(x0, x1, x2, x3, y0, y1, - dst, src, src_pitch, swizzle_bit, mem_copy, mem_copy); } /** @@ -1191,8 +1187,6 @@ xtiled_to_linear_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, else unreachable("not reached"); } - xtiled_to_linear(x0, x1, x2, x3, y0, y1, - dst, src, dst_pitch, swizzle_bit, mem_copy, mem_copy); } /** @@ -1247,8 +1241,6 @@ ytiled_to_linear_faster(uint32_t x0, uint32_t x1, uint32_t x2, uint32_t x3, else unreachable("not reached"); } - ytiled_to_linear(x0, x1, x2, x3, y0, y1, - dst, src, dst_pitch, swizzle_bit, mem_copy, mem_copy); } /**