From b4317fccdd7f873dc7e9a4a1ca06b40bbaf4c2dd Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 2 Sep 2020 10:49:44 -0700 Subject: [PATCH] ci/bare-metal: Update the kernel to msm-next-pgtables I'd like to see this new non-UAPI feature bake in CI. More importantly, it may prevent some classes of flakes on cheza by isolating the processes on the GPU so that a fault in one doesn't stomp over memory in another. I've also pulled in a fix that etnaviv needed for their upcoming CI. We add a few more kernel options while uprevving: - More interconnect drivers for getting good GPU perf - PRNG so that we don't get late-in-boot complaints about randomness. - db820c's power domains and ethernet so hopefully we can switch to this upstream kernel This seems to slightly change the flakes happening in bypass mode, so add them to the list. Reviewed-by: Kristian H. Kristensen Reviewed-by: Rob Clark Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/arm64.config | 10 +++++++++- .gitlab-ci/container/baremetal_build.sh | 2 +- .gitlab-ci/deqp-freedreno-a630-flakes.txt | 4 ++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd92df91515..649f0021a9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -358,7 +358,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-31-deqp-version" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-09-04-pagetables" .use-arm64_test: variables: diff --git a/.gitlab-ci/arm64.config b/.gitlab-ci/arm64.config index 23f766541e5..c8d07f2dff7 100644 --- a/.gitlab-ci/arm64.config +++ b/.gitlab-ci/arm64.config @@ -29,8 +29,9 @@ CONFIG_TYPEC_FUSB302=y CONFIG_TYPEC=y CONFIG_TYPEC_TCPM=y -# Cheza platform bits +# MSM platform bits CONFIG_QCOM_RPMHPD=y +CONFIG_QCOM_RPMPD=y CONFIG_SDM_GPUCC_845=y CONFIG_SDM_VIDEOCC_845=y CONFIG_SDM_DISPCC_845=y @@ -47,11 +48,18 @@ CONFIG_QCOM_SPMI_TEMP_ALARM=y CONFIG_POWER_RESET_QCOM_PON=y CONFIG_RTC_DRV_PM8XXX=y CONFIG_INTERCONNECT=y +CONFIG_INTERCONNECT_QCOM=y CONFIG_INTERCONNECT_QCOM_SDM845=y +CONFIG_INTERCONNECT_QCOM_MSM8916=y +CONFIG_INTERCONNECT_QCOM_OSM_L3=y +CONFIG_INTERCONNECT_QCOM_SC7180=y CONFIG_QCOM_WDT=y +CONFIG_CRYPTO_DEV_QCOM_RNG=y # db410c ethernet CONFIG_USB_RTL8152=y +# db820c ethernet +CONFIG_ATL1C=y CONFIG_ARCH_ALPINE=n CONFIG_ARCH_BCM2835=n diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index a2d3a1ea88e..c307e7113d8 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -49,7 +49,7 @@ mkdir /var/cache/apt/archives/$arch . .gitlab-ci/container/container_pre_build.sh ############### Create rootfs -KERNEL_URL=https://gitlab.freedesktop.org/drm/msm/-/archive/drm-msm-fixes-2020-06-25/msm-drm-msm-fixes-2020-06-25.tar.gz +KERNEL_URL=https://github.com/anholt/linux/archive/cheza-pagetables-2020-09-04.tar.gz DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh diff --git a/.gitlab-ci/deqp-freedreno-a630-flakes.txt b/.gitlab-ci/deqp-freedreno-a630-flakes.txt index b0c0d018e4b..b3a4d6da671 100644 --- a/.gitlab-ci/deqp-freedreno-a630-flakes.txt +++ b/.gitlab-ci/deqp-freedreno-a630-flakes.txt @@ -22,6 +22,10 @@ dEQP-GLES31.functional.ssbo.atomic.compswap.mediump_uint # Non-sysmem flakes dEQP-VK.pipeline.spec_constant.compute.composite.matrix.mat3x2 +# Sysmem flakes +dEQP-GLES31.functional.texture.multisample.samples_3.use_texture_depth_2d +dEQP-GLES31.functional.stencil_texturing.render.depth24_stencil8_draw + # Fails NIR_VALIDATE so probably flaky dEQP-VK.memory_model.write_after_read.core11.u32.coherent.fence_fence.atomicwrite.workgroup.payload_nonlocal.workgroup.guard_local.buffer.comp