Mesa (staging/21.3): ci: Add support for lazor Chromebooks

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 5f582b759af0eb00ac70f68da72fac1038b78a12
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f582b759af0eb00ac70f68da72fac1038b78a12

Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date:   Tue Oct 19 11:36:52 2021 +0200

ci: Add support for lazor Chromebooks

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13441>
(cherry picked from commit dedc1493071550a35b7dae7091fbaf6ad93304c9)

---

 .gitlab-ci.yml                     | 4 ++--
 .gitlab-ci/container/arm64.config  | 2 ++
 .gitlab-ci/container/lava_build.sh | 1 +
 .pick_status.json                  | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1c3d2fab90..089fb02ca1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -410,7 +410,7 @@ debian/x86_test-gl:
   variables:
     FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
-    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-02-kernel-v5.15"
+    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-02-lazor"
 
 # Debian 11 based x86 test image for VK
 debian/x86_test-vk:
@@ -465,7 +465,7 @@ fedora/x86_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-02-kernel-v5.15"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-02-lazor"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config
index bc88f42352e..623084bb872 100644
--- a/.gitlab-ci/container/arm64.config
+++ b/.gitlab-ci/container/arm64.config
@@ -62,6 +62,8 @@ CONFIG_INTERCONNECT_QCOM_MSM8916=y
 CONFIG_INTERCONNECT_QCOM_OSM_L3=y
 CONFIG_INTERCONNECT_QCOM_SC7180=y
 CONFIG_CRYPTO_DEV_QCOM_RNG=y
+CONFIG_SC_DISPCC_7180=y
+CONFIG_SC_GPUCC_7180=y
 
 # db410c ethernet
 CONFIG_USB_RTL8152=y
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 6cb1954dfb8..bd0f04021bf 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -34,6 +34,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb"
     DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb"
+    DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dtb"
     KERNEL_IMAGE_NAME="Image"
 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     GCC_ARCH="arm-linux-gnueabihf"
diff --git a/.pick_status.json b/.pick_status.json
index 4cd526b4fad..4894cd17289 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1012,7 +1012,7 @@
         "description": "ci: Add support for lazor Chromebooks",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },