[Openpvrsgx-devgroup] New version letux-pvrsrvkm-v5.6.0-rc1 available

H. Nikolaus Schaller hns at goldelico.com
Mon Feb 17 20:33:56 CET 2020


Hi Tony,

> Am 17.02.2020 um 16:00 schrieb Tony Lindgren <tony at atomide.com>:
> 
> * H. Nikolaus Schaller <hns at goldelico.com> [200217 08:01]:
>> The scripts will also keep letux-pvrsrvkm-v5.6.0-rc1 untouched
>> and there will be a new letux-pvrsrvkm-v5.6.0-rc2 which
>> is rebased. So you can alternatively start on letux-pvrsrvkm-v5.6.0-rc1.
> 
> Please don't rebase on every -rc. Just do it for every major release.
> That way we have a sane development tree following the Linux release
> cycle.

well, that contradicts the Letux development process where all feature
branches are rebased every rc (sometimes every second one). This is
sometimes essential to get bug fixes during rc2..rc7 into the tree. Or
not to keep hot-fixes twice (once from upstream and once local).

It has been very helpful to have this scheme in the past 5 years since
it saves a lot of book-keeping what has already been applied outside
of our tree and when it finally is merged by Linus. If it becomes
merged in some -rc it will simply disappear from the letux repository
without additional efforts.

And I prefer to do continuous integration using the latest mainline base
every week. linux-next is doing that even once a day. So it is done
automatically, (re)based on the latest release by Linus (i.e. all the -rc).

> So the only change needed really is to leave out the -rc from branch
> names.

> 
> And then no rebasing until every major release when -rc1 gets tagged.
> Then generate a new development branch (but without the -rc name).
> 
> Shorter branch names, less work for you, folks with their own forks
> will be happy as there's only need to rebase every major release :)

Unfortunately it is much more work because I don't see how I can automate
that...

But the solution seems to be much simpler and is just a different
interpretation of what we have.

IMHO it should suffice (with our latest scripts) that you just continue
to work on letux-pvrsrvkm-v5.6.0-rc1. Until you decide to rebase to let's
say letux-pvrsrvkm-v5.7.0-rc1. So there is no (urgent) need that you
follow all -rc versions. 

So you can simply ignore that there will be letux-pvrsrvkm-v5.6.0-rc2 etc.
in the next weeks.

And maybe you can take "-rc1" suffix just as a note that it is the basis
of a new major release and assume it has been removed :)

An alternative could be to work on the letux-pvrsrvkm branch which should
allow to merge e.g. v5.6-rc5 after it was released by Linus. This will
of course bury your local patches by the merge.

In summary it was not difficult to clone your letux-pvrsrvkm-v5.6.0-rc1-pvr-drv
and cherry-pick the series from letux-pvrsrvkm-v5.6.0-rc1..HEAD to
reintegrate into letux-pvrsrvkm-v5.6.0-rc2. Which should now have
almost all patches except the jz4780 patch.

And I had to modify the Makefile because the pvr_drv variable didn't
want to work for me... I have only compile-tested so far:

  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_am3352_sgx530_125.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_am3517_sgx530_125.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_am4_sgx530_125.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_am57xx_sgx544_116.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_dra7_sgx544_116.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_omap3630_sgx530_125.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_omap3_sgx530_121.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_omap4_sgx540_120.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_omap4_sgx544_112.ko - due to target is PHONY
  INSTALL drivers/gpu/drm/pvrsgx/1.17.4948957/eurasia_km/pvrsrvkm_omap5_sgx544_116.ko - due to target is PHONY

I did only try to load the driver on the Pyra but the 1.14 pvrsrvctl
was expected to fail:

root at letux:~# dmesg|fgrep pvr
[    9.011067] pvrsrvkm 56000000.gpu: Enabling quirks 00000000
[    9.049213] pvrsrvkm 56000000.gpu: Unbalanced pm_runtime_enable!
[    9.056547] [drm] Initialized pvr 1.17.4948957 20110701 for 56000000.gpu on minor 0
root at letux:~# pvrsrvctl --start --no-module
PVR:(Error): PVRSRVBridgeCall: Failed to access device.  Function ID:3223086861 (strerror returns no value.). [0, ]
PVR:(Error): OpenServices: PVRSRVBridgeCall failed. [0, ]
PVR:(Error): PVRSRVInitSrvConnect: PVRSRVConnect failed [0, ]
PVR:(Error): SrvInit: PVRSRVInitSrvConnect failed (4) [0, ]
pvrsrvctl: SrvInit failed (already initialized?) (err=PVRSRV_ERROR_INIT_FAILURE)
root at letux:~# 

So if you decide to rebase your tree to letux-pvrsrvkm-v5.6.0-rc2
(where I now want to start the build server) it should become (almost) "empty"
(i.e. no private patches). If not, we have done something wrong and lost
commits...

BR and thanks for the big contribution to 1.17.4948957,
Nikolaus



More information about the openpvrsgx-devgroup mailing list