From ff6336ff293a2f7c9219393a33d3bc8aa3ab4ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Tue, 27 Feb 2024 14:29:44 +0200 Subject: [PATCH] iris: make sure aux is disabled for external 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 9058a2a78ec7b7a40bd8f16bb838f0b7030a9d69) --- .pick_status.json | 2 +- src/gallium/drivers/iris/iris_resource.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 733b82912c7..89d59c48303 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3464,7 +3464,7 @@ "description": "iris: make sure aux is disabled for external objects", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index 09dbcc0c5d4..9b9bfd267cd 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -745,6 +745,10 @@ iris_resource_configure_main(const struct iris_screen *screen, if (res->mod_info && !isl_drm_modifier_has_aux(modifier)) usage |= ISL_SURF_USAGE_DISABLE_AUX_BIT; + + else if (!res->mod_info && res->external_format != PIPE_FORMAT_NONE) + usage |= ISL_SURF_USAGE_DISABLE_AUX_BIT; + else if (templ->bind & PIPE_BIND_CONST_BW) usage |= ISL_SURF_USAGE_DISABLE_AUX_BIT;