[Buildroot] [PATCH 3/7] package/freescale-imx/kernel-module-imx-gpu-viv: bump to version 6.4.3.p4.2

[Gary Bisson]

Hi Yann,

On Sun, Aug 28, 2022 at 05:44:32PM +0200, Yann E. MORIN wrote:
> Chris, All,
> 
> On 2022-08-24 12:26 -0700, Chris Dimich spake thusly:
> > To match NXP 5.15.32-2.0.0 release.
> > 
> > Signed-off-by: Chris Dimich <chris.dimich at boundarydevices.com>
> > ---
> >  .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash    | 2 +-
> >  .../kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk      | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
> > index ee105ef82c..ccb28bc4f6 100644
> > --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
> > +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
> > @@ -1,3 +1,3 @@
> >  # locally computed
> > -sha256  257c6cd8b01cfb6543827cbeb78409e6a2ad4ae321891751dcea1abc47d89379  kernel-module-imx-gpu-viv-ae0f3be0b7240f11cca191a3e2bdd4a445ee46e5.tar.gz
> > +sha256  b816ab94b1d248cfc5fe5f6381422346c273d01760bb324303e0298e10bd46e2  kernel-module-imx-gpu-viv-82c6cb6c607424403b8d76805bb17e7be74292f6.tar.gz
> >  sha256  b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
> > diff --git a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
> > index 10505fdf17..f94890a438 100644
> > --- a/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
> > +++ b/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
> > @@ -4,7 +4,7 @@
> >  #
> >  ################################################################################
> >  
> > -KERNEL_MODULE_IMX_GPU_VIV_VERSION = ae0f3be0b7240f11cca191a3e2bdd4a445ee46e5
> > +KERNEL_MODULE_IMX_GPU_VIV_VERSION = 82c6cb6c607424403b8d76805bb17e7be74292f6 #6.4.3.p4.2
> 
> So not add a comment at the end of the line; this is known to cause
> issues in some situations, and we previously had to remove all of them
> in the past. Instead, just add such a comment just above the assignment;
> 
>     # Equivalent to 6.4.3.p4.2
>     KERNEL_MODULE_IMX_GPU_VIV_VERSION = 82c6cb6c607424403b8d76805bb17e7be74292f6
> 
> I also have some relatively minor concerns with this package (not
> specifically due to your change, but prompted by it):
> 
> The git repository does have tags with the corresponding versions, e.g.:
> 
>     https://github.com/Freescale/kernel-module-imx-gpu-viv/releases/tag/upstream%2F6.4.3.p4.2
> 
> which is tag "upstream/6.4.3.p4.2".
> 
> However, here's the corresponding graphlog:
> 
>     *   82c6cb6 (HEAD -> master, origin/master, origin/HEAD) Merge tag 'upstream/6.4.3.p4.2'
>     |\
>     | * c897a6c (tag: upstream/6.4.3.p4.2, origin/upstream) Import 6.4.3.p4.2 original version
>     * | a482c32 Merge tag 'upstream/6.4.3.p4.0'
>     |\|
>     | * 9c2d676 (tag: upstream/6.4.3.p4.0) Import 6.4.3.p4.0 original version
>     * | 5c7b884 Merge tag 'upstream/6.4.3.p2.4'
>     |\|
>     | * 410ce59 (tag: upstream/6.4.3.p2.4) Import 6.4.3.p2.4 original version
>     * | 5115a2b Merge tag 'upstream/6.4.3.p2.2'
>     |\|
>     | * e879a17 (tag: upstream/6.4.3.p2.2) Import 6.4.3.p2.2 original version
>     * | ae0f3be gc_hal_kernel_platform_imx.config: remove build time/user * macros
>     * | 20595cd Merge tag 'upstream/6.4.3.p2.0'
>     |\|
>     | * 8f1bf96 (tag: upstream/6.4.3.p2.0) Import 6.4.3.p2.0 original version
>     ...
> 
> So, basically, we are using the commits on the master branch, but all
> that differs from the corresponding tag is (by running:  git diff -p
> c897a6c..82c6cb6):
> 
>   - there is an added 'fscl' (or variation thereof, like '+fscl') in 4
>     locations, all appended to the version string;

'fslc' means that it is maintained by the community (fsl community) so
the purpose of that tag is to show we're building from the external
module source code from github/freescale (which is entirely maintained
by the community).

>   - there are two macros that are removed (specifically by ae0f3be).

Yes this is for Yocto builds in order not to break reproducibiliy of the
build/module.

> So, can't we use the tag instead of a sha1, and carry the patch from
> ae0f3be localy?

We could but this approach considers there's only that patch that
matters.
In the past, the community-maintained module had more features than the
driver from NXP, for instance it was supporting PREEMPT_RT when NXP
didn't [1]. But I agree both branches are now very close.
I don't have any strong feelings to be honest, whatever you think is
better for BR will do.

> Otherwise, Chris and Gary: could you add tags on the master branch,
> maybe?

We could add a tag on master if needed. Would need to run it by the
project maintainer (Otavio). Just let me know if you want to go that
route.

Regards,
Gary

[1] https://github.com/Freescale/kernel-module-imx-gpu-viv/commit/f73c35b0