Mesa (staging/21.0): ci: remove nouveau from shader-db runs

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: d990d65a9ca62ba1eb9216750c8f1b2db1f1c03b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d990d65a9ca62ba1eb9216750c8f1b2db1f1c03b

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Thu Feb  4 12:11:48 2021 -0500

ci: remove nouveau from shader-db runs

This is needed since we're about to reinstate the fencing mechanism on
screen destruction. Until we figure out another way to handle it, this
will cause hangs on exit with the shim.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable # 21.0
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8867>
(cherry picked from commit 0464117ad9bd47f079175058771220e8dad4f00b)

Conflicts:
	.gitlab-ci/run-shader-db.sh

---

 .gitlab-ci/run-shader-db.sh | 9 ---------
 .pick_status.json           | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.gitlab-ci/run-shader-db.sh b/.gitlab-ci/run-shader-db.sh
index e6bd7bc481c..d475bb3c76e 100755
--- a/.gitlab-ci/run-shader-db.sh
+++ b/.gitlab-ci/run-shader-db.sh
@@ -16,12 +16,3 @@ for driver in freedreno intel v3d; do
         ./run -j${FDO_CI_CONCURRENT:-4} ./shaders \
             > $ARTIFACTSDIR/${driver}-shader-db.txt
 done
-
-# Run shader-db over a number of supported chipsets for nouveau
-for chipset in 40 a3 c0 e4 f0 134; do
-    echo "Running drm-shim for nouveau - $chipset"
-    env LD_PRELOAD=$LIBDIR/libnouveau_noop_drm_shim.so \
-        NOUVEAU_CHIPSET=${chipset} \
-        ./run -j${FDO_CI_CONCURRENT:-4} ./shaders \
-            > $ARTIFACTSDIR/nouveau-${chipset}-shader-db.txt
-done
diff --git a/.pick_status.json b/.pick_status.json
index fa1996c9eed..1a12f8a4b80 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -28363,7 +28363,7 @@
         "description": "ci: remove nouveau from shader-db runs",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },