debian/changelog | 17 +++++++++++++++++ debian/compat | 2 +- debian/control | 8 +++----- debian/rules | 17 +++++++---------- src/gallium/auxiliary/cso_cache/cso_cache.c | 4 +++- 5 files changed, 31 insertions(+), 17 deletions(-)
New commits: commit 4af376cb008b65566c3f7a3a706c42e2f8387a5c Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 15:17:08 2016 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 56426a7..932bdc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (13.0.2-2) UNRELEASED; urgency=medium +mesa (13.0.2-2) unstable; urgency=medium * Bump llvm/libclang build-deps to >= 1:3.9.1. - Enables support for OpenCL on AMD Polaris GPUs (Closes: #848173). @@ -13,7 +13,7 @@ mesa (13.0.2-2) UNRELEASED; urgency=medium already. * Disable assembly usage on x32. Related to Bug #758094. - -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 + -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 15:16:56 +0100 mesa (13.0.2-1) unstable; urgency=medium commit 54c688a2a10ae0fcee928ed56ee92d5f31c2c8db Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 14:50:34 2016 +0100 Disable assembly usage on x32. Related to Bug #758094. diff --git a/debian/changelog b/debian/changelog index 2ef5f6e..56426a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ mesa (13.0.2-2) UNRELEASED; urgency=medium * Drop no longer needed dpkg-dev versioned build-dependency. * Drop redundant cross-build detection, debhelper does this for us already. + * Disable assembly usage on x32. Related to Bug #758094. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 diff --git a/debian/rules b/debian/rules index fa1f9ef..1b92aa1 100755 --- a/debian/rules +++ b/debian/rules @@ -104,6 +104,12 @@ else confflags_GALLIUM += --enable-lmsensors endif +# Disable assembly usage on x32 otherwise Mesa defaults to x86_64 assembly +# which doesn't work on x32 (see #758094) +ifneq (,$(filter $(DEB_HOST_ARCH), x32)) + confflags += disable-asm +endif + confflags_EGL = --with-egl-platforms="$(EGL_DISPLAYS)" confflags_GLES = --enable-gles1 --enable-gles2 confflags_GALLIUM += --with-gallium-drivers="$(GALLIUM_DRIVERS)" commit 441aaaa69654afa6ea49c2f2e0cadf1132a29c0a Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 14:30:20 2016 +0100 Drop redundant cross-build detection, debhelper does this for us already. diff --git a/debian/changelog b/debian/changelog index db3289e..2ef5f6e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ mesa (13.0.2-2) UNRELEASED; urgency=medium * Stop passing --disable-silent-rules to configure, debhelper does that for a while. * Drop no longer needed dpkg-dev versioned build-dependency. + * Drop redundant cross-build detection, debhelper does this for us + already. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 diff --git a/debian/rules b/debian/rules index 5380048..fa1f9ef 100755 --- a/debian/rules +++ b/debian/rules @@ -8,14 +8,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build=$(DEB_HOST_GNU_TYPE) -else - confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) -endif ifeq (,$(filter $(DEB_HOST_ARCH), armhf)) buildflags = \ commit a615b3459df48b2b1ecc7181e54a9aaccbb12a08 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 12:41:11 2016 +0100 Drop no longer needed dpkg-dev versioned build-dependency. diff --git a/debian/changelog b/debian/changelog index 62ca1e2..db3289e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ mesa (13.0.2-2) UNRELEASED; urgency=medium * Bump debhelper compat to 10. * Stop passing --disable-silent-rules to configure, debhelper does that for a while. + * Drop no longer needed dpkg-dev versioned build-dependency. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 diff --git a/debian/control b/debian/control index 1eea842..f469cbc 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Build-Depends: x11proto-gl-dev (>= 1.4.14), libxxf86vm-dev, libexpat1-dev, - dpkg-dev (>= 1.16.1), libgcrypt20-dev [amd64 i386 arm64 armhf ppc64el x32], libsensors4-dev [!hurd-any], libxfixes-dev, commit cfa5a9da2c0d581332850ea13b9f5cbed50e7a77 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 12:40:13 2016 +0100 Stop passing --disable-silent-rules to configure, debhelper does that for a while. diff --git a/debian/changelog b/debian/changelog index c3d2221..62ca1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ mesa (13.0.2-2) UNRELEASED; urgency=medium bound) from upstream master branch. Fixes random GPU hangs on radeonsi (AMD Southern Islands and newer) in many games. * Bump debhelper compat to 10. + * Stop passing --disable-silent-rules to configure, debhelper does + that for a while. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 diff --git a/debian/rules b/debian/rules index be63025..5380048 100755 --- a/debian/rules +++ b/debian/rules @@ -150,7 +150,6 @@ override_dh_clean: override_dh_auto_configure: dh_auto_configure -- \ - --disable-silent-rules \ $(confflags) override_dh_auto_install: commit 181d812f4893be697cef128f407ff129331d0fc4 Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 12:39:57 2016 +0100 Bump debhelper compat to 10. diff --git a/debian/changelog b/debian/changelog index 7592735..c3d2221 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mesa (13.0.2-2) UNRELEASED; urgency=medium * Cherry-pick 6dc96de (cso: don't release sampler states that are bound) from upstream master branch. Fixes random GPU hangs on radeonsi (AMD Southern Islands and newer) in many games. + * Bump debhelper compat to 10. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index bedd46a..1eea842 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Andreas Boll <andreas.boll....@gmail.com> Standards-Version: 3.9.8 Build-Depends: - debhelper (>= 9), - dh-autoreconf, + debhelper (>= 10), quilt (>= 0.40), pkg-config, libdrm-dev (>= 2.4.69) [!hurd-any], diff --git a/debian/rules b/debian/rules index d696325..be63025 100755 --- a/debian/rules +++ b/debian/rules @@ -218,8 +218,7 @@ override_dh_makeshlibs: dh_makeshlibs -a -- -c4 %: - dh $@ --with quilt,autoreconf \ - --parallel \ + dh $@ --with quilt \ --builddirectory=build/ # For maintainer use only, generate a tarball: commit 31ecb164d0633baed1249daa2877ebd155f8da5d Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 12:38:02 2016 +0100 Document the cherry-pick in debian/changelog diff --git a/debian/changelog b/debian/changelog index 317e7e1..7592735 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ mesa (13.0.2-2) UNRELEASED; urgency=medium * Bump llvm/libclang build-deps to >= 1:3.9.1. - Enables support for OpenCL on AMD Polaris GPUs (Closes: #848173). + * Cherry-pick 6dc96de (cso: don't release sampler states that are + bound) from upstream master branch. Fixes random GPU hangs on + radeonsi (AMD Southern Islands and newer) in many games. -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 commit 8ff4448f089d44adb7714262fe55dd9957bd0343 Author: Marek Olšák <marek.ol...@amd.com> Date: Fri Dec 2 15:39:25 2016 +0100 cso: don't release sampler states that are bound This fixes random radeonsi GPU hangs in Batman Arkham: Origins (Wine) and probably many other games too. cso_cache deletes sampler states when the cache size is too big and doesn't check which sampler states are bound, causing use-after-free in drivers. Because of that, radeonsi uploaded garbage sampler states and the hardware went bananas. Other drivers may have experienced similar issues. Cc: 12.0 13.0 <mesa-sta...@lists.freedesktop.org> Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com> Reviewed-by: Edward O'Callaghan <funfunc...@folklore1984.net> (cherry picked from commit 6dc96de303290e8d1fc294da478c4f370be98dea) diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c index b240c93..1f3be4b 100644 --- a/src/gallium/auxiliary/cso_cache/cso_cache.c +++ b/src/gallium/auxiliary/cso_cache/cso_cache.c @@ -188,7 +188,9 @@ cso_insert_state(struct cso_cache *sc, void *state) { struct cso_hash *hash = _cso_hash_for_type(sc, type); - sanitize_hash(sc, hash, type, sc->max_size); + + if (type != CSO_SAMPLER) + sanitize_hash(sc, hash, type, sc->max_size); return cso_hash_insert(hash, hash_key, state); } commit c4a76a1eb413ec40328c9c97c5f46e9b70d7e94e Author: Andreas Boll <andreas.boll....@gmail.com> Date: Thu Dec 15 12:36:39 2016 +0100 Bump llvm/libclang build-deps to >= 1:3.9.1. Enables support for OpenCL on AMD Polaris GPUs (Closes: #848173). diff --git a/debian/changelog b/debian/changelog index b8e215f..317e7e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (13.0.2-2) UNRELEASED; urgency=medium + + * Bump llvm/libclang build-deps to >= 1:3.9.1. + - Enables support for OpenCL on AMD Polaris GPUs (Closes: #848173). + + -- Andreas Boll <andreas.boll....@gmail.com> Thu, 15 Dec 2016 12:36:12 +0100 + mesa (13.0.2-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 962d5eb..bedd46a 100644 --- a/debian/control +++ b/debian/control @@ -43,10 +43,10 @@ Build-Depends: python-mako, flex, bison, - llvm-3.9-dev (>= 1:3.9) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], + llvm-3.9-dev (>= 1:3.9.1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf ppc64el], libwayland-dev (>= 1.2.0) [linux-any], - libclang-3.9-dev (>= 1:3.9) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf], + libclang-3.9-dev (>= 1:3.9.1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf], libclc-dev (>= 0.2.0+git20160907) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 arm64 armhf], Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/mesa.git