From b308d56e2079fd5abc1d7043846a5305195c3ad0 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 27 Jan 2021 15:56:42 -0800 Subject: [PATCH] ci: Update baremetal kernel to 5.11-rc5 plus patches. The dr_mode hack is now folded into the git tree. The uprev brings in a shrinker fix for msm and a fix for the GPU_SET OOB messages on cheza (possibly involved in piglit flakes). Reviewed-by: Rob Clark Reviewed-by: Christian Gmeiner Part-of: --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/container/baremetal_build.sh | 2 +- .gitlab-ci/container/lava_build.sh | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00a80bea741..2c97e3c5433 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -408,7 +408,7 @@ arm64_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &arm64_test "2021-01-21-noexpect" + MESA_IMAGE_TAG: &arm64_test "2021-01-27-kernel" .use-arm64_test: variables: @@ -422,7 +422,7 @@ armhf_test: extends: - .use-arm_test-base variables: - MESA_IMAGE_TAG: &armhf_test "2021-01-21-noexpect" + MESA_IMAGE_TAG: &armhf_test "2021-01-27-kernel" .use-armhf_test: variables: diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index dde92d5bf99..02b2fa4c2b0 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -52,7 +52,7 @@ mkdir /var/cache/apt/archives/$arch . .gitlab-ci/container/container_pre_build.sh ############### Create rootfs -KERNEL_URL=https://github.com/anholt/linux/archive/cheza-pagetables-2020-09-04.tar.gz +KERNEL_URL=https://github.com/anholt/linux/archive/mesa-ci-2021-01-27-5.11rc5.tar.gz DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index ae09a7d546a..d4bb92371b0 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -173,10 +173,6 @@ if [ -n "$INSTALL_KERNEL_MODULES" ]; then sed -i 's/=m/=n/g' ${DEFCONFIG} fi -# Force db410c to host mode instead of OTG (which is otherwise selected by -# default due to our micro cable for fastboot) -sed -i 's/dr_mode = "otg"/dr_mode = "host"/' arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi - ./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config make ${KERNEL_IMAGE_NAME} for image in ${KERNEL_IMAGE_NAME}; do