From 6f9b9b01c1df031bbbf7a3c5b263b1a9754ceb1a Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 15 Sep 2022 14:19:33 -0700 Subject: [PATCH] ci: Update kernel to drm-next-2022-08-12-1 This brings in new msm UAPI that we'd like to be testing in turnip. Unfortunately, a530 became flaky across dEQP and piglit. It seems that a GPU hang from a test that we expect to hang will cause a followup hangcheck affecting innocent tests. For example: 22-09-19 18:53:22 R SERIAL> [ 348.839188] msm_mdp 901000.mdp: [drm:a5xx_irq] *ERROR* gpu fault ring 0 fence ff55 status C10001C3 rb 084a/084a ib1 000000000105A000/0000 ib2 000000000105B000/0000 22-09-19 18:53:22 R SERIAL> [ 348.839272] msm_mdp 901000.mdp: [drm:recover_worker] *ERROR* A530: hangcheck recover! 22-09-19 18:53:22 R SERIAL> [ 348.852698] msm_mdp 901000.mdp: [drm:recover_worker] *ERROR* A530: offending task: shader_run:sq0 (/piglit/bin/shader_runner tests/spec/glsl-1.30/execution/clipping/vs-clip-distance-enables.shader_test -auto -fbo) 22-09-19 18:53:22 R SERIAL> [ 348.868680] msm_mdp 901000.mdp: [drm:a5xx_irq] *ERROR* gpu fault ring 0 fence ff55 status C10001C3 rb 084a/084a ib1 000000000105A000/0000 ib2 000000000105B000/0000 22-09-19 18:53:22 R SERIAL> [ 348.879586] msm_mdp 901000.mdp: [drm:recover_worker] *ERROR* A530: hangcheck recover! [...] 22-09-19 18:53:23 R SERIAL> ERROR - Test spec@glsl-1.10@execution@algebraic@glsl-algebraic-logicand-false: Fail: See "//results/piglit.spec@glsl-1.10@execution@algebraic@glsl-algebraic-logicand-false.log" As a result, I've moved a530 to test-manual-mr until it can be stabilized again. This updated kernel also brings in a couple of regression fixes for nouveau gk20a and gm20b. Reviewed-by: Tomeu Vizoso Reviewed-by: Christian Gmeiner Acked-by: Rob Clark Acked-by: David Heidelberg Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- src/freedreno/ci/gitlab-ci.yml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 7fb91203628..9e531d871dd 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/v5.17-for-mesa-ci-b78f7870d97b/linux-v5.17-for-mesa-ci-b78f7870d97b.tar.bz2" + KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.19-for-mesa-ci-d4efddaec194/linux-v5.17-for-mesa-ci-b78f7870d97b.tar.bz2" MESA_IMAGE_TAG: &debian-x86_test-base ${DEBIAN_BASE_TAG} .use-debian/x86_test-base: diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index ed52bc03f2c..9fe5c678e24 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: "2022-09-12-virglrenderer" + DEBIAN_BASE_TAG: "2022-09-19-kernel" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-09-14-add-jq" @@ -15,7 +15,7 @@ variables: DEBIAN_X86_TEST_VK_TAG: "2022-09-14-add-jq" FEDORA_X86_BUILD_TAG: "2022-08-25-shellcheck" - KERNEL_ROOTFS_TAG: "2022-09-14-add-jq" + KERNEL_ROOTFS_TAG: "2022-09-19-kernel" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-08-17-bump" diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index e20ca1688da..aec7ac79732 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -96,6 +96,7 @@ a530_gl: extends: - .baremetal-deqp-test - .a530-test + - .test-manual-mr # Unstable as of kernel 5.19 variables: DEQP_SUITE: freedreno-a530 parallel: 6