From 0fcb53e8f44884bc22960fa9561421e9e5b4abff Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 11 Jun 2021 15:41:50 +0100 Subject: [PATCH] ci/lava: Use HWCI_KERNEL_MODULES to load modules One fewer difference to bare-metal. Signed-off-by: Daniel Stone Acked-by: Martin Peres Acked-by: Emma Anholt Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci/lava/lava.yml.jinja2 | 2 +- src/amd/ci/gitlab-ci.yml | 1 + src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2 index 51b4819f4a0..6997844a9eb 100644 --- a/.gitlab-ci/lava/lava.yml.jinja2 +++ b/.gitlab-ci/lava/lava.yml.jinja2 @@ -90,7 +90,7 @@ actions: - ln -sf /install $CI_PROJECT_DIR/install # Set up our devices - - modprobe amdgpu || true + - '[ -z "$HWCI_KERNEL_MODULES" ] || (echo -n $HWCI_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe)' # Disable GPU frequency scaling - DEVFREQ_GOVERNOR=`find /sys/devices -name governor | grep gpu || true` diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml index 4194da847c5..91e00ad27cc 100644 --- a/src/amd/ci/gitlab-ci.yml +++ b/src/amd/ci/gitlab-ci.yml @@ -69,6 +69,7 @@ radv_stoney_vkcts:amd64: GPU_VERSION: radv-stoney-aco BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" + HWCI_KERNEL_MODULES: amdgpu VK_DRIVER: radeon tags: - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml index 6cb8e7cbdcf..721eba763af 100644 --- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml +++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml @@ -7,6 +7,7 @@ GPU_VERSION: radeonsi-stoney BOOT_METHOD: depthcharge KERNEL_IMAGE_TYPE: "" + HWCI_KERNEL_MODULES: amdgpu DRIVER_NAME: radeonsi DEQP_PARALLEL: 4 DEQP_EXPECTED_RENDERER: STONEY