From 6f74c95a846b11ffe5e515af8a736c2276641165 Mon Sep 17 00:00:00 2001
From: Guilherme Gallo <guilherme.gallo@collabora.com>
Date: Wed, 12 Jan 2022 14:49:10 -0300
Subject: [PATCH] ci: Uprev Kernel to v5.16

Changes in freedreno devices:

- Adding CONFIG_DRM_PANEL_EDP, split from CONFIG_DRM_PANEL_SIMPLE

Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14548>
---
 .gitlab-ci.yml                    | 2 +-
 .gitlab-ci/container/arm64.config | 2 ++
 .gitlab-ci/image-tags.yml         | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 980e4514616..73c5159962a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -432,7 +432,7 @@ debian/x86_test-gl:
   extends: .use-debian/x86_test-base
   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"
+    KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.16-for-mesa-ci-bd8b344492bfd/linux-v5.16-for-mesa-ci-bd8b344492bfd.tar.bz2"
     MESA_IMAGE_TAG: &debian-x86_test-gl ${DEBIAN_X86_TEST_GL_TAG}
 
 # Debian 11 based x86 test image for VK
diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config
index 623084bb872..5da8a906e68 100644
--- a/.gitlab-ci/container/arm64.config
+++ b/.gitlab-ci/container/arm64.config
@@ -14,6 +14,7 @@ CONFIG_DRM_ROCKCHIP=y
 CONFIG_DRM_PANFROST=y
 CONFIG_DRM_LIMA=y
 CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_PANEL_EDP=y
 CONFIG_DRM_MSM=y
 CONFIG_DRM_I2C_ADV7511=y
 CONFIG_PWM_CROS_EC=y
@@ -35,6 +36,7 @@ CONFIG_TYPEC_TCPM=y
 # For CONFIG_QCOM_LMH
 CONFIG_OF=y
 
+CONFIG_QCOM_COMMAND_DB=y
 CONFIG_QCOM_RPMHPD=y
 CONFIG_QCOM_RPMPD=y
 CONFIG_SDM_GPUCC_845=y
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 475729c16c5..319661863cf 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -8,11 +8,11 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-01-03-crosvm"
+   DEBIAN_X86_TEST_GL_TAG: "2022-01-18-kernel"
    DEBIAN_X86_TEST_VK_TAG: "2022-01-02-deqp-runner"
 
    FEDORA_X86_BUILD_TAG: "2021-12-31-refactor"
-   KERNEL_ROOTFS_TAG: "2022-01-02-deqp-runner"
+   KERNEL_ROOTFS_TAG: "2022-01-18-kernel"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2021-12-31-refactor"