Unverified Commit 2b126e06 authored by Helen Koike's avatar Helen Koike Committed by Maxime Ripard
Browse files

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: default avatarHelen Koike <helen.koike@collabora.com>
Reviewed-by: default avatarDavid Heidelberg <david.heidelberg@collabora.com>
Link: https://lore.kernel.org/r/20231024004525.169002-3-helen.koike@collabora.com


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 1887de00

drivers/gpu/drm/ci/build.sh

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ elif [[ "$KERNEL_ARCH" = "arm" ]]; then 
    apt-get install -y libssl-dev:armhf

else

    GCC_ARCH="x86_64-linux-gnu"

    DEBIAN_ARCH="x86_64"

    DEBIAN_ARCH="amd64"

    DEVICE_TREES=""

fi

drivers/gpu/drm/ci/image-tags.yml

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ variables: 
   DEBIAN_BASE_TAG: "${CONTAINER_TAG}"



   DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"

   DEBIAN_BUILD_TAG: "${CONTAINER_TAG}"

   DEBIAN_BUILD_TAG: "2023-10-06-amd"



   KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}"

   KERNEL_ROOTFS_TAG: "2023-10-06-amd"



   DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"

   DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"

drivers/gpu/drm/ci/lava-submit.sh

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \ 
	--dump-yaml \

	--pipeline-info "$CI_JOB_NAME: $CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \

	--rootfs-url-prefix "https://${BASE_SYSTEM_HOST_PATH}" \

	--kernel-url-prefix "https://${PIPELINE_ARTIFACTS_BASE}/${ARCH}" \

	--build-url "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${ARCH}/kernel-files.tar.zst" \

	--kernel-url-prefix "https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}" \

	--build-url "${FDO_HTTP_CACHE_URI:-}https://${PIPELINE_ARTIFACTS_BASE}/${DEBIAN_ARCH}/kernel-files.tar.zst" \

	--job-rootfs-overlay-url "${FDO_HTTP_CACHE_URI:-}https://${JOB_ROOTFS_OVERLAY_PATH}" \

	--job-timeout-min ${JOB_TIMEOUT:-80} \

	--first-stage-init artifacts/ci-common/init-stage1.sh \

drivers/gpu/drm/ci/test.yml

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    - .lava-test:arm32

  variables:

    HWCI_TEST_SCRIPT: "/install/igt_runner.sh"

    ARCH: "armhf"

    DEBIAN_ARCH: "armhf"

  dependencies:

    - testing:arm32

  needs:
@@ -38,7 +38,7 @@ 
    - .lava-test:arm64

  variables:

    HWCI_TEST_SCRIPT: "/install/igt_runner.sh"

    ARCH: "arm64"

    DEBIAN_ARCH: "arm64"

  dependencies:

    - testing:arm64

  needs:
@@ -53,7 +53,7 @@ 
    - .lava-test:x86_64

  variables:

    HWCI_TEST_SCRIPT: "/install/igt_runner.sh"

    ARCH: "x86_64"

    DEBIAN_ARCH: "amd64"

  dependencies:

    - testing:x86_64

  needs: