From 04f30870b65d71b76c90b5ea0ab0656ee62f113a Mon Sep 17 00:00:00 2001 From: Vignesh Raman Date: Mon, 30 Sep 2024 12:58:16 +0530 Subject: [PATCH] ci: add Gen10 Arm Mali firmware to rootfs Add firmware for Gen10 Arm Mali GPUs directly to rootfs since it is not available from debian package. For the panthor kernel driver to be able to execute jobs on the GPU it needs this firmware. Update the kernel, which contains a fix to build the panthor driver as module and use HWCI_KERNEL_MODULES to load panthor module. Signed-off-by: Vignesh Raman Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 3 ++- .gitlab-ci/firmware/arm/mali/arch10.8/mali-fw.json | 8 ++++++++ .gitlab-ci/image-tags.yml | 2 +- src/panfrost/ci/gitlab-ci.yml | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .gitlab-ci/firmware/arm/mali/arch10.8/mali-fw.json diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 95b1df3a008..fd1936ddded 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -407,7 +407,7 @@ fedora/x86_64_build: # Get firmware directly rather than using package versions. # Change KERNEL_ROOTFS_TAG to add firmware changes. -# FIRMWARE_FILES is a list of json files arranged by vendor in src/**/ci/ +# FIRMWARE_FILES is a list of json files arranged by vendor in .gitlab-ci/firmware/* .firmware_x86_64: variables: FIRMWARE_FILES: | @@ -416,6 +416,7 @@ fedora/x86_64_build: .firmware_arm64: variables: FIRMWARE_FILES: | + .gitlab-ci/firmware/arm/mali/arch10.8/mali-fw.json .firmware_arm32: variables: diff --git a/.gitlab-ci/firmware/arm/mali/arch10.8/mali-fw.json b/.gitlab-ci/firmware/arm/mali/arch10.8/mali-fw.json new file mode 100644 index 00000000000..cad011c8b5b --- /dev/null +++ b/.gitlab-ci/firmware/arm/mali/arch10.8/mali-fw.json @@ -0,0 +1,8 @@ +{ + "src": "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/arm/mali/arch10.8/", + "git_hash": "ad8d5f76c429e5485764a9ecb7a2ce3fbc1386ae", + "files": [ + "mali_csffw.bin" + ], + "dst": "/lib/firmware/arm/mali/arch10.8/" +} diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index cbb526bf368..6b4d168284b 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -30,7 +30,7 @@ variables: DEBIAN_TEST_ANDROID_TAG: "20240926-git-hash" DEBIAN_TEST_GL_TAG: "20240927-vvl" DEBIAN_TEST_VK_TAG: "20240926-git-hash" - KERNEL_ROOTFS_TAG: "20240927-vvl" + KERNEL_ROOTFS_TAG: "20240930-mali-fw" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20240912-hello-to-you" diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index 7ab5dceb8eb..21f6da86059 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -225,10 +225,11 @@ GPU_VERSION: panfrost-g610 DRIVER_NAME: panfrost FDO_CI_CONCURRENT: 6 + HWCI_KERNEL_MODULES: panthor BOOT_METHOD: u-boot KERNEL_IMAGE_NAME: Image KERNEL_IMAGE_TYPE: "image" - FORCE_KERNEL_TAG: "v6.11-rc7-mesa-3fb8" + FORCE_KERNEL_TAG: "v6.11-rc7-mesa-f9e9" KERNEL_IMAGE_BASE: https://${S3_HOST}/${S3_KERNEL_BUCKET}/${KERNEL_REPO}/${FORCE_KERNEL_TAG} RUNNER_TAG: mesa-ci-x86-64-lava-rk3588-rock-5b