Module: Mesa Branch: main Commit: a925c59f83df04bbe26a451117283fc584f94ba3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a925c59f83df04bbe26a451117283fc584f94ba3
Author: David Heidelberg <[email protected]> Date: Sun Apr 2 15:32:26 2023 +0200 ci: bump kernel to the 6.3, support HDK 888 based on sm8350 - uprev to kernel 6.3-rc6 - add sm8350 support (needed for HDK 888) - add missing patch for Asurada functionality - enable CONFIG_ARM_SMMU_QCOM, since we dropped specific patch worarounding need for it Acked-by: Guilherme Gallo <[email protected]> Reviewed-by: Emma Anholt <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22255> --- .gitlab-ci/container/arm64.config | 11 +++++++++++ .gitlab-ci/container/gitlab-ci.yml | 2 +- .gitlab-ci/container/lava_build.sh | 13 +++++++------ .gitlab-ci/image-tags.yml | 4 ++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config index c4ba646a4dc..a3efb37f84b 100644 --- a/.gitlab-ci/container/arm64.config +++ b/.gitlab-ci/container/arm64.config @@ -43,6 +43,7 @@ CONFIG_TYPEC_TCPM=y # For CONFIG_QCOM_LMH CONFIG_OF=y +CONFIG_ARM_SMMU_QCOM=y CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMPD=y @@ -72,12 +73,20 @@ CONFIG_INTERCONNECT_QCOM_SDM845=y CONFIG_INTERCONNECT_QCOM_MSM8916=y CONFIG_INTERCONNECT_QCOM_OSM_L3=y CONFIG_INTERCONNECT_QCOM_SC7180=y +CONFIG_INTERCONNECT_QCOM_SM8350=y CONFIG_CRYPTO_DEV_QCOM_RNG=y CONFIG_SC_DISPCC_7180=y CONFIG_SC_GPUCC_7180=y +CONFIG_SM_GPUCC_8350=y CONFIG_QCOM_SPMI_ADC5=y CONFIG_DRM_PARADE_PS8640=y +CONFIG_DRM_LONTIUM_LT9611UXC=y CONFIG_PHY_QCOM_USB_HS=y +CONFIG_QCOM_GPI_DMA=y +CONFIG_USB_ONBOARD_HUB=y +CONFIG_NVMEM_QCOM_QFPROM=y +CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=y + # db410c ethernet CONFIG_USB_RTL8152=y @@ -85,6 +94,8 @@ CONFIG_USB_RTL8152=y CONFIG_ATL1C=y # Chromebooks ethernet CONFIG_USB_ONBOARD_HUB=y +# 888 HDK ethernet +CONFIG_USB_LAN78XX=y CONFIG_ARCH_ALPINE=n CONFIG_ARCH_BCM2835=n diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 6d95c3c0753..0b316fd0ef4 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -191,7 +191,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/v6.1-for-mesa-ci-439f86d0051b/linux-v6.1-for-mesa-ci-439f86d0051b.tar.bz2"; + KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v6.3-for-mesa-ci-43c973a8ff91/linux-v6.3-for-mesa-ci-43c973a8ff91.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 7b1fdaebc3d..249c6e91cde 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -32,18 +32,19 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then SKQP_ARCH="arm64" DEFCONFIG="arch/arm64/configs/defconfig" DEVICE_TREES="arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dtb" + DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-g12b-a311d-khadas-vim3.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dtb" - DEVICE_TREES+=" arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dtb" DEVICE_TREES+=" arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dtb" - 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/allwinner/sun50i-h6-pine-h64.dtb" + DEVICE_TREES+=" arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dtb" + DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dtb" 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/apq8016-sbc.dtb" + DEVICE_TREES+=" arch/arm64/boot/dts/qcom/apq8096-db820c.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" - DEVICE_TREES+=" arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dtb" + DEVICE_TREES+=" arch/arm64/boot/dts/qcom/sm8350-hdk.dtb" KERNEL_IMAGE_NAME="Image" elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 830fc4674ad..fb8d6bf07d5 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: "2023-03-27-virglrenderer-crosvm" + DEBIAN_BASE_TAG: "2023-04-16-kernel-6.3" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2023-04-13-agility-610" @@ -21,7 +21,7 @@ variables: ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng" - KERNEL_ROOTFS_TAG: "2023-04-14-dxvk-2.1-1" + KERNEL_ROOTFS_TAG: "2023-04-16-kernel-6.3" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
