From 3ea479c5849330446bf2f618256797e3552dce9c Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 12 Mar 2025 16:32:00 +0100
Subject: [PATCH] ci/deqp: backport fix for
 dEQP-VK.binding_model.buffer_device_address.*

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34028>
---
 .gitlab-ci/container/build-deqp.sh | 2 ++
 .gitlab-ci/image-tags.yml          | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index ec94bca8ed2..ce31004fead 100755
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -47,6 +47,8 @@ main_cts_patch_files=(
 
 # shellcheck disable=SC2034
 vk_cts_commits_to_backport=(
+  # Stop querying device address from unbound buffers
+  046343f46f7d39d53b47842d7fd8ed3279528046
 )
 
 # shellcheck disable=SC2034
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 113dbbb8d2b..b976d8761a8 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -39,8 +39,8 @@ variables:
 
    DEBIAN_TEST_ANDROID_TAG: "20250310-android-cts"
    DEBIAN_TEST_GL_TAG: "20250307-piglit-70"
-   DEBIAN_TEST_VK_TAG: "20250307-piglit-70"
-   KERNEL_ROOTFS_TAG: "20250307-piglit-70"
+   DEBIAN_TEST_VK_TAG: "20250312-bda-fix"
+   KERNEL_ROOTFS_TAG: "20250312-bda-fix"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20250303-hypothesis"