Revert "iris: Disable tiled memcpy for Tile4"

This reverts commit 0022a11ff4.

Enable path for Tile4 memcpy functions to be used.

Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13391>
This commit is contained in:
Aditya Swarup 2022-07-27 17:35:03 -07:00
parent a6c8ddb596
commit fa6562b239

View file

@ -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) ||