Mesa (main): ci: Update kernel to v5.13-rc2

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e77163295a3659a1964a5bdbf79c93199f0a1b35
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e77163295a3659a1964a5bdbf79c93199f0a1b35

Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date:   Tue May 11 10:06:00 2021 +0200

ci: Update kernel to v5.13-rc2

This version adds support for some Chromebooks with the MT8183 SoC that
we want to use to test Panfrost.

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/10785>

---

 .gitlab-ci.yml                     |  4 ++--
 .gitlab-ci/container/arm64.config  | 11 ++++++++++-
 .gitlab-ci/container/lava_build.sh |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac57dadd051..5427bf34494 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -446,8 +446,8 @@ arm_build:
   stage: container-2
   variables:
     GIT_STRATEGY: fetch
-    KERNEL_URL: "https://gitlab.freedesktop.org/drm/msm/-/archive/v5.11-for-mesa-ci-40abe2528d16/linux-v5.11-for-mesa-ci-40abe2528d16.tar.bz2"
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-14-vkglcts-1.2.6.1"
+    KERNEL_URL: "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc2-for-mesa-ci-4a93e50f5c34/linux-v5.13-rc2-for-mesa-ci-4a93e50f5c34.tar.bz2"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-18-v5.13-rc2-4"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_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 a7feb141e3d..78d447a6b94 100644
--- a/.gitlab-ci/container/arm64.config
+++ b/.gitlab-ci/container/arm64.config
@@ -74,7 +74,6 @@ CONFIG_ARCH_K3=n
 CONFIG_ARCH_LAYERSCAPE=n
 CONFIG_ARCH_LG1K=n
 CONFIG_ARCH_HISI=n
-CONFIG_ARCH_MEDIATEK=n
 CONFIG_ARCH_MVEBU=n
 CONFIG_ARCH_SEATTLE=n
 CONFIG_ARCH_SYNQUACER=n
@@ -137,3 +136,13 @@ CONFIG_USB_NET_SMSC95XX=y
 # For amlogic
 CONFIG_MESON_GXL_PHY=y
 CONFIG_MDIO_BUS_MUX_MESON_G12A=y
+
+# For Mediatek
+CONFIG_DRM_MEDIATEK=y
+CONFIG_PWM_MEDIATEK=y
+CONFIG_DRM_MEDIATEK_HDMI=y
+CONFIG_GNSS_MTK_SERIAL=y
+CONFIG_HW_RANDOM_MTK=y
+CONFIG_MTK_DEVAPC=y
+CONFIG_PWM_MTK_DISP=y
+CONFIG_MTK_CMDQ=y
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index ae7228169f7..92da5831cbf 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -33,6 +33,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8016-sbc.dtb"
     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"
     KERNEL_IMAGE_NAME="Image"
 elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     GCC_ARCH="arm-linux-gnueabihf"