From bec100f9b5b78ce398a66f13dfe096e06535aa2c Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 17 May 2023 08:39:23 +0200
Subject: [PATCH] ci,radv: use drm-shim instead of the null winsys for
 radv-fossils

Only RADV uses fossilize-runner.sh, so hardcoding LD_PRELOAD is fine.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23072>
---
 .gitlab-ci/fossilize-runner.sh |  1 +
 src/amd/ci/gitlab-ci.yml       | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci/fossilize-runner.sh b/.gitlab-ci/fossilize-runner.sh
index c3528ac..e19544f 100755
--- a/.gitlab-ci/fossilize-runner.sh
+++ b/.gitlab-ci/fossilize-runner.sh
@@ -12,6 +12,7 @@ INSTALL=`pwd`/install
 # Set up the driver environment.
 export LD_LIBRARY_PATH=`pwd`/install/lib/
 export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.x86_64.json
+export LD_PRELOAD=`pwd`/install/lib/libamdgpu_noop_drm_shim.so
 
 # To store Fossilize logs on failure.
 RESULTS=`pwd`/results
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 4b3327b..0676ed7 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -404,25 +404,25 @@ radv-fossils:
     - .fossilize-test
   script:
     # Pitcairn (GFX6)
-    - export RADV_FORCE_FAMILY="PITCAIRN"
+    - export AMDGPU_GPU_ID="PITCAIRN"
     - ./install/fossilize-runner.sh
     # Bonaire (GFX7)
-    - export RADV_FORCE_FAMILY="BONAIRE"
+    - export AMDGPU_GPU_ID="BONAIRE"
     - ./install/fossilize-runner.sh
     # Polaris10 (GFX8)
-    - export RADV_FORCE_FAMILY="POLARIS10"
+    - export AMDGPU_GPU_ID="POLARIS10"
     - ./install/fossilize-runner.sh
     # Vega10 (GFX9)
-    - export RADV_FORCE_FAMILY="VEGA10"
+    - export AMDGPU_GPU_ID="VEGA10"
     - ./install/fossilize-runner.sh
     # Navi10 (GFX10)
-    - export RADV_FORCE_FAMILY="NAVI10"
+    - export AMDGPU_GPU_ID="NAVI10"
     - ./install/fossilize-runner.sh
     # Navi21 (GFX10_3)
-    - export RADV_FORCE_FAMILY="NAVI21"
+    - export AMDGPU_GPU_ID="NAVI21"
     - ./install/fossilize-runner.sh
     # RDNA3 (GFX11)
-    - export RADV_FORCE_FAMILY="GFX1100"
+    - export AMDGPU_GPU_ID="GFX1100"
     - ./install/fossilize-runner.sh
 
 ############### vkd3d-proton
-- 
2.7.4