From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CEF45179658; Tue, 30 Apr 2024 14:31:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714487486; cv=none; b=AXVoRy7kwzA8DHU7wC3qPFbUPq/A5UpnrWqLIhquLPDfc0W7spP+Y82Dy56b8wcTNkQ40G6xIZY68NYHrjlLzWTAoPTGeP8/SLFDyp+pjnrM2AfDqcmbSQL7fLlQwcilfLVlMWGKg6ws6z32/mp7eYGqi/zeV8uv6Pnr33BH5Qc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714487486; c=relaxed/simple; bh=08lyesCEKaOnB28Fw3u34HvaM0G+lf8uBMq021leP4Q=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=f4Zw1loZpRCfclJZGwbTQ7Rp9bGiaE78kcngClB+IgxHfEmloe42O/Goldspn6OEiyw/DLbC4ooADVQnXZmnyG0gVHb78o5rGoWWM9cX3uYYEpSRO3LkC0E6RowD7ztPlYsvjTkdqb0rpLSxUYqIY6HXw/0PmhqaH/NgwaE8JYs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ELnbSRWD; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ELnbSRWD" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1714487483; bh=08lyesCEKaOnB28Fw3u34HvaM0G+lf8uBMq021leP4Q=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=ELnbSRWDFqn73oBgEYJ+2HofrbwUEL9fiAUKRFjRAhKTmp3jClMgXjfJwIdeXB18v 6jGMkYTgqmRdFNQeGIT1Kb9snc5sFNOIKqP8LRBMFbmnMUNPCJZb8oC3zdq+QEYYE0 oycM7kEzyi90lVMaa7xAoloKsGH42Yj5WSHTYNpDJj073sqN0bumZx8wJGwjooWAo7 3opI+K5o0ADfK1nx3H8c2MU/fz39cqLsOXK3c6swPE5KFGxQtj0I0yclS7DK3r6ZtM BF+cv+R7BDQzjOM4Z1R0xLV0JZIN48A48JxAcp8DJlyUp3NlHSps7YfWzym7K1Gpcz 9HQVphiC870/A== Received: from [100.95.196.25] (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: koike) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 7720437820AB; Tue, 30 Apr 2024 14:31:17 +0000 (UTC) Message-ID: <90a0b4ba-52e3-446e-8de1-ca67e0c71a53@collabora.com> Date: Tue, 30 Apr 2024 11:31:16 -0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 3/5] drm/ci: build virtual GPU driver as module To: Vignesh Raman , dri-devel@lists.freedesktop.org Cc: daniels@collabora.com, airlied@gmail.com, daniel@ffwll.ch, robdclark@gmail.com, david.heidelberg@collabora.com, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, dmitry.baryshkov@linaro.org, mcanal@igalia.com, linux-mediatek@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-rockchip@lists.infradead.org, amd-gfx@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, intel-gfx@lists.freedesktop.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org References: <20240430091121.508099-1-vignesh.raman@collabora.com> <20240430091121.508099-4-vignesh.raman@collabora.com> Content-Language: en-US From: Helen Koike In-Reply-To: <20240430091121.508099-4-vignesh.raman@collabora.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 30/04/2024 06:11, Vignesh Raman wrote: > With latest IGT, the tests tries to load the module and it > fails. So build the virtual GPU driver for virtio as module. > > Signed-off-by: Vignesh Raman Acked-by: Helen Koike > --- > drivers/gpu/drm/ci/build.sh | 1 - > drivers/gpu/drm/ci/igt_runner.sh | 6 +++--- > drivers/gpu/drm/ci/image-tags.yml | 4 ++-- > drivers/gpu/drm/ci/test.yml | 1 + > drivers/gpu/drm/ci/x86_64.config | 2 +- > 5 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh > index 8a3baa003904..95493df9cdc2 100644 > --- a/drivers/gpu/drm/ci/build.sh > +++ b/drivers/gpu/drm/ci/build.sh > @@ -156,7 +156,6 @@ fi > > mkdir -p artifacts/install/lib > mv install/* artifacts/install/. > -rm -rf artifacts/install/modules > ln -s common artifacts/install/ci-common > cp .config artifacts/${CI_JOB_NAME}_config > > diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh > index 20026612a9bd..55532f79fbdc 100755 > --- a/drivers/gpu/drm/ci/igt_runner.sh > +++ b/drivers/gpu/drm/ci/igt_runner.sh > @@ -30,10 +30,10 @@ case "$DRIVER_NAME" in > export IGT_FORCE_DRIVER="panfrost" > fi > ;; > - amdgpu) > + amdgpu|virtio_gpu) > # Cannot use HWCI_KERNEL_MODULES as at that point we don't have the module in /lib > - mv /install/modules/lib/modules/* /lib/modules/. > - modprobe amdgpu > + mv /install/modules/lib/modules/* /lib/modules/. || true > + modprobe --first-time $DRIVER_NAME > ;; > esac > > diff --git a/drivers/gpu/drm/ci/image-tags.yml b/drivers/gpu/drm/ci/image-tags.yml > index d8f72b82c938..fd1cb6061166 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}" > > DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" > - DEBIAN_BUILD_TAG: "2023-10-08-config" > + DEBIAN_BUILD_TAG: "2024-04-22-virtio" > > - KERNEL_ROOTFS_TAG: "2023-10-06-amd" > + KERNEL_ROOTFS_TAG: "2024-04-22-virtio" > PKG_REPO_REV: "3cc12a2a" > > DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" > diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml > index 612c9ede3507..864ac3809d84 100644 > --- a/drivers/gpu/drm/ci/test.yml > +++ b/drivers/gpu/drm/ci/test.yml > @@ -350,6 +350,7 @@ virtio_gpu:none: > script: > - ln -sf $CI_PROJECT_DIR/install /install > - mv install/bzImage /lava-files/bzImage > + - mkdir -p /lib/modules > - mkdir -p $CI_PROJECT_DIR/results > - ln -sf $CI_PROJECT_DIR/results /results > - install/crosvm-runner.sh install/igt_runner.sh > diff --git a/drivers/gpu/drm/ci/x86_64.config b/drivers/gpu/drm/ci/x86_64.config > index 1cbd49a5b23a..78479f063e8e 100644 > --- a/drivers/gpu/drm/ci/x86_64.config > +++ b/drivers/gpu/drm/ci/x86_64.config > @@ -91,7 +91,7 @@ CONFIG_KVM=y > CONFIG_KVM_GUEST=y > CONFIG_VIRT_DRIVERS=y > CONFIG_VIRTIO_FS=y > -CONFIG_DRM_VIRTIO_GPU=y > +CONFIG_DRM_VIRTIO_GPU=m > CONFIG_SERIAL_8250_CONSOLE=y > CONFIG_VIRTIO_NET=y > CONFIG_VIRTIO_CONSOLE=y