Module: Mesa Branch: main Commit: 4229d9324f4a8da312e624d2249a10a76992d2cd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4229d9324f4a8da312e624d2249a10a76992d2cd
Author: Sviatoslav Peleshko <[email protected]> Date: Mon Feb 6 12:48:30 2023 +0200 iris: Avoid creating uncompressed view with unaligned tile offsets on BDW Fixes: 60568d5d ("iris: Use isl_surf_get_uncompressed_surf") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7990 Signed-off-by: Sviatoslav Peleshko <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21147> --- src/gallium/drivers/iris/iris_state.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 3e5a543918e..4dee0bc4b1c 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2823,6 +2823,21 @@ iris_create_surface(struct pipe_context *ctx, &res->surf, view, &isl_surf, view, &offset_B, &tile_x_el, &tile_y_el); + + /* On Broadwell, HALIGN and VALIGN are specified in pixels and are + * hard-coded to align to exactly the block size of the compressed + * texture. This means that, when reinterpreted as a non-compressed + * texture, the tile offsets may be anything. + * + * We need them to be multiples of 4 to be usable in RENDER_SURFACE_STATE, + * so force the state tracker to take fallback paths if they're not. + */ +#if GFX_VER == 8 + if (tile_x_el % 4 != 0 || tile_y_el % 4 != 0) { + ok = false; + } +#endif + if (!ok) { free(surf); return NULL;
