Module: Mesa Branch: main Commit: 14267d973936240d321cb7e6e47e8cee642d35cd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14267d973936240d321cb7e6e47e8cee642d35cd
Author: David Heidelberg <[email protected]> Date: Thu Dec 14 13:33:13 2023 +0100 ci/freedreno: more issues showed up on a618, let's use 6.4 Until resolved, switch to 6.4 kernel. Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26689> --- src/freedreno/ci/gitlab-ci-inc.yml | 6 ++++++ src/freedreno/ci/gitlab-ci.yml | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index fe2e1b79533..c556a40d4a2 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/src/freedreno/ci/gitlab-ci-inc.yml @@ -307,6 +307,8 @@ DEVICE_TYPE: sc7180-trogdor-kingoftown DTB: sc7180-trogdor-kingoftown RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-kingoftown + FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} .a618-test-limozeen-nots-r5: extends: @@ -315,6 +317,8 @@ DEVICE_TYPE: sc7180-trogdor-lazor-limozeen DTB: sc7180-trogdor-lazor-limozeen-nots-r5 RUNNER_TAG: mesa-ci-x86-64-lava-sc7180-trogdor-lazor-limozeen + FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} .lava-sm8350-hdk: variables: @@ -339,6 +343,8 @@ BM_KERNEL: cheza-kernel BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init" GPU_VERSION: freedreno-a630 + FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable + KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} timeout: 20m tags: - google-freedreno-cheza diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index f58a7ecaac2..8ec41cc843a 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -113,8 +113,6 @@ a618_piglit: variables: HWCI_START_WESTON: 1 PIGLIT_PROFILES: gpu - FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable - KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} a618-traces: extends: @@ -187,8 +185,6 @@ a630_gl: DEQP_SUITE: freedreno-a630 HWCI_START_XORG: 1 HWCI_START_WESTON: 1 - FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable - KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} a630_gles_asan: extends: @@ -209,8 +205,6 @@ a630_vk: - .google-turnip-rules variables: DEQP_SUITE: freedreno-a630-vk - FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable - KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} a630_vk_full: @@ -248,8 +242,6 @@ a630_piglit: variables: HWCI_START_WESTON: 1 DEQP_SUITE: freedreno-a630-piglit - FORCE_KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" # 6.6 is slow and unstable - KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${FORCE_KERNEL_TAG} a630-traces: extends:
