From d88d664399206b47eaf32a1ab7e4e20760682083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Mon, 4 Mar 2024 08:50:41 +0200 Subject: [PATCH] crocus: make sure aux is disabled for memory objects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 0df9571bfb1a2fec1361fddda25db1bb9c3dac9e) --- .pick_status.json | 2 +- src/gallium/drivers/crocus/crocus_resource.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f3f6440877b..106fba55bfd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1284,7 +1284,7 @@ "description": "crocus: make sure aux is disabled for memory objects", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/crocus/crocus_resource.c b/src/gallium/drivers/crocus/crocus_resource.c index eed025a8003..7afb8bfe0cb 100644 --- a/src/gallium/drivers/crocus/crocus_resource.c +++ b/src/gallium/drivers/crocus/crocus_resource.c @@ -216,6 +216,10 @@ crocus_resource_configure_main(const struct crocus_screen *screen, tiling_flags = ISL_TILING_W_BIT; } + /* Disable aux for external memory objects. */ + if (!res->mod_info && res->external_format != PIPE_FORMAT_NONE) + usage |= ISL_SURF_USAGE_DISABLE_AUX_BIT; + const enum isl_format format = crocus_format_for_usage(&screen->devinfo, templ->format, usage).fmt;