From 6528d267effa2dd358bafa6f1237ccf990716ad5 Mon Sep 17 00:00:00 2001
From: Aditya Swarup <aditya.swarup@intel.com>
Date: Tue, 6 May 2025 07:48:12 -0700
Subject: [PATCH] anv: Disable fast clear when surface width is 16k
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

HSD 16023071695 description mentions we need to extend
WA_16021232440 to cover the case when surface width is 16k.

BSpec: 57340

Signed-off-by: Aditya Swarup <aditya.swarup@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34838>
---
 src/intel/vulkan/anv_image.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 309430212b7..b57c8bef923 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -3548,9 +3548,12 @@ anv_can_fast_clear_color(const struct anv_cmd_buffer *cmd_buffer,
       return false;
    }
 
-   /* Wa_16021232440: Disable fast clear when height is 16k */
+   /* Wa_16021232440, HSD_16023071695: Disable fast clear when height
+    * or width is 16k
+    * */
    if (intel_needs_workaround(cmd_buffer->device->info, 16021232440) &&
-       image->vk.extent.height == 16 * 1024) {
+       (image->vk.extent.height == 16 * 1024 ||
+        image->vk.extent.width == 16 * 1024)) {
       return false;
    }