From mboxrd@z Thu Jan 1 00:00:00 1970 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 23205C71133 for ; Fri, 25 Aug 2023 14:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343665AbjHYOQR convert rfc822-to-8bit (ORCPT ); Fri, 25 Aug 2023 10:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343822AbjHYOPm (ORCPT ); Fri, 25 Aug 2023 10:15:42 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EED526A1; Fri, 25 Aug 2023 07:15:17 -0700 (PDT) Received: from hamburger.collabora.co.uk (hamburger.collabora.co.uk [IPv6:2a01:4f8:1c1c:f269::1]) by madras.collabora.co.uk (Postfix) with ESMTP id 4C74566071BE; Fri, 25 Aug 2023 15:09:04 +0100 (BST) From: "Helen Mae Koike Fornazier" In-Reply-To: <87pm3b2pkz.fsf@intel.com> Content-Type: text/plain; charset="utf-8" X-Forward: 127.0.0.1 Date: Fri, 25 Aug 2023 15:09:04 +0100 Cc: "Vignesh Raman" , dri-devel@lists.freedesktop.org, emma@anholt.net, linux-doc@vger.kernel.org, david.heidelberg@collabora.com, linux-amlogic@lists.infradead.org, jbrunet@baylibre.com, robdclark@google.com, corbet@lwn.net, khilman@baylibre.com, sergi.blanch.torne@collabora.com, gustavo.padovan@collabora.com, linux-rockchip@lists.infradead.org, daniels@collabora.com, martin.blumenstingl@googlemail.com, robclark@freedesktop.org, anholt@google.com, linux-mediatek@lists.infradead.org, mripard@kernel.org, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org, angelogioacchino.delregno@collabora.com, neil.armstrong@linaro.org, guilherme.gallo@collabora.com, linux-kernel@vger.kernel.org, tzimmermann@suse.de To: "Jani Nikula" MIME-Version: 1.0 Message-ID: <29c7-64e8b600-1-6afffd8@162524228> Subject: =?utf-8?q?Re=3A?= [PATCH 2/6] =?utf-8?q?drm=3A?==?utf-8?q?_ci=3A?= Force db410c to host mode User-Agent: SOGoMail 5.8.4 Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jani, thanks for your comments On Friday, August 25, 2023 10:56 -03, Jani Nikula wrote: > On Fri, 25 Aug 2023, Vignesh Raman wrote: > > 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 > > > > Since this fix is not sent upstream, add it to build.sh script > > before building the kernel and dts. Better approach would be > > to use devicetree overlays. > > > > Signed-off-by: Vignesh Raman > > --- > > drivers/gpu/drm/ci/build.sh | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh > > index 7b014287a041..c39834bd6bd7 100644 > > --- a/drivers/gpu/drm/ci/build.sh > > +++ b/drivers/gpu/drm/ci/build.sh > > @@ -70,6 +70,10 @@ if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then > > fi > > fi > > > > +# 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 > > +sed -i '/&usb {/,/status = "okay";/s/status = "okay";/&\n\tdr_mode = "host";/' arch/arm64/boot/dts/qcom/apq8016-sbc.dts > > + > > It seems like a really bad idea to me to have the CI build modify the > source tree before building. > > The kernel being built will have a dirty git repo, and the localversion > will have -dirty in it. Is it bad? The other option was to work with device tree overlays (but we still need to spend some time to see how to fit it all together) > > I think it would be better to do out-of-tree builds and assume the > source is read-only. I'm not sure I get what do you call out-of-tree builds. Another option would be to apply .patch file, or to have another branch just with fix ups for ci that would be applied in the tree before building. > > > for opt in $ENABLE_KCONFIGS; do > > echo CONFIG_$opt=y >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config > > done > > Ditto for the config changes in the context here. Those are files in > git, don't change them. Probably these changes could go directly into drivers/gpu/drm/ci/${KERNEL_ARCH}.config files, no need to modify them on the fly here > > Shouldn't this use something like 'scripts/config --enable' or > 'scripts/config --disable' on the .config file to be used for building > instead? I wasn't aware about this possibility, looks cleaner indeed. Regards, Helen > > > BR, > Jani. > > > -- > Jani Nikula, Intel Open Source Graphics Center