Add a patch from upstream master to disable msaa on nv3x/nv4x (#1008089)

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

.gitignore

@@ -77,7 +77,17 @@ mesa-20100720.tar.bz2
 /mesa-20140608.tar.xz
 /mesa-20140625.tar.xz
 /mesa-20140711.tar.xz
-/mesa-f381c27c548aa28b003c8e188f5d627ab4105f76.tar.xz
-/mesa-c40d7d6d948912a4d51cbf8f0854cf2ebe916636.tar.xz
-/mesa-e7f2f2dea5acdbd1a12ed88914e64a38a97432f0.tar.xz
-/mesa-c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f.tar.xz
+/mesa-20140806.tar.xz
+/mesa-20140824.tar.xz
+/mesa-20140906.tar.xz
+/mesa-20140927.tar.xz
+/mesa-20141028.tar.xz
+/mesa-20141110.tar.xz
+/mesa-20141202.tar.xz
+/mesa-20141207.tar.xz
+/mesa-20141214.tar.xz
+/mesa-20141230.tar.xz
+/mesa-20150112.tar.xz
+/mesa-20150124.tar.xz
+/mesa-20150220.tar.xz
+/mesa-20150323.tar.xz

0001-nv30-Disable-msaa-unless-requested-from-the-env-by-N.patch

@@ -0,0 +1,82 @@
+From 3e9df0e3af7a8a84147ae48f588e9c435bf65b98 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Wed, 9 Sep 2015 15:52:09 +0200
+Subject: [PATCH mesa] nv30: Disable msaa unless requested from the env by
+ NV30_MAX_MSAA
+
+Some modern apps try to use msaa without keeping in mind the
+restrictions on videomem of older cards. Resulting in dmesg saying:
+
+ [ 1197.850642] nouveau E[soffice.bin[3785]] fail ttm_validate
+ [ 1197.850648] nouveau E[soffice.bin[3785]] validating bo list
+ [ 1197.850654] nouveau E[soffice.bin[3785]] validate: -12
+
+Because we are running out of video memory, after which the program
+using the msaa visual freezes, and eventually the entire system freezes.
+
+To work around this we do not allow msaa visauls by default and allow
+the user to override this via NV30_MAX_MSAA.
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+[imirkin: move env var lookup to screen so that it's only done once]
+Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
+Cc: "10.6 11.0" <mesa-stable@lists.freedesktop.org>
+---
+ src/gallium/drivers/nouveau/nv30/nv30_screen.c | 20 +++++++++++++++++++-
+ src/gallium/drivers/nouveau/nv30/nv30_screen.h |  2 ++
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
+index 7aad26b..efa3a59 100644
+--- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
++++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
+@@ -310,8 +310,9 @@ nv30_screen_is_format_supported(struct p
+                                 unsigned sample_count,
+                                 unsigned bindings)
+ {
+-   if (sample_count > 4)
++   if (sample_count > nv30_screen(pscreen)->max_sample_count)
+       return FALSE;
++
+    if (!(0x00000017 & (1 << sample_count)))
+       return FALSE;
+ 
+@@ -441,6 +442,23 @@ nv30_screen_create(struct nouveau_device
+       return NULL;
+    }
+ 
++   /*
++    * Some modern apps try to use msaa without keeping in mind the
++    * restrictions on videomem of older cards. Resulting in dmesg saying:
++    * [ 1197.850642] nouveau E[soffice.bin[3785]] fail ttm_validate
++    * [ 1197.850648] nouveau E[soffice.bin[3785]] validating bo list
++    * [ 1197.850654] nouveau E[soffice.bin[3785]] validate: -12
++    *
++    * Because we are running out of video memory, after which the program
++    * using the msaa visual freezes, and eventually the entire system freezes.
++    *
++    * To work around this we do not allow msaa visauls by default and allow
++    * the user to override this via NV30_MAX_MSAA.
++    */
++   screen->max_sample_count = debug_get_num_option("NV30_MAX_MSAA", 0);
++   if (screen->max_sample_count > 4)
++      screen->max_sample_count = 4;
++
+    pscreen = &screen->base.base;
+    pscreen->destroy = nv30_screen_destroy;
+    pscreen->get_param = nv30_screen_get_param;
+diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.h b/src/gallium/drivers/nouveau/nv30/nv30_screen.h
+index 7b17b88..df11233 100644
+--- a/src/gallium/drivers/nouveau/nv30/nv30_screen.h
++++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.h
+@@ -38,6 +38,8 @@ struct nv30_screen {
+    /*XXX: nvfx state */
+    struct nouveau_heap *vp_exec_heap;
+    struct nouveau_heap *vp_data_heap;
++
++   unsigned max_sample_count;
+ };
+ 
+ static INLINE struct nv30_screen *
+-- 
+2.4.3

make-git-snapshot.sh

@@ -13,7 +13,7 @@ fi
 
 if [ -z "$1" ]; then
   DIRNAME=mesa-$( date +%Y%m%d )
-  BRANCH=10.2
+  BRANCH=10.4
 else
   DIRNAME=mesa-$1
   BRANCH=master

mesa-10.3-bigendian-assert.patch

@@ -0,0 +1,13 @@
+diff -up mesa-20140824/src/gallium/auxiliary/util/u_math.h.be mesa-20140824/src/gallium/auxiliary/util/u_math.h
+--- mesa-20140824/src/gallium/auxiliary/util/u_math.h.be	2014-08-28 15:30:32.560480333 +0200
++++ mesa-20140824/src/gallium/auxiliary/util/u_math.h	2014-08-28 15:30:56.275479755 +0200
+@@ -55,6 +55,9 @@ extern "C" {
+ #include <strings.h> /* for ffs */
+ #endif
+ 
++#ifdef PIPE_ARCH_BIG_ENDIAN
++#include <assert.h>
++#endif
+ 
+ #ifndef M_SQRT2
+ #define M_SQRT2 1.41421356237309504880

mesa.spec

@@ -3,17 +3,12 @@
 %define with_wayland 0
 %else
 %define with_private_llvm 0
-%define with_vdpau 1
 %define with_wayland 1
 %endif
 
-%ifarch ppc64le
-%undefine with_vdpau
-%endif
-
 # S390 doesn't have video cards, but we need swrast for xserver's GLX
 # llvm (and thus llvmpipe) doesn't actually work on ppc32
-%ifnarch s390 ppc  ppc64le
+%ifnarch s390 ppc
 %define with_llvm 1
 %endif
 
@@ -22,13 +17,16 @@
 %define with_radeonsi 1
 %endif
 
-%ifarch s390 s390x ppc64le ppc
+%ifarch s390 s390x ppc
 %define with_hardware 0
 %define base_drivers swrast
 %endif
-%ifnarch s390 s390x ppc64le ppc
+%ifnarch s390 s390x ppc
 %define with_hardware 1
-%define base_drivers nouveau,radeon,r200
+%define with_vdpau 1
+%define with_vaapi 1
+%define with_nine 1
+%define base_drivers swrast,nouveau,radeon,r200
 %ifarch %{ix86} x86_64
 %define platform_drivers ,i915,i965
 %define with_vmware 1
@@ -47,14 +45,14 @@
 
 %define _default_patch_fuzz 2
 
-#% define gitdate 20140510
-%define githash c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
+%define gitdate 20150323
+#% define githash c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
 %define git %{?githash:%{githash}}%{!?githash:%{gitdate}}
 
 Summary: Mesa graphics libraries
 Name: mesa
-Version: 10.4
-Release: 0.devel.1.%{git}%{?dist}
+Version: 10.4.7
+Release: 2.%{git}%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -75,10 +73,14 @@ Patch9: mesa-8.0-llvmpipe-shmget.patch
 Patch12: mesa-8.0.1-fix-16bpp.patch
 Patch15: mesa-9.2-hardware-float.patch
 Patch20: mesa-10.2-evergreen-big-endian.patch
+Patch30: mesa-10.3-bigendian-assert.patch
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=73512
 Patch99: 0001-opencl-use-versioned-.so-in-mesa.icd.patch
 
+# upstream fix for msaa issues on nv3x/nv4x
+Patch100: 0001-nv30-Disable-msaa-unless-requested-from-the-env-by-N.patch
+
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
 BuildRequires: kernel-headers
@@ -121,6 +123,9 @@ BuildRequires: mesa-libGL-devel
 %if 0%{?with_vdpau}
 BuildRequires: libvdpau-devel
 %endif
+%if 0%{?with_vaapi}
+BuildRequires: libva-devel
+%endif
 BuildRequires: zlib-devel
 %if 0%{?with_omx}
 BuildRequires: libomxil-bellagio-devel
@@ -322,6 +327,21 @@ Requires: mesa-libOpenCL%{?_isa} = %{version}-%{release}
 Mesa OpenCL development package.
 %endif
 
+%if 0%{?with_nine}
+%package libd3d
+Summary: Mesa Direct3D9 state tracker
+
+%description libd3d
+Mesa Direct3D9 state tracker
+
+%package libd3d-devel
+Summary: Mesa Direct3D9 state tracker development package
+Requires: mesa-libd3d%{?_isa} = %{version}-%{release}
+
+%description libd3d-devel
+Mesa Direct3D9 state tracker development package
+%endif
+
 %prep
 #setup -q -n Mesa-%{version}%{?snapshot}
 %setup -q -n mesa-%{git}
@@ -341,11 +361,14 @@ grep -q ^/ src/gallium/auxiliary/vl/vl_decoder.c && exit 1
 
 %patch15 -p1 -b .hwfloat
 %patch20 -p1 -b .egbe
+%patch30 -p1 -b .beassert
 
 %if 0%{?with_opencl}
 %patch99 -p1 -b .icd
 %endif
 
+%patch100 -p1
+
 %if 0%{with_private_llvm}
 sed -i 's/llvm-config/mesa-private-llvm-config-%{__isa_bits}/g' configure.ac
 sed -i 's/`$LLVM_CONFIG --version`/&-mesa/' configure.ac
@@ -377,11 +400,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
     --enable-egl \
     --disable-gles1 \
     --enable-gles2 \
-%if %{with_hardware}
-    --enable-gallium-egl \
-%endif
     --disable-xvmc \
     %{?with_vdpau:--enable-vdpau} \
+    %{?with_vaapi:--enable-va} \
     --with-egl-platforms=x11,drm%{?with_wayland:,wayland} \
     --enable-shared-glapi \
     --enable-gbm \
@@ -394,6 +415,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
     --enable-dri \
 %if %{with_hardware}
     %{?with_xa:--enable-xa} \
+    %{?with_nine:--enable-nine} \
     --with-gallium-drivers=%{?with_vmware:svga,}%{?with_radeonsi:radeonsi,}%{?with_llvm:swrast,r600,}%{?with_freedreno:freedreno,}r300,nouveau \
 %else
     --with-gallium-drivers=%{?with_llvm:swrast} \
@@ -467,6 +489,10 @@ rm -rf $RPM_BUILD_ROOT
 %post libOpenCL -p /sbin/ldconfig
 %postun libOpenCL -p /sbin/ldconfig
 %endif
+%if 0%{?with_nine}
+%post libd3d -p /sbin/ldconfig
+%postun libd3d -p /sbin/ldconfig
+%endif
 
 %files libGL
 %defattr(-,root,root,-)
@@ -479,10 +505,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/COPYING
 %{_libdir}/libEGL.so.1
 %{_libdir}/libEGL.so.1.*
-%if %{with_hardware}
-%dir %{_libdir}/egl
-%{_libdir}/egl/egl_gallium.so
-%endif
 
 %files libGLES
 %defattr(-,root,root,-)
@@ -532,11 +554,18 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?with_vmware}
 %{_libdir}/dri/vmwgfx_dri.so
 %endif
+%endif
+%if 0%{?with_llvm}
+%ifarch %{ix86} x86_64
 %dir %{_libdir}/gallium-pipe
 %{_libdir}/gallium-pipe/*.so
 %endif
-%{_libdir}/dri/swrast_dri.so
 %{_libdir}/dri/kms_swrast_dri.so
+%endif
+%{_libdir}/dri/swrast_dri.so
+%if 0%{?with_vaapi}
+%{_libdir}/dri/gallium_drv_video.so
+%endif
 
 %if %{with_hardware}
 %if 0%{?with_omx}
@@ -548,6 +577,7 @@ rm -rf $RPM_BUILD_ROOT
 %files vdpau-drivers
 %defattr(-,root,root,-)
 %{_libdir}/vdpau/libvdpau_nouveau.so.1*
+%{_libdir}/vdpau/libvdpau_r300.so.1*
 %if 0%{?with_llvm}
 %{_libdir}/vdpau/libvdpau_r600.so.1*
 %if 0%{?with_radeonsi}
@@ -616,10 +646,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/COPYING
 %{_libdir}/libgbm.so.1
 %{_libdir}/libgbm.so.1.*
-%if %{with_hardware}
-%dir %{_libdir}/gbm
-%{_libdir}/gbm/gbm_gallium_drm.so
-%endif
 
 %files libgbm-devel
 %defattr(-,root,root,-)
@@ -669,24 +695,90 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libMesaOpenCL.so
 %endif
 
+%if 0%{?with_nine}
+%files libd3d
+%dir %{_libdir}/d3d/
+%{_libdir}/d3d/*.so.*
+
+%files libd3d-devel
+%{_libdir}/pkgconfig/d3d.pc
+%{_includedir}/d3dadapter/
+%{_libdir}/d3d/*.so
+%endif
+
 # Generate changelog using:
 # git log old_commit_sha..new_commit_sha --format="- %H: %s (%an)"
 %changelog
-* Sat Aug 23 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.4-0.devel.1.c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
-- 10.4 c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f
+* Fri Sep 11 2015 Hans de Goede <hdegoede@redhat.com> - 10.4.7-2.20150323
+- Add a patch from upstream master to disable msaa on nv3x/nv4x (#1008089)
 
-* Fri Aug 22 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.rc1.1.e7f2f2dea5acdbd1a12ed88914e64a38a97432f0
-- e7f2f2dea5acdbd1a12ed88914e64a38a97432f0 commit
+* Mon Mar 23 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.4.7-1.20150323
+- 10.4.7
 
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.3-0.devel.2.c40d7d6d948912a4d51cbf8f0854cf2ebe916636.1
+* Fri Feb 20 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 10.4.4-1.20150220
+- 10.4.4
+
+* Sat Jan 24 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 10.4.3-1.20150124
+- 10.4.3
+
+* Mon Jan 12 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 10.4.2-1.20150112
+- 10.4.2
+
+* Tue Dec 30 2014 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 10.4.1-1.20141230
+- 10.4.1
+
+* Fri Dec 19 2014 Dan Horák <dan[at]danny.cz> 10.4.0-4
+- fix build on s390(x) by moving the with_{nine,vaapi,vdpau} options under the with_hardware case
+
+* Thu Dec 18 2014 Adam Jackson <ajax@redhat.com> 10.4.0-3
+- Restore hardware drivers on ppc64{,le}
+
+* Wed Dec 17 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.4.0-2.20141214
+- fix requirements for d3d
+
+* Sun Dec 14 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.4.0-1.20141214
+- 10.4.0
+- Enable VA state-tracker
+- Remove dropped Gallium EGL state tracker
+- Enable Nine state-tracker (Direct3D9 API)
+- Add vdpau_r300 packaging
+
+* Fri Dec 12 2014 Adam Jackson <ajax@redhat.com> 10.3.5-2
+- Rebuild for LLVM 3.5
+
+* Sun Dec 07 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.5-1.20141207
+- 10.3.5
+
+* Tue Dec 02 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.4-1.20141202
+- 10.3.4
+
+* Mon Nov 10 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.3-1.20141110
+- 10.3.3
+
+* Tue Oct 28 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3.2-1.20141028
+- 10.3.2
+
+* Sat Sep 27 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-1.20140927
+- 10.3
+
+* Sat Sep 06 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.rc3.1.20140906
+- 10.3-rc3
+
+* Fri Aug 29 2014 Karsten Hopp <karsten@redhat.com> 10.3-0.rc1.2.20140824
+- fix ppc64/ppc64le filelists
+- fix missing include on bigendian
+
+* Sun Aug 24 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.rc1.1.20140824
+- add swrast to dri driver list
+
+* Sun Aug 24 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.rc1.20140824
+- 10.3-rc1
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 10.2.5-2.20140806
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
-* Wed Aug 06 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.devel.2.c40d7d6d948912a4d51cbf8f0854cf2ebe916636
-- c40d7d6d948912a4d51cbf8f0854cf2ebe916636 commit
-
-* Fri Jul 11 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.3-0.devel.1.f381c27c548aa28b003c8e188f5d627ab4105f76
-- Rebase to 'master' branch (f381c27c548aa28b003c8e188f5d627ab4105f76 commit)
-
+* Wed Aug 06 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.5-1.20140806
+- 10.2.5 upstream release (RHBZ #1126223)
 * Fri Jul 11 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 10.2.3-1.20140711
 - 10.2.3 upstream release
 

sources

@@ -1 +1 @@
-47debe611a8154fc008719ef7549b9f5  mesa-c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f.tar.xz
+fd774278d58f5a80734d22922e22d284  mesa-20150323.tar.xz