ci/lava: Use HWCI_KERNEL_MODULES to load modules

One fewer difference to bare-metal.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11337>

.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`

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

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