From 75212b3b3419a08204740c055d121ef20d0928f3 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Fri, 24 Sep 2021 10:45:38 +0200
Subject: [PATCH] ci: Rebuild kernel with Amlogic KMS support

So we can run Xorg for Piglit tests.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13063>
---
 .gitlab-ci.yml                    | 2 +-
 .gitlab-ci/container/arm64.config | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index adbe55c1fbb..ea910256ac2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -465,7 +465,7 @@ fedora/x86_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-09-28-deqp-runner"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-10-01-amlogic-kms"
     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 78d447a6b94..488106ca95b 100644
--- a/.gitlab-ci/container/arm64.config
+++ b/.gitlab-ci/container/arm64.config
@@ -136,6 +136,7 @@ CONFIG_USB_NET_SMSC95XX=y
 # For amlogic
 CONFIG_MESON_GXL_PHY=y
 CONFIG_MDIO_BUS_MUX_MESON_G12A=y
+CONFIG_DRM_MESON=y
 
 # For Mediatek
 CONFIG_DRM_MEDIATEK=y