From nobody Fri Sep 20 11:35:36 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24B2FE95A97 for ; Mon, 9 Oct 2023 00:51:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344662AbjJIAvU (ORCPT ); Sun, 8 Oct 2023 20:51:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232250AbjJIAvS (ORCPT ); Sun, 8 Oct 2023 20:51:18 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E90D9AC for ; Sun, 8 Oct 2023 17:51:16 -0700 (PDT) Received: from localhost.localdomain (unknown [179.221.49.143]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: koike) by madras.collabora.co.uk (Postfix) with ESMTPSA id D8B9766070EF; Mon, 9 Oct 2023 01:51:11 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1696812675; bh=Ac/i4mcuSSzrwRISfJZcXroechJVsDrCq9+aTDopmIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oisaNmd3g217WeAPmhzimnwcfUbs+WNmrzaAZSGRawnf+FKoM+tXWRnvhTUXx3Oc6 jZaNYWDhhO9f0/1nTkugihb4DGUFG//7msQq3/5Sf8NAngg5BH1gvvUfZMtCYdwgdZ HgsKsyQmj4NW+eDOqNrCjgDLcX4NBadDuXIBnfnfmNV4HLLkWk3NR/5vYOYDC5Cu1J bUbkziLka2mzfVGmF0qz+7SV9W0QCLsQH9SI/DZervmSrWm47/MIQqjirXz5IXg+Oo YYA6ZTme8PSzjuPbMV7yniM/pliQm5Z7txpMvXi7uNVixskUXLx/8RHj1s7QZkGHns FKuRwHez7EVRg== From: Helen Koike To: Helen Koike , David Airlie , Daniel Vetter Cc: robdclark@chromium.org, dmitry.baryshkov@linaro.org, vignesh.raman@collabora.com, sergi.blanch.torne@collabora.com, guilherme.gallo@collabora.com, david.heidelberg@collabora.com, quic_abhinavk@quicinc.com, quic_jesszhan@quicinc.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] drm/ci: fix DEBIAN_ARCH and get amdgpu probing Date: Sun, 8 Oct 2023 21:49:47 -0300 Message-Id: <20231009004953.203576-3-helen.koike@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231009004953.203576-1-helen.koike@collabora.com> References: <20231009004953.203576-1-helen.koike@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- drivers/gpu/drm/ci/build.sh | 2 +- drivers/gpu/drm/ci/image-tags.yml | 4 ++-- drivers/gpu/drm/ci/lava-submit.sh | 4 ++-- drivers/gpu/drm/ci/test.yml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 7b014287a041..8eec15143bfe 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -35,7 +35,7 @@ elif [[ "$KERNEL_ARCH" =3D "arm" ]]; then apt-get install -y libssl-dev:armhf else GCC_ARCH=3D"x86_64-linux-gnu" - DEBIAN_ARCH=3D"x86_64" + DEBIAN_ARCH=3D"amd64" DEVICE_TREES=3D"" fi =20 diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-t= ags.yml index f051b6c547c5..6650b5a4d724 100644 --- a/drivers/gpu/drm/ci/image-tags.yml +++ b/drivers/gpu/drm/ci/image-tags.yml @@ -4,9 +4,9 @@ variables: DEBIAN_BASE_TAG: "${CONTAINER_TAG}" =20 DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "${CONTAINER_TAG}" + DEBIAN_BUILD_TAG: "2023-10-06-amd" =20 - KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}" + KERNEL_ROOTFS_TAG: "2023-10-06-amd" =20 DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl" diff --git a/drivers/gpu/drm/ci/lava-submit.sh b/drivers/gpu/drm/ci/lava-su= bmit.sh index 379f26ea87cc..3d39b0c916a8 100755 --- a/drivers/gpu/drm/ci/lava-submit.sh +++ b/drivers/gpu/drm/ci/lava-submit.sh @@ -37,8 +37,8 @@ PYTHONPATH=3Dartifacts/ 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_OVE= RLAY_PATH}" \ --job-timeout-min ${JOB_TIMEOUT:-80} \ --first-stage-init artifacts/ci-common/init-stage1.sh \ diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 6473cddaa7a9..3479d2a0108d 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -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: --=20 2.34.1