From 7c5c1816947fa924a6975b8b6e1773fe3216b8f0 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 12 Oct 2022 09:54:35 +0200 Subject: [PATCH] ci: Uprev kernel to 6.0 And also enable some kconfigs needed by existing Qualcomm-based Chromebooks and also a new model: kingoftown. Part-of: --- .gitlab-ci/container/arm64.config | 4 ++++ .gitlab-ci/container/gitlab-ci.yml | 2 +- .gitlab-ci/container/lava_build.sh | 1 + .gitlab-ci/image-tags.yml | 4 ++-- src/amd/ci/radeonsi-stoney-fails.txt | 2 -- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config index 13fb98e5b01..336d8065049 100644 --- a/.gitlab-ci/container/arm64.config +++ b/.gitlab-ci/container/arm64.config @@ -60,6 +60,7 @@ CONFIG_POWER_RESET_QCOM_PON=y CONFIG_RTC_DRV_PM8XXX=y CONFIG_INTERCONNECT=y CONFIG_INTERCONNECT_QCOM=y +CONFIG_INTERCONNECT_QCOM_MSM8996=y CONFIG_INTERCONNECT_QCOM_SDM845=y CONFIG_INTERCONNECT_QCOM_MSM8916=y CONFIG_INTERCONNECT_QCOM_OSM_L3=y @@ -67,6 +68,9 @@ CONFIG_INTERCONNECT_QCOM_SC7180=y CONFIG_CRYPTO_DEV_QCOM_RNG=y CONFIG_SC_DISPCC_7180=y CONFIG_SC_GPUCC_7180=y +CONFIG_QCOM_SPMI_ADC5=y +CONFIG_DRM_PARADE_PS8640=y +CONFIG_PHY_QCOM_USB_HS=y # db410c ethernet CONFIG_USB_RTL8152=y diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 9e531d871dd..bb691f6c148 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -189,7 +189,7 @@ debian/android_build: debian/x86_test-base: extends: debian/x86_build-base variables: - KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.19-for-mesa-ci-d4efddaec194/linux-v5.17-for-mesa-ci-b78f7870d97b.tar.bz2" + KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v6.0-for-mesa-ci-93bd820c433b/linux-v6.0-for-mesa-ci-93bd820c433b.tar.bz2" MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG} .use-debian/x86_test-base: diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 8cfcc39cde4..27041dfa6df 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -40,6 +40,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dtb" + DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sc7180-trogdor-kingoftown-r1.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dtb" KERNEL_IMAGE_NAME="Image" diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 39cc01dbde6..0ddc131a7d2 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2022-11-03-ci-fairy-s3" + DEBIAN_BASE_TAG: "2022-11-04-kernel-6.0" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-11-03-ci-fairy-s3" @@ -15,7 +15,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-11-04-cts-vkd3d-proton" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" - KERNEL_ROOTFS_TAG: "2022-11-03-piglit" + KERNEL_ROOTFS_TAG: "2022-11-04-kernel-6.0" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" diff --git a/src/amd/ci/radeonsi-stoney-fails.txt b/src/amd/ci/radeonsi-stoney-fails.txt index db05e65e58f..053695a1fae 100644 --- a/src/amd/ci/radeonsi-stoney-fails.txt +++ b/src/amd/ci/radeonsi-stoney-fails.txt @@ -4,8 +4,6 @@ glx@glx-visuals-stencil -pixmap,Crash glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail -glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail -glx@glx_arb_sync_control@waitformsc,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail glx@glx_ext_import_context@get current display,Fail