Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/ci: fix DEBIAN_ARCH and get amdgpu probing

amdgpu driver wasn't loading because amdgpu firmware wasn't being
installed in the rootfs due to the wrong DEBIAN_ARCH variable.

rename ARCH to DEBIAN_ARCH also, so we don't have the confusing
DEBIAN_ARCH, KERNEL_ARCH and ARCH.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Link: https://lore.kernel.org/r/20231024004525.169002-3-helen.koike@collabora.com
Signed-off-by: Maxime Ripard <mripard@kernel.org>

authored by

Helen Koike and committed by
Maxime Ripard
2b126e06 1887de00

+8 -8
+1 -1
drivers/gpu/drm/ci/build.sh
··· 35 35 apt-get install -y libssl-dev:armhf 36 36 else 37 37 GCC_ARCH="x86_64-linux-gnu" 38 - DEBIAN_ARCH="x86_64" 38 + DEBIAN_ARCH="amd64" 39 39 DEVICE_TREES="" 40 40 fi 41 41
+2 -2
drivers/gpu/drm/ci/image-tags.yml
··· 4 4 DEBIAN_BASE_TAG: "${CONTAINER_TAG}" 5 5 6 6 DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" 7 - DEBIAN_BUILD_TAG: "${CONTAINER_TAG}" 7 + DEBIAN_BUILD_TAG: "2023-10-06-amd" 8 8 9 - KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}" 9 + KERNEL_ROOTFS_TAG: "2023-10-06-amd" 10 10 11 11 DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" 12 12 DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"
+2 -2
drivers/gpu/drm/ci/lava-submit.sh
··· 37 37 --dump-yaml \ 38 38 --pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \ 39 39 --rootfs-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \ 40 - --kernel-url-prefix "https://${PIPELINE_ARTIFACTS_BASE}/${ARCH}" \ 41 - --build-url "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${ARCH}/kernel-files.tar.zst" \ 40 + --kernel-url-prefix "https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}" \ 41 + --build-url "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/kernel-files.tar.zst" \ 42 42 --job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \ 43 43 --job-timeout-min ${JOB_TIMEOUT:-80} \ 44 44 --first-stage-init artifacts/ci-common/init-stage1.sh \
+3 -3
drivers/gpu/drm/ci/test.yml
··· 23 23 - .lava-test:arm32 24 24 variables: 25 25 HWCI_TEST_SCRIPT: "/install/igt_runner.sh" 26 - ARCH: "armhf" 26 + DEBIAN_ARCH: "armhf" 27 27 dependencies: 28 28 - testing:arm32 29 29 needs: ··· 38 38 - .lava-test:arm64 39 39 variables: 40 40 HWCI_TEST_SCRIPT: "/install/igt_runner.sh" 41 - ARCH: "arm64" 41 + DEBIAN_ARCH: "arm64" 42 42 dependencies: 43 43 - testing:arm64 44 44 needs: ··· 53 53 - .lava-test:x86_64 54 54 variables: 55 55 HWCI_TEST_SCRIPT: "/install/igt_runner.sh" 56 - ARCH: "x86_64" 56 + DEBIAN_ARCH: "amd64" 57 57 dependencies: 58 58 - testing:x86_64 59 59 needs: