From cce1f1ea7078a44e5c03bddac1ef235ba5ca11b4 Mon Sep 17 00:00:00 2001 From: Sergi Blanch Torne Date: Tue, 3 Jan 2023 16:24:49 +0100 Subject: [PATCH] ci: Uprev kernel to 6.1.7 Once prepared the archive in gfx-ci/linux for kernel 6.1 pointing to 6.1.7 and with the patches for mesa, update the link. Also, enable some kconfigs needed for the Adreno and USB. One job in AMD required an expectation file to be updated with one test. Also, an mt8192 device tree has been included in the arm64 trees for lava build. Co-developed-by: Daniel Stone Co-developed-by: Guilherme Gallo Co-developed-by: Helen Koike Co-developed-by: David Heidelberg Signed-off-by: Sergi Blanch Torne Part-of: --- .gitlab-ci/container/arm64.config | 3 +++ .gitlab-ci/container/gitlab-ci.yml | 2 +- .gitlab-ci/container/lava_build.sh | 1 + .gitlab-ci/image-tags.yml | 4 ++-- src/amd/ci/radv-stoney-aco-fails.txt | 4 ++++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/arm64.config b/.gitlab-ci/container/arm64.config index 313ba7a3bb4..c4ba646a4dc 100644 --- a/.gitlab-ci/container/arm64.config +++ b/.gitlab-ci/container/arm64.config @@ -46,6 +46,7 @@ CONFIG_OF=y CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_RPMHPD=y CONFIG_QCOM_RPMPD=y +CONFIG_QCOM_OCMEM=y CONFIG_SDM_GPUCC_845=y CONFIG_SDM_VIDEOCC_845=y CONFIG_SDM_DISPCC_845=y @@ -82,6 +83,8 @@ CONFIG_PHY_QCOM_USB_HS=y CONFIG_USB_RTL8152=y # db820c ethernet CONFIG_ATL1C=y +# Chromebooks ethernet +CONFIG_USB_ONBOARD_HUB=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 45de38754e1..fd89ab4348c 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/v6.0-for-mesa-ci-93bd820c433b/linux-v6.0-for-mesa-ci-93bd820c433b.tar.bz2" + 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" 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 452dc555cd5..7b1fdaebc3d 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -43,6 +43,7 @@ if [[ "$DEBIAN_ARCH" = "arm64" ]]; then 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" KERNEL_IMAGE_NAME="Image" elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 2e99379954f..388b3dab1d5 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-01-20-all-in-1" + DEBIAN_BASE_TAG: "2023-01-20-kernel-6.1-439f86d0" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2023-01-20-mold-1_10" @@ -19,7 +19,7 @@ variables: ALPINE_X86_BUILD_TAG: "2023-01-20-all-in-1" FEDORA_X86_BUILD_TAG: "2023-01-20-all-in-1" - KERNEL_ROOTFS_TAG: "2023-01-20-all-in-1" + KERNEL_ROOTFS_TAG: "2023-01-20-kernel-6.1-439f86d0" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" diff --git a/src/amd/ci/radv-stoney-aco-fails.txt b/src/amd/ci/radv-stoney-aco-fails.txt index 9189498769e..cbb8e8c393b 100644 --- a/src/amd/ci/radv-stoney-aco-fails.txt +++ b/src/amd/ci/radv-stoney-aco-fails.txt @@ -413,3 +413,7 @@ dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_8.d16_unorm_s8_ dEQP-VK.renderpass2.depth_stencil_resolve.image_2d_49_13.samples_8.d16_unorm_s8_uint.depth_zero_stencil_none_testing_stencil_samplemask,Fail dEQP-VK.texture.mipmap.2d.image_view_min_lod.base_level.linear_linear,Fail dEQP-VK.texture.mipmap.3d.image_view_min_lod.base_level.linear_linear,Fail + +# uprev kernel 6.1 +dEQP-VK.ycbcr.storage_image_write.r10x6_unorm_pack16.1024_128_1.joint,Crash +dEQP-VK.ycbcr.storage_image_write.r10x6g10x6_unorm_2pack16.66_32_1.joint,Crash