From patchwork Mon Sep 4 16:15:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13374158 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 884C1C83F33 for ; Mon, 4 Sep 2023 16:16:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7903310E391; Mon, 4 Sep 2023 16:16:12 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5DF9610E391 for ; Mon, 4 Sep 2023 16:16:09 +0000 (UTC) Received: from localhost.localdomain (unknown [171.76.82.102]) (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: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id 866776607239; Mon, 4 Sep 2023 17:16:03 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693844168; bh=8FGqnMwKWzExttutUydgPKrWeHHmGACCAPVXjKbEUGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cx6l/QTA5Ypgzbgh3Gxi2LZIdYN8TE5DzBO+iDvwfUOrN2EBswnnWFAalGUm2/Zj2 2BQaHBNk5PdpYn89YSjFKKBm+Ijnbx0EpfkGUpLsGWU75OY7kRvaIL6uVlKx7XC4iZ qSGmIn5p76Qn/hxFN//sMmDpGXrdUVOyl0TgjPcfBb1NrmF29JwwPU1syfalD3Ovb8 KuXBZbTcBfKjlOruKk5BgbhHzI6DbWClCYA13BlrSR+J5XkJ29afOF8PJ7Cd7rDVEi G0j04SHqmsNmLlCTUBGjuLQhlPCmq3YE4siIfR7Hnt9RtXFNdFDZK+eSnGq7jncTD4 bXOTxbGzB7oiw== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/7] drm: ci: igt_runner: remove todo Date: Mon, 4 Sep 2023 21:45:10 +0530 Message-Id: <20230904161516.66751-2-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904161516.66751-1-vignesh.raman@collabora.com> References: <20230904161516.66751-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, robdclark@google.com, daniels@collabora.com, emma@anholt.net, gustavo.padovan@collabora.com, linux-arm-msm@vger.kernel.org, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, robclark@freedesktop.org, linux-kernel@vger.kernel.org, david.heidelberg@collabora.com, helen.koike@collabora.com, anholt@google.com, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" /sys/kernel/debug/dri/*/state exist for every atomic KMS driver. We do not test non-atomic drivers, so remove the todo. Signed-off-by: Vignesh Raman --- v2: - No changes --- drivers/gpu/drm/ci/igt_runner.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/ci/igt_runner.sh b/drivers/gpu/drm/ci/igt_runner.sh index 2bb759165063..5bf130ac57c9 100755 --- a/drivers/gpu/drm/ci/igt_runner.sh +++ b/drivers/gpu/drm/ci/igt_runner.sh @@ -15,7 +15,6 @@ cat /sys/kernel/debug/device_component/* ' # Dump drm state to confirm that kernel was able to find a connected display: -# TODO this path might not exist for all drivers.. maybe run modetest instead? set +e cat /sys/kernel/debug/dri/*/state set -e From patchwork Mon Sep 4 16:15:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13374159 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 52C9CC83F3F for ; Mon, 4 Sep 2023 16:16:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BC2810E39C; Mon, 4 Sep 2023 16:16:15 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by gabe.freedesktop.org (Postfix) with ESMTPS id 57DC110E39E for ; Mon, 4 Sep 2023 16:16:14 +0000 (UTC) Received: from localhost.localdomain (unknown [171.76.82.102]) (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: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id A3C0B660727F; Mon, 4 Sep 2023 17:16:08 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693844173; bh=PqnUcFY/q0lgjJw6DSUb9APr8xzTKq/rx+fSVIiGKME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FVMwR8E4oAKKzCINPOhr4QwIjSWZ8tYTACb7k+ABut6UyuFzhoTWsDJs97OB4Nhpt 3OWu9BILyy91S8DSMbar9kDvosLWcgYsPdkfuguBtI+LYr4So/VODZwKXQw2dGBDhb NbR7JzRVJeu4HFgWw50XQOj2sQ8ajwoBb49xCN8q7S/yKTZyCQbvhFEZaY1hJ1IgpA z3jo4/fhPr3IBImxZTH6vTJApbOAV4UPsuci+Gj/YMkCl1PHaNa5sISHrLb4o7er2V iCs9x6ZbTouwUp+JpacW8rpRuIkL1P8Gmv13zzvkyZjVZpZHessUZLAtoyLBF+BbT0 T9IOljabH7TJg== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/7] drm: ci: Force db410c to host mode Date: Mon, 4 Sep 2023 21:45:11 +0530 Message-Id: <20230904161516.66751-3-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904161516.66751-1-vignesh.raman@collabora.com> References: <20230904161516.66751-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, robdclark@google.com, daniels@collabora.com, emma@anholt.net, gustavo.padovan@collabora.com, linux-arm-msm@vger.kernel.org, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, robclark@freedesktop.org, linux-kernel@vger.kernel.org, david.heidelberg@collabora.com, helen.koike@collabora.com, anholt@google.com, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Force db410c to host mode to fix network issue which results in failure to mount root fs via NFS. See https://gitlab.freedesktop.org/gfx-ci/linux/-/commit/cb72a629b8c15c80a54dda510743cefd1c4b65b8 Use fdtoverlay command to merge base device tree with an overlay which contains the fix for USB controllers to work in host mode. Signed-off-by: Vignesh Raman --- v2: - Use fdtoverlay command to merge overlay dtbo with the base dtb instead of modifying the kernel sources --- drivers/gpu/drm/ci/build.sh | 5 +++++ .../gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dts | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 drivers/gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dts diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 7b014287a041..92ffd98cd09e 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -92,6 +92,11 @@ done if [[ -n ${DEVICE_TREES} ]]; then make dtbs + if [[ -e arch/arm64/boot/dts/qcom/apq8016-sbc.dtb ]]; then + dtc -@ -I dts -O dtb -o drivers/gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dtbo drivers/gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dts + fdtoverlay -i arch/arm64/boot/dts/qcom/apq8016-sbc.dtb -o arch/arm64/boot/dts/qcom/apq8016-sbc-overlay.dtb drivers/gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dtbo + mv arch/arm64/boot/dts/qcom/apq8016-sbc-overlay.dtb arch/arm64/boot/dts/qcom/apq8016-sbc.dtb + fi cp ${DEVICE_TREES} /lava-files/. fi diff --git a/drivers/gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dts b/drivers/gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dts new file mode 100644 index 000000000000..57b7604f1c23 --- /dev/null +++ b/drivers/gpu/drm/ci/dt-overlays/apq8016-sbc-overlay.dts @@ -0,0 +1,13 @@ +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target-path = "/soc@0"; + __overlay__ { + usb@78d9000 { + dr_mode = "host"; + }; + }; + }; +}; From patchwork Mon Sep 4 16:15:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13374160 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 64F04C83F3F for ; Mon, 4 Sep 2023 16:16:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D96310E39D; Mon, 4 Sep 2023 16:16:20 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4B53010E39E for ; Mon, 4 Sep 2023 16:16:19 +0000 (UTC) Received: from localhost.localdomain (unknown [171.76.82.102]) (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: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id A889666072AD; Mon, 4 Sep 2023 17:16:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693844178; bh=7W5lNOyCrtC6tzFADwhpkMdQvmxObo4VaXMUWmtRyf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HOZfaooRFWiEablQxoxUOQv2pOxlMBXsxc1CL6SGGaXidRRW9jeH339PuZwFKkWw0 2cQqzWWMsnlLloRH7zMBUtutsUYHgQfdShnVOQ3xbc2Jg7GanVMknYJTJ3yA0htXOW LXzFRlntnU6vrz/4HFAHM6K59YxQ7PDcwKlEwQpXvvDfk2Id0C7QeW7TPpmyjJDK7s ove/YpCsFDB6VN4nMW0CvLteZYGaVDDyQ2GnewtNX9BbCrhEU3z/BiIEavguu2oKBg LL73nEKGEIHk6Tj7bA7fjlffCk7OMbi9/SLlu0WL7ThCz+WA/rYOXAYNuY7hulHIkY xRlH0bhBr0Vtw== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/7] drm: ci: virtio: update ci variables Date: Mon, 4 Sep 2023 21:45:12 +0530 Message-Id: <20230904161516.66751-4-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904161516.66751-1-vignesh.raman@collabora.com> References: <20230904161516.66751-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, robdclark@google.com, daniels@collabora.com, emma@anholt.net, gustavo.padovan@collabora.com, linux-arm-msm@vger.kernel.org, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, robclark@freedesktop.org, linux-kernel@vger.kernel.org, david.heidelberg@collabora.com, helen.koike@collabora.com, anholt@google.com, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Update ci variables to fix the below error, ERROR - Igt error: malloc(): corrupted top size ERROR - Igt error: Received signal SIGABRT. ERROR - Igt error: Stack trace: ERROR - Igt error: #0 [fatal_sig_handler+0x17b] Signed-off-by: Vignesh Raman --- v2: - No changes --- drivers/gpu/drm/ci/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index 6473cddaa7a9..d85add39f425 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -316,8 +316,11 @@ virtio_gpu:none: stage: virtio-gpu variables: CROSVM_GALLIUM_DRIVER: llvmpipe - DRIVER_NAME: virtio_gpu + DRIVER_NAME: virtio GPU_VERSION: none + CROSVM_MEMORY: 12288 + CROSVM_CPU: $FDO_CI_CONCURRENT + CROSVM_GPU_ARGS: "vulkan=true,gles=false,backend=virglrenderer,egl=true,surfaceless=true" extends: - .test-gl tags: From patchwork Mon Sep 4 16:15:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13374161 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 56304C88CB2 for ; Mon, 4 Sep 2023 16:16:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7055E10E39A; Mon, 4 Sep 2023 16:16:27 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7457A10E39A for ; Mon, 4 Sep 2023 16:16:24 +0000 (UTC) Received: from localhost.localdomain (unknown [171.76.82.102]) (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: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id A995866072B8; Mon, 4 Sep 2023 17:16:18 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693844183; bh=zFqttaYZLcrzVe0HaglrMmejxKKOSu901QLw+H/wB0I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nLzwg6q5d/mdGSkc1ECUOZVhKdYSEY5X/XCHBSHOMPcZH2jrOF8qCm8QEM2zYnWzP 2r17Hdxji0WxRB16GmbqcVQ9f1WteLQboMKvOqfS5cjnb3C4eLoRljgCRZehzqA2Ig h5XcooSx409BCPk7J6pw0jp/uCmKOZ8CobD2TddN6e+bfa14FT1TMWRFpNRBNrylw5 EFAD6FQuD1JTeSI09eQEUfuxAXf1bqbadl138cK46fTCBRxnK5l6H5Pwd/kGQAW9/D e5TNK/JqcZxTDUWinriKuial1gEXWkmmN2wbY0xyohz8QQO3kU/a4VC2T8a3/q9FmP HWBOe0Xoy//9g== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 4/7] drm: ci: Enable configs to fix mt8173 boot hang issue Date: Mon, 4 Sep 2023 21:45:13 +0530 Message-Id: <20230904161516.66751-5-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904161516.66751-1-vignesh.raman@collabora.com> References: <20230904161516.66751-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, robdclark@google.com, daniels@collabora.com, emma@anholt.net, gustavo.padovan@collabora.com, linux-arm-msm@vger.kernel.org, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, robclark@freedesktop.org, linux-kernel@vger.kernel.org, david.heidelberg@collabora.com, helen.koike@collabora.com, anholt@google.com, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Enable regulator Enable MT6397 RTC driver Signed-off-by: Vignesh Raman --- v2: - No changes --- drivers/gpu/drm/ci/arm64.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/ci/arm64.config b/drivers/gpu/drm/ci/arm64.config index 817e18ddfd4f..ea7a6cceff40 100644 --- a/drivers/gpu/drm/ci/arm64.config +++ b/drivers/gpu/drm/ci/arm64.config @@ -184,6 +184,8 @@ CONFIG_HW_RANDOM_MTK=y CONFIG_MTK_DEVAPC=y CONFIG_PWM_MTK_DISP=y CONFIG_MTK_CMDQ=y +CONFIG_REGULATOR_DA9211=y +CONFIG_RTC_DRV_MT6397=y # For nouveau. Note that DRM must be a module so that it's loaded after NFS is up to provide the firmware. CONFIG_ARCH_TEGRA=y From patchwork Mon Sep 4 16:15:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13374162 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 743D4C83F33 for ; Mon, 4 Sep 2023 16:16:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD7EB10E39E; Mon, 4 Sep 2023 16:16:31 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by gabe.freedesktop.org (Postfix) with ESMTPS id 84A3910E39E for ; Mon, 4 Sep 2023 16:16:29 +0000 (UTC) Received: from localhost.localdomain (unknown [171.76.82.102]) (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: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id E316966072B1; Mon, 4 Sep 2023 17:16:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693844188; bh=umMyyWR3blb/7+ypoWlatuHnPXSznjCt0EiGPJfGB/g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aMBRS4WKAbFhDaryAvnht4UhVRxhiIXEvIqaCz5emM6lsb7xBCpMk7YC1EVsbp/zo QdAe7MOtwyyt5v7eJz7UzpV6sHhtg+I4YxGqdbR+wpzsqS35zev5TIqX4YWwnRxWJ2 5WyUaUbUfaI+H5dumAgab8y/wbSxYGc+bPnkIbRbGPwqcEChyt6pyYy9ls0pZrx1QA DEScQBrSFPZKe8UcVCzizbqaiWP6WJ9/DrvMIwpkwsuzeVsTHu4rFTzY+QiPjJa1oQ sOl87ZfbKxlzzKOB/URZ9QoBUy2hUqZsnEkzEg7vkvpCHBQP8weYeIVhioM7btSYDL bz6X7MrH3BiFg== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 5/7] drm: ci: Update xfails Date: Mon, 4 Sep 2023 21:45:14 +0530 Message-Id: <20230904161516.66751-6-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904161516.66751-1-vignesh.raman@collabora.com> References: <20230904161516.66751-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, robdclark@google.com, daniels@collabora.com, emma@anholt.net, gustavo.padovan@collabora.com, linux-arm-msm@vger.kernel.org, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, robclark@freedesktop.org, linux-kernel@vger.kernel.org, david.heidelberg@collabora.com, helen.koike@collabora.com, anholt@google.com, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Update amdgpu-stoney-fails, mediatek-mt8173-flakes, mediatek-mt8173-fails, rockchip-rk3399-fails, rockchip-rk3399-flakes, rockchip-rk3288-flakes, i915-cml-fails, i915-cml-flakes, msm-apq8016-flakes files. Add tests that fail sometimes into the *-flakes file and tests that are failing into the *-fails file. Signed-off-by: Helen Koike Signed-off-by: Vignesh Raman --- v2: - No changes --- .../gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 1 - drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 1 - drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 2 ++ drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 1 + .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 2 -- .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 16 ++++++++++++++++ drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt | 2 ++ .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt | 1 + .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 4 ++-- .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 3 +++ 10 files changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt index bd9392536e7c..58bfded8a3fc 100644 --- a/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt +++ b/drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt @@ -1,7 +1,6 @@ kms_addfb_basic@bad-pitch-65536,Fail kms_addfb_basic@bo-too-small,Fail kms_async_flips@invalid-async-flip,Fail -kms_atomic@plane-immutable-zpos,Fail kms_atomic_transition@plane-toggle-modeset-transition,Fail kms_bw@linear-tiling-1-displays-2560x1440p,Fail kms_bw@linear-tiling-1-displays-3840x2160p,Fail diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt index 6139b410e767..5f513c638beb 100644 --- a/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt +++ b/drivers/gpu/drm/ci/xfails/i915-cml-fails.txt @@ -1,4 +1,3 @@ -kms_color@ctm-0-25,Fail kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-downscaling,Fail kms_flip_scaled_crc@flip-32bpp-linear-to-64bpp-linear-upscaling,Fail kms_flip_scaled_crc@flip-32bpp-xtile-to-64bpp-xtile-downscaling,Fail diff --git a/drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt index 0514a7b3fdb0..f06f1a5b16f9 100644 --- a/drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt +++ b/drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt @@ -7,6 +7,8 @@ kms_bw@linear-tiling-3-displays-3840x2160p kms_bw@linear-tiling-4-displays-1920x1080p kms_bw@linear-tiling-4-displays-2560x1440p kms_bw@linear-tiling-4-displays-3840x2160p +kms_color@ctm-0-25 +kms_cursor_legacy@torture-move kms_draw_crc@draw-method-xrgb8888-render-xtiled kms_flip@flip-vs-suspend kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling diff --git a/drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt b/drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt index fc41d13a2d56..3aee1f11ee90 100644 --- a/drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt +++ b/drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt @@ -8,6 +8,7 @@ kms_bw@linear-tiling-3-displays-3840x2160p kms_bw@linear-tiling-4-displays-1920x1080p kms_bw@linear-tiling-4-displays-2560x1440p kms_bw@linear-tiling-4-displays-3840x2160p +kms_cursor_legacy@torture-bo kms_flip@blocking-wf_vblank kms_flip@wf_vblank-ts-check kms_flip@wf_vblank-ts-check-interruptible diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt index 671916067dba..c8e64bbfd480 100644 --- a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt +++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-fails.txt @@ -1,5 +1,4 @@ kms_3d,Fail -kms_addfb_basic@addfb25-bad-modifier,Fail kms_bw@linear-tiling-1-displays-1920x1080p,Fail kms_bw@linear-tiling-1-displays-2560x1440p,Fail kms_bw@linear-tiling-1-displays-3840x2160p,Fail @@ -11,7 +10,6 @@ kms_bw@linear-tiling-3-displays-2560x1440p,Fail kms_bw@linear-tiling-3-displays-3840x2160p,Fail kms_color@pipe-A-invalid-gamma-lut-sizes,Fail kms_color@pipe-B-invalid-gamma-lut-sizes,Fail -kms_force_connector_basic@force-connector-state,Fail kms_force_connector_basic@force-edid,Fail kms_force_connector_basic@force-load-detect,Fail kms_force_connector_basic@prune-stale-modes,Fail diff --git a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt index e69de29bb2d1..9ed6722df2c2 100644 --- a/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt +++ b/drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt @@ -0,0 +1,16 @@ +core_setmaster_vs_auth +kms_addfb_basic@addfb25-bad-modifier +kms_color@invalid-gamma-lut-sizes +kms_cursor_legacy@cursor-vs-flip-atomic +kms_cursor_legacy@cursor-vs-flip-legacy +kms_force_connector_basic@force-connector-state +kms_hdmi_inject@inject-4k +kms_plane_scaling@plane-scaler-with-pixel-format-unity-scaling +kms_plane_scaling@plane-upscale-with-modifiers-20x20 +kms_plane_scaling@plane-upscale-with-pixel-format-20x20 +kms_plane_scaling@plane-upscale-with-rotation-20x20 +kms_plane_scaling@planes-downscale-factor-0-25-upscale-20x20 +kms_plane_scaling@planes-downscale-factor-0-5-upscale-20x20 +kms_plane_scaling@planes-downscale-factor-0-75-upscale-20x20 +kms_prop_blob@invalid-set-prop +kms_prop_blob@invalid-set-prop-any diff --git a/drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt b/drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt index 0e3b60d3fade..cd48a8c1d569 100644 --- a/drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt +++ b/drivers/gpu/drm/ci/xfails/msm-apq8016-flakes.txt @@ -1,3 +1,5 @@ +kms_cursor_legacy@forked-bo +kms_cursor_legacy@forked-move kms_force_connector_basic@force-connector-state kms_force_connector_basic@force-edid kms_force_connector_basic@force-load-detect diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt index 45c54c75c899..081fe6f8d488 100644 --- a/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt +++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt @@ -1,6 +1,7 @@ kms_addfb_basic@addfb25-bad-modifier kms_cursor_crc@.* kms_flip@basic-flip-vs-wf_vblank +kms_flip@blocking-wf_vblank kms_invalid_mode@int-max-clock,Crash kms_pipe_crc_basic@.* kms_properties@connector-properties-atomic,Crash diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt index 6db08ba6b008..029a3be3164d 100644 --- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt +++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-fails.txt @@ -2,14 +2,13 @@ kms_color@legacy-gamma,Fail kms_color@pipe-A-legacy-gamma,Fail kms_color@pipe-B-legacy-gamma,Fail kms_flip@basic-flip-vs-wf_vblank,Fail -kms_flip@blocking-wf_vblank,Fail kms_flip@dpms-vs-vblank-race,Fail kms_flip@flip-vs-absolute-wf_vblank,Fail kms_flip@flip-vs-absolute-wf_vblank-interruptible,Fail kms_flip@flip-vs-blocking-wf-vblank,Fail kms_flip@flip-vs-panning,Fail kms_flip@flip-vs-panning-interruptible,Fail -kms_flip@flip-vs-wf_vblank-interruptible,Fail +kms_flip@modeset-vs-vblank-race,Fail kms_flip@plain-flip-fb-recreate,Fail kms_flip@plain-flip-fb-recreate-interruptible,Fail kms_flip@plain-flip-ts-check,Fail @@ -35,3 +34,4 @@ kms_plane_multiple@atomic-pipe-B-tiling-none,Fail kms_plane_multiple@tiling-none,Fail kms_prime@basic-crc,Fail kms_rmfb@close-fd,Fail +kms_universal_plane@universal-plane-pipe-B-functional,Fail diff --git a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt index 4c0539b4beaf..869426a02cbd 100644 --- a/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt +++ b/drivers/gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt @@ -1,7 +1,10 @@ +kms_color@gamma kms_cursor_crc@.* +kms_flip@blocking-wf_vblank kms_flip@dpms-vs-vblank-race-interruptible kms_flip@flip-vs-expired-vblank +kms_flip@flip-vs-wf_vblank-interruptible kms_flip@modeset-vs-vblank-race-interruptible kms_pipe_crc_basic@.* kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-A From patchwork Mon Sep 4 16:15:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13374163 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 712B5C83F33 for ; Mon, 4 Sep 2023 16:16:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BF84210E39F; Mon, 4 Sep 2023 16:16:36 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id C509B10E3A2 for ; Mon, 4 Sep 2023 16:16:34 +0000 (UTC) Received: from localhost.localdomain (unknown [171.76.82.102]) (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: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id E7DE466072BA; Mon, 4 Sep 2023 17:16:28 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693844193; bh=sLkmIO8lMBzqmT0rb01FcG0pHWafR6A2drXY2Umo+KA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g8G9bhr7Itw2yiIOZ6jhP+q0eWOXiZbHttQe7VB/vCthFkLlofgQagKOCmLFTwv0U SOm6eOBi0ox8nPbW+GoeePvOt9ZXfYxeX8CyMVwZXQ2MU+bWuExFYqwDkEyhQeF1IG AHYwa7shv23XMgX34ddkH6W2chOhPEu9Kp2NpB0FTLm9MH2cbU0M1ItwrK/b1V2L1b UqZfPblbfwASbmaroPkehJykqxMnaUkr2O01kXP/ZUx8rUBTReiwAJxKfFzYHvv+8S YqLFM5KgmFGNGZDbIHunCsve+uJsAR+j/e3J1S1imR2bz6ZGs8FoOW93/TVQpU3XaX RcCB5F2+VayBA== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 6/7] drm: ci: Enable new jobs Date: Mon, 4 Sep 2023 21:45:15 +0530 Message-Id: <20230904161516.66751-7-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904161516.66751-1-vignesh.raman@collabora.com> References: <20230904161516.66751-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, robdclark@google.com, daniels@collabora.com, emma@anholt.net, gustavo.padovan@collabora.com, linux-arm-msm@vger.kernel.org, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, robclark@freedesktop.org, linux-kernel@vger.kernel.org, david.heidelberg@collabora.com, helen.koike@collabora.com, anholt@google.com, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Enable the following jobs, as the issues noted in the TODO comments have been resolved. This will ensure that these jobs are now included and executed as part of the CI/CD pipeline. msm:apq8016: TODO: current issue: it is not fiding the NFS root. Fix and remove this rule. mediatek:mt8173: TODO: current issue: device is hanging. Fix and remove this rule. virtio_gpu:none: TODO: current issue: malloc(): corrupted top size. Fix and remove this rule. Signed-off-by: Vignesh Raman --- v2: - Reworded the commit message --- drivers/gpu/drm/ci/gitlab-ci.yml | 2 +- drivers/gpu/drm/ci/test.yml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml index 2c4df53f5dfe..d2aac4404914 100644 --- a/drivers/gpu/drm/ci/gitlab-ci.yml +++ b/drivers/gpu/drm/ci/gitlab-ci.yml @@ -248,4 +248,4 @@ sanity: # Jobs that need to pass before spending hardware resources on further testing .required-for-hardware-jobs: - needs: [] \ No newline at end of file + needs: [] diff --git a/drivers/gpu/drm/ci/test.yml b/drivers/gpu/drm/ci/test.yml index d85add39f425..1771af21e2d9 100644 --- a/drivers/gpu/drm/ci/test.yml +++ b/drivers/gpu/drm/ci/test.yml @@ -108,9 +108,6 @@ msm:apq8016: RUNNER_TAG: google-freedreno-db410c script: - ./install/bare-metal/fastboot.sh - rules: - # TODO: current issue: it is not fiding the NFS root. Fix and remove this rule. - - when: never msm:apq8096: extends: @@ -273,9 +270,6 @@ mediatek:mt8173: DEVICE_TYPE: mt8173-elm-hana GPU_VERSION: mt8173 RUNNER_TAG: mesa-ci-x86-64-lava-mt8173-elm-hana - rules: - # TODO: current issue: device is hanging. Fix and remove this rule. - - when: never mediatek:mt8183: extends: @@ -333,6 +327,3 @@ virtio_gpu:none: - debian/x86_64_test-gl - testing:x86_64 - igt:x86_64 - rules: - # TODO: current issue: malloc(): corrupted top size. Fix and remove this rule. - - when: never \ No newline at end of file From patchwork Mon Sep 4 16:15:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Raman X-Patchwork-Id: 13374164 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 461A8C83F2C for ; Mon, 4 Sep 2023 16:16:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77A0110E3A2; Mon, 4 Sep 2023 16:16:40 +0000 (UTC) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id ADF5510E3A3 for ; Mon, 4 Sep 2023 16:16:39 +0000 (UTC) Received: from localhost.localdomain (unknown [171.76.82.102]) (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: vignesh) by madras.collabora.co.uk (Postfix) with ESMTPSA id 086CF66072B3; Mon, 4 Sep 2023 17:16:33 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693844198; bh=fYCD0l63OJFR9vxiJyOd4usa4j02uxLYzWRUvFdejtU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZ1T2Qw3fuSEz5xxDru/jyuRzA3DIUoPyXpq+CLaOhYIeD5fCL2Gyclaq3e3KuUlU wBZYjJC/Zkerrmfd1asDpSIWAdPHOSLMR4Uot9gHDosKj5uyfAd+/cQF0xjBoirG26 fJPDPS2xkieYAmCHibwwcFx2aXZaG/TghaThQ8rovRUSzeYiuGQ77thOVzv5Xr/JG0 NVABBMPCpM5EP+UY61nR2oHXBt6/dLjjH9YQNWelQDyjriUpd+lM1oYAYiNxJh2iGK qVX5sn3Hr2tLH/OL0+MOqINg+bUnMurJ3kAmph1KIURnsKJMsqWaK+otNa3rISoyD0 y6nGFEPWUYa7A== From: Vignesh Raman To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 7/7] drm: ci: Use scripts/config to enable/disable configs Date: Mon, 4 Sep 2023 21:45:16 +0530 Message-Id: <20230904161516.66751-8-vignesh.raman@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230904161516.66751-1-vignesh.raman@collabora.com> References: <20230904161516.66751-1-vignesh.raman@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mripard@kernel.org, robdclark@google.com, daniels@collabora.com, emma@anholt.net, gustavo.padovan@collabora.com, linux-arm-msm@vger.kernel.org, guilherme.gallo@collabora.com, sergi.blanch.torne@collabora.com, robclark@freedesktop.org, linux-kernel@vger.kernel.org, david.heidelberg@collabora.com, helen.koike@collabora.com, anholt@google.com, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Instead of modifying files in git to enable/disable configs, use scripts/config on the .config file which will be used for building the kernel. Signed-off-by: Vignesh Raman --- v2: - Added a new patch in the series to use scripts/config to enable/disable configs --- drivers/gpu/drm/ci/build.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh index 92ffd98cd09e..c95f4daac221 100644 --- a/drivers/gpu/drm/ci/build.sh +++ b/drivers/gpu/drm/ci/build.sh @@ -70,19 +70,19 @@ if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then fi fi -for opt in $ENABLE_KCONFIGS; do - echo CONFIG_$opt=y >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config -done -for opt in $DISABLE_KCONFIGS; do - echo CONFIG_$opt=n >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config -done - if [[ -n "${MERGE_FRAGMENT}" ]]; then ./scripts/kconfig/merge_config.sh ${DEFCONFIG} drivers/gpu/drm/ci/${MERGE_FRAGMENT} else make `basename ${DEFCONFIG}` fi +for opt in $ENABLE_KCONFIGS; do + ./scripts/config --enable CONFIG_$opt +done +for opt in $DISABLE_KCONFIGS; do + ./scripts/config --disable CONFIG_$opt +done + make ${KERNEL_IMAGE_NAME} mkdir -p /lava-files/