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 <robdclark@chromium.org>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8768>
This commit is contained in:
Eric Anholt 2021-01-27 15:56:42 -08:00 committed by Marge Bot
parent 97fbe2d45f
commit b308d56e20
3 changed files with 3 additions and 7 deletions

View File

@ -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:

View File

@ -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

View File

@ -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