From fa6562b239f00f9f72c988459e252bdee072fd73 Mon Sep 17 00:00:00 2001 From: Aditya Swarup Date: Wed, 27 Jul 2022 17:35:03 -0700 Subject: [PATCH] Revert "iris: Disable tiled memcpy for Tile4" This reverts commit 0022a11ff4fbbe89c2511d758f807b286ebb1bd7. Enable path for Tile4 memcpy functions to be used. Signed-off-by: Aditya Swarup Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/iris_resource.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 71f299f..c8d2082 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -2639,8 +2639,8 @@ iris_transfer_map(struct pipe_context *ctx, if (prefer_cpu_access(res, box, usage, level, map_would_stall)) usage |= PIPE_MAP_DIRECTLY; - /* TODO: Teach iris_map_tiled_memcpy about Tile4 and Tile64... */ - if (res->surf.tiling == ISL_TILING_4 || res->surf.tiling == ISL_TILING_64) + /* TODO: Teach iris_map_tiled_memcpy about Tile64... */ + if (res->surf.tiling == ISL_TILING_64) usage &= ~PIPE_MAP_DIRECTLY; if (!(usage & PIPE_MAP_DIRECTLY)) { @@ -2765,10 +2765,9 @@ iris_texture_subdata(struct pipe_context *ctx, * take that path if we need the GPU to perform color compression, or * stall-avoidance blits. * - * TODO: Teach isl_memcpy_linear_to_tiled about Tile4 and Tile64... + * TODO: Teach isl_memcpy_linear_to_tiled about Tile64... */ if (surf->tiling == ISL_TILING_LINEAR || - surf->tiling == ISL_TILING_4 || surf->tiling == ISL_TILING_64 || isl_aux_usage_has_compression(res->aux.usage) || resource_is_busy(ice, res) || -- 2.7.4