Bug#928807: unblock: mesa/18.3.6-2
Hi Paul and Sam, On Wed, Jun 5, 2019 at 9:47 PM Paul Gevers wrote: > > Unblocked, thanks. > > Paul > Thanks for reviewing and unblocking! Andreas
Bug#928807: unblock: mesa/18.3.6-2
Hi. It would be great to get as many mesa fixes into buster as possible, so I decided to review all your git commits. I have no idea if the release team will find this useful or not, but there's no way I could construct a useful argument in favor of the inclusion without the review. I am *not* a member of the release team; I do not speak for anyone but myself. I got a chance to review all the 18.3.6 commits and started on 18.3.5. Release team, if this is useful, I'm happy to finish off reviewing the remainder of the commits. Please explicitly let me know if that would be valuable to you. Based on the review so far, I find that the maintainer is probably right. Namely, the upstream is very conservative in what they accept with one exception I'll call out below. Unfortunately, mesa has a lot of interdependencies, and the changes are inter-related. If upstream actually does have a good CI infrastructure across a lot of hardware, then cherry-picking changes is likely to be significantly less stable than pulling in a full upstream release. We can do nothing. We know we'll at least be suffering from a number of crashes and graphics corruption issues if we do that. We can take targeted fixes. I think that's better than doing nothing. However given upstream's conservative appropach, I actually think the risk is lower if we take advantage of their test coverage and take all or most of their release. There's one area where upstream is not as conservative as we might like. They have introduced a number of cases where additional linker or compiler errors are added to shaders. In general, they have turned cases where programs would previously build but crash or produce bad graphics when run into build time errors. >From our standpoint they have turned illegal input that would produce graphical corruption or worse into ftbfs bugs or runtime compilation failures depending on when the shader code is compiled. Personally I think that's acceptable, but it's the thing I most want to flag here. I've flagged such commits as linker (or compiler) change. I think these commits could be reverted with less risk of interdependency problem than other commits. Changes I know we don't want: 97de8f48894844361d6d5e69137154741e114b74 Does not meet the freeze policy. I've seen the release team reject packages for making similarly large changes to packaging at this stage in the process. Comments on commits: 600f314d63ad3d916f1eaa46953f86846668685e Fixes use-after-free d29dca6d Must include in buster if 7536af is included in buster to fix segfault eac9b87 linker change 76719ecb This is a crash so would probably be useful to get 96a01a5 I suspect that the bug this fixes will result in graphical corruption 0f976b linker change 208fd66 linker change db517e linker change 2c163bfe fix for bug definitely causing graphics corruption 2a1e743e Fixes segfault
Bug#928807: unblock: mesa/18.3.6-2
Hi Paul, On Thu, May 30, 2019 at 09:58:14PM +0200, Paul Gevers wrote: > Control: tags -1 moreinfo > > Hi Andreas, > > On Sat, 11 May 2019 16:43:45 +0200 Andreas Boll wrote: > > This unblock request contains a stable upstream release with lots of > > bug fixes for mesa's graphics drivers including fixes for driver > > crashes and visual corruption. It fixes two RC bugs (#922346, > > #926857). > > How would a targeted fix look like? New upstream releases don't meet the > freeze policy and the diff is way to big to properly review. > > Paul > Mesa upstream is very conservative in which patches it includes into its stable releases. Those cherry-picked patches are all targeted fixes. No new features and also no huge fixes are allowed. See also [1]. They also do lots of regression testing on those stable releases. I'd be in favor of taking all fixes from the upstream stable release and not only just those which explicitly fix reported Debian RC bugs. I'd recommend to review the git branch patch by patch instead of the whole diff at once. Those patches have good commit messages which help to review the patches. E.g. git clone https://salsa.debian.org/xorg-team/lib/mesa.git cd mesa gitk mesa-18.3.4-2..mesa-18.3.6-2 Does this help? Thanks, Andreas [1] https://mesa3d.org/submittingpatches.html#criteria
Bug#928807: unblock: mesa/18.3.6-2
Control: tags -1 moreinfo Hi Andreas, On Sat, 11 May 2019 16:43:45 +0200 Andreas Boll wrote: > This unblock request contains a stable upstream release with lots of > bug fixes for mesa's graphics drivers including fixes for driver > crashes and visual corruption. It fixes two RC bugs (#922346, > #926857). How would a targeted fix look like? New upstream releases don't meet the freeze policy and the diff is way to big to properly review. Paul signature.asc Description: OpenPGP digital signature
Bug#928807: unblock: mesa/18.3.6-2
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Please unblock package mesa
This unblock request contains a stable upstream release with lots of
bug fixes for mesa's graphics drivers including fixes for driver
crashes and visual corruption. It fixes two RC bugs (#922346,
#926857).
Debian changelog diff:
mesa (18.3.6-2) unstable; urgency=medium
* Cherry-pick c77acc3ceba (meson: remove meson-created megadrivers
symlinks) from upstream master branch. Removes a broken symlink
(Closes: #926857).
-- Andreas Boll Sat, 11 May 2019 15:43:07 +0200
mesa (18.3.6-1) unstable; urgency=medium
[ Timo Aaltonen ]
* libgl1-mesa-dri: Remove /etc/drirc which isn't installed anymore.
(Closes: #920241)
[ Andreas Boll ]
* New upstream release.
- wayland/egl: Ensure EGL surface is resized on DRI
update_buffers(). Fixes a crash with xwayland (Closes: #922346).
* Rebase patches/fix-hurd-ftbfs.diff.
-- Andreas Boll Sat, 06 Apr 2019 20:58:43 +0200
I've attached a git-diff with the following command:
git diff mesa-18.3.4-2..mesa-18.3.6-2
Further I've attached the output of git-shortlog to list all commit
titles.
unblock mesa/18.3.6-2
Thanks,
Andreas
diff --git a/VERSION b/VERSION
index 0548779ef21..d63efa719a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.3.4
+18.3.6
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index d69c2cacb4f..1041997a21e 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -36,3 +36,19 @@ cbd1ad6165f0aea7fb7c6fd1b36ad5317dd65cb7 st/mesa: require RGBA2, RGB4, and RGBA4
# stable The commit addresses functionality not present in branch
1b8983c25be19073c02fe9630e949be55f8280fa radv: fix using LOAD_CONTEXT_REG with old GFX ME firmwares on GFX8
+
+# stable Explicit 19.0 only nominations, require work which did not land in branch
+8ab95b849e66f3221d80a67eef2ec6e3730901a8 anv: Refactor descriptor pushing a bit
+5c30fffeec1732c21d600c036f95f8cdb1bb5487 anv: Take references to push descriptor set layouts
+
+# shaCommit references invalid sha - a offender did not land in branch.
+85ee157283c667372baf7c03259cba08853f0067 gitlab-ci: autotools needs to be told which llvm version to use
+
+# revert The commit was reverted shortly after it was applied on master
+47fc359822494935852de1e70e4d840b2fe6a25c anv: release memory allocated by glsl types during spirv_to_nir
+
+# stable Explicitly 19.0 nomination, seemingly a performance patch
+5ef2b8f1f2ebcdb4ffe5c98b3f4f48e584cb4b22 nir: Add a pass for lowering IO back to vector when possible
+
+# fixes Temporary block perf. fix depending on previous opt. pass
+6d5d89d25a0a4299dbfcbfeca71b6c7e65ef3d45 intel/nir: Vectorize all IO
diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
index d29b1911218..b5ac78887bf 100644
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadrivers.py
@@ -35,7 +35,11 @@ def main():
args = parser.parse_args()
if os.path.isabs(args.libdir):
-to = os.path.join(os.environ.get('DESTDIR', '/'), args.libdir[1:])
+destdir = os.environ.get('DESTDIR')
+if destdir:
+to = os.path.join(destdir, args.libdir[1:])
+else:
+to = args.libdir
else:
to = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.libdir)
@@ -45,7 +49,6 @@ def main():
if os.path.lexists(to):
os.unlink(to)
os.makedirs(to)
-shutil.copy(args.megadriver, master)
for driver in args.drivers:
abs_driver = os.path.join(to, driver)
@@ -67,7 +70,14 @@ def main():
name, ext = os.path.splitext(name)
finally:
os.chdir(ret)
+
+# Remove meson-created master .so and symlinks
os.unlink(master)
+name, ext = os.path.splitext(master)
+while ext != '.so':
+if os.path.lexists(name):
+os.unlink(name)
+name, ext = os.path.splitext(name)
if __name__ == '__main__':
diff --git a/debian/changelog b/debian/changelog
index 4d94b368e1f..70ce002e9c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+mesa (18.3.6-2) unstable; urgency=medium
+
+ * Cherry-pick c77acc3ceba (meson: remove meson-created megadrivers
+symlinks) from upstream master branch. Removes a broken symlink
+(Closes: #926857).
+
+ -- Andreas Boll Sat, 11 May 2019 15:43:07 +0200
+
+mesa (18.3.6-1) unstable; urgency=medium
+
+ [ Timo Aaltonen ]
+ * libgl1-mesa-dri: Remove /etc/drirc which isn't installed anymore.
+(Closes: #920241)
+
+ [ Andreas Boll ]
+ * New upstream release.
+- wayland/egl: Ensure EGL surface is resized on DRI
+ update_buffers(). Fixes a crash with xwayland (Closes: #922346).
+ * Rebase patches/fix-hurd-ftbfs.diff.
+
+ -- Andreas Boll Sat, 06 Apr 2019 20:58:43 +0200
+
mesa (18.3.4-2) unstable; urgency=medium
* Cherry-pick f6556ec7d12 (dri: meson: do not prefix user provided dri-
diff --git a/debian/gbp.conf
