[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <29c7-64e8bc00-3-6afffd8@162524261>
Date: Fri, 25 Aug 2023 15:34:15 +0100
From: "Helen Mae Koike Fornazier" <helen.koike@...labora.com>
To: "Rob Clark" <robdclark@...il.com>
Cc: "Jani Nikula" <jani.nikula@...ux.intel.com>,
"Vignesh Raman" <vignesh.raman@...labora.com>,
dri-devel@...ts.freedesktop.org, emma@...olt.net,
linux-doc@...r.kernel.org, david.heidelberg@...labora.com,
linux-amlogic@...ts.infradead.org, jbrunet@...libre.com,
robdclark@...gle.com, corbet@....net, khilman@...libre.com,
sergi.blanch.torne@...labora.com, gustavo.padovan@...labora.com,
linux-rockchip@...ts.infradead.org, daniels@...labora.com,
martin.blumenstingl@...glemail.com, robclark@...edesktop.org,
anholt@...gle.com, linux-mediatek@...ts.infradead.org,
mripard@...nel.org, matthias.bgg@...il.com,
linux-arm-kernel@...ts.infradead.org,
angelogioacchino.delregno@...labora.com, neil.armstrong@...aro.org,
guilherme.gallo@...labora.com, linux-kernel@...r.kernel.org,
tzimmermann@...e.de
Subject: Re: [PATCH 2/6] drm: ci: Force
db410c to host mode
On Friday, August 25, 2023 11:30 -03, Rob Clark <robdclark@...il.com> wrote:
> On Fri, Aug 25, 2023 at 6:56 AM Jani Nikula <jani.nikula@...ux.intel.com> wrote:
> >
> > On Fri, 25 Aug 2023, Vignesh Raman <vignesh.raman@...labora.com> 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 <vignesh.raman@...labora.com>
> > > ---
> > > 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.
> >
> > I think it would be better to do out-of-tree builds and assume the
> > source is read-only.
>
> We have the ${target_branch}-external-fixes mechanism to merge
> necessary changes before building the kernel for CI. Which is
> necessary for a couple of reasons:
Should we create an official topic/drm-ci-external-fixes branch ?
Regards,
Helen
>
> 1) patches like this which aren't appropriate upstream but necessary
> due to the CI lab setup
> 2) target branch if often based on an early -rc, and it isn't unheard
> of to need some fix for some board or another which isn't appropriate
> to land via drm-next
>
> We should use the -external-fixes branch mechanism for patches like this one.
>
> BR,
> -R
>
> > > 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.
> >
> > Shouldn't this use something like 'scripts/config --enable' or
> > 'scripts/config --disable' on the .config file to be used for building
> > instead?
> >
> >
> > BR,
> > Jani.
> >
> >
> > --
> > Jani Nikula, Intel Open Source Graphics Center
Powered by blists - more mailing lists