From nobody Fri Sep 20 09:20:31 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 A95B8C00A8F for ; Tue, 24 Oct 2023 00:46:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231736AbjJXAqh (ORCPT ); Mon, 23 Oct 2023 20:46:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231629AbjJXAqf (ORCPT ); Mon, 23 Oct 2023 20:46:35 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 318A5D7E for ; Mon, 23 Oct 2023 17:46:29 -0700 (PDT) Received: from localhost.localdomain (unknown [IPv6:2804:14d:e646:872b:1c98:7e30:3cb0:3153]) (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 64A2C66071D4; Tue, 24 Oct 2023 01:46:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1698108388; bh=6KjYRfbuBh+/ylPXNLW71foNbJeaqFWiENanDlIKgzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i9wosHycCfMPJ8Wvx2AO1MF8yB7InUb6ZG2Oz/p7t2S8hC2tZR3WXgNgrehaxeqx6 TkuI7+n8eRk/cw732GhBYCNxdBUeTI9cUM1juep7aj2wkL1ocJcWq5q16wZ4TEeLtd yemnb7gcGT11AxP5dwUbz5rrsmbhUIyUE42TlCSMy4ttrupxhb0q1PdbHzSm6elVu5 EW2xAeEosiWI542YDoITLgTWjAtMPCPmfDy0zU2/DI70/vDt4IaROXr4oVwL4jd2XU zgJGGjhECwhfaQAxcQANIKxm61gg/x4eqqhxpjmFw4FeWPnlKEESGaX4wcHKfGJSGm 8iVJYbFlmZk2w== From: Helen Koike To: dri-devel@lists.freedesktop.org, Helen Koike , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno 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, daniels@collabora.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v3 04/10] drm/ci: uprev IGT and make sure core_getversion is run Date: Mon, 23 Oct 2023 21:45:19 -0300 Message-Id: <20231024004525.169002-5-helen.koike@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231024004525.169002-1-helen.koike@collabora.com> References: <20231024004525.169002-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" IGT has recently merged a patch that makes code_getversion test to fails if the driver isn't loaded or if it isn't the expected one defined in variable IGT_FORCE_DRIVER. Without this test, jobs were passing when the driver didn't load or probe for some reason, giving the illusion that everything was ok. Uprev IGT to include this modification and include core_getversion test in all the shards. Signed-off-by: Helen Koike Reviewed-by: David Heidelberg --- v2: - fixed typo in the commit message v3: - no changes --- drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/igt_runner.sh | 31 ++++++++++++++++++++++++------- drivers/gpu/drm/ci/image-tags.yml | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-c= i.yml index 452b9c2532ae..c08ea6097b1d 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -5,7 +5,7 @@ variables: UPSTREAM_REPO: git://anongit.freedesktop.org/drm/drm TARGET_BRANCH: drm-next =20 - IGT_VERSION: 471bfababd070e1dac0ebb87470ac4f2ae85e663 + IGT_VERSION: d1db7333d9c5fbbb05e50b0804123950d9dc1c46 =20 DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.g= it DEQP_RUNNER_GIT_TAG: v0.15.0 diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runn= er.sh index 2bb759165063..2f815ee3a8a3 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -20,11 +20,16 @@ set +e cat /sys/kernel/debug/dri/*/state set -e =20 -# Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module= in /lib -if [ "$IGT_FORCE_DRIVER" =3D "amdgpu" ]; then - mv /install/modules/lib/modules/* /lib/modules/. - modprobe amdgpu -fi +case "$DRIVER_NAME" in + rockchip|mediatek|meson) + export IGT_FORCE_DRIVER=3D"panfrost" + ;; + amdgpu) + # Cannot use HWCI_KERNEL_MODULES as at that point we don't have th= e module in /lib + mv /install/modules/lib/modules/* /lib/modules/. + modprobe amdgpu + ;; +esac =20 if [ -e "/install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.txt" ]; then IGT_SKIPS=3D"--skips /install/xfails/$DRIVER_NAME-$GPU_VERSION-skips.t= xt" @@ -48,6 +53,20 @@ fi =20 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s ${FDO_HTTP_CAC= HE_URI:-}$PIPELINE_ARTIFACTS_BASE/$ARCH/igt.tar.gz | tar --zstd -v -x -C / =20 + +# If the job is parallel at the gitab job level, take the corresponding fr= action +# of the caselist. +if [ -n "$CI_NODE_INDEX" ]; then + sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /install/testlist.txt +fi + +# core_getversion checks if the driver is loaded and probed correctly +# so run it in all shards +if ! grep -q "core_getversion" /install/testlist.txt; then + # Add the line to the file + echo "core_getversion" >> /install/testlist.txt +fi + set +e igt-runner \ run \ @@ -57,8 +76,6 @@ igt-runner \ $IGT_SKIPS \ $IGT_FLAKES \ $IGT_FAILS \ - --fraction-start $CI_NODE_INDEX \ - --fraction $CI_NODE_TOTAL \ --jobs 1 ret=3D$? set -e diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-t= ags.yml index e1b387581c11..7dd3f995f8a2 100644 --- a/drivers/gpu/drm/ci/image-tags.yml +++ b/drivers/gpu/drm/ci/image-tags.yml @@ -4,7 +4,7 @@ variables: DEBIAN_BASE_TAG: "${CONTAINER_TAG}" =20 DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" - DEBIAN_BUILD_TAG: "2023-10-06-amd" + DEBIAN_BUILD_TAG: "2023-10-08-igt" =20 KERNEL_ROOTFS_TAG: "2023-10-06-amd" =20 --=20 2.39.2