From 2723eec3125ce054e6da60328a33875b3ef64ba2 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 7 Apr 2026 11:39:50 +0200
Subject: [PATCH] ci/freedreno: Move remaining lazor a618 jobs, retire device
 type

The sc7180-trogdor-lazor-limozeen devices have been dying off over the
past few weeks, so move the last two jobs to sc7180-trogdor-kingoftown
and retire the device type.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
(cherry picked from commit bbed00ac81c306b682b669ee74b42f3f3c39a133)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40979>
---
 .pick_status.json                  |  2 +-
 src/freedreno/ci/gitlab-ci-inc.yml | 18 ------------------
 src/freedreno/ci/gitlab-ci.yml     |  4 ++--
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index ae6f6ff22f8..d3a951f68ea 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3684,7 +3684,7 @@
         "description": "ci/freedreno: Move remaining lazor a618 jobs, retire device type",
         "nominated": false,
         "nomination_type": 0,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml
index a43692bc741..c7f06f9bb2e 100644
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -222,24 +222,6 @@
     VK_DRIVER: freedreno
     LAVA_FIRMWARE: qcom-lava
 
-# Status: https://lava.collabora.dev/scheduler/device_type/sc7180-trogdor-lazor-limozeen
-.lava-sc7180-trogdor-lazor-limozeen:arm64:
-  variables:
-    BOOT_METHOD: depthcharge
-    DEVICE_TYPE: sc7180-trogdor-lazor-limozeen
-    DTB: sc7180-trogdor-lazor-limozeen-nots-r5
-    FDO_CI_CONCURRENT: 8
-    # Increase the hangcheck timer for our spilling tests which bump up against
-    # the .5s default.
-    FREEDRENO_HANGCHECK_MS: 2000
-    FARM: collabora
-    GPU_VERSION: freedreno-a618
-    KERNEL_IMAGE_TYPE: ""
-    RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen
-    DRIVER_NAME: freedreno-a6xx
-    VK_DRIVER: freedreno
-    LAVA_FIRMWARE: qcom-lava
-
 # Status: https://lava.collabora.dev/scheduler/device_type/sm8350-hdk
 .lava-sm8350-hdk:arm64:
   variables:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index c84b899fe9e..ca8549a311f 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -159,7 +159,7 @@ a618-gles-asan:
 a618-gl:
   extends:
     - .lava-arm64-test-gl
-    - .lava-sc7180-trogdor-lazor-limozeen:arm64
+    - .lava-sc7180-trogdor-kingoftown:arm64
     - .collabora-freedreno-rules
   variables:
     DEQP_SUITE: freedreno-a618
@@ -191,7 +191,7 @@ a618-skqp:
 a618-piglit:
   extends:
     - .lava-arm64-test-gl
-    - .lava-sc7180-trogdor-lazor-limozeen:arm64
+    - .lava-sc7180-trogdor-kingoftown:arm64
     - .test-piglit
     # Note that piglit has GL+VK integration testing.
     - .collabora-freedreno-turnip-rules