[arch-commits] Commit in mesa/trunk (PKGBUILD git_fixes.patch)

[andyrtr at archlinux.org]

    Date: Sunday, July 10, 2011 @ 05:28:29
  Author: andyrtr
Revision: 131079

upgpkg: mesa 7.11rc1-2
add one late upstream fix that should solve FS#25080

Added:
  mesa/trunk/git_fixes.patch
Modified:
  mesa/trunk/PKGBUILD

-----------------+
 PKGBUILD        |    6 ++++--
 git_fixes.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-10 02:10:58 UTC (rev 131078)
+++ PKGBUILD	2011-07-10 09:28:29 UTC (rev 131079)
@@ -14,13 +14,13 @@
   else
     pkgver=7.11rc1
 fi
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 
              'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(LICENSE)
+source=(LICENSE git_fixes.patch)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
@@ -30,12 +30,14 @@
 )
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+         '62b7e9591737846ff0e98f970ffc8b78'
          '2246d97eb0cfb1f6d2bf8a54b533d07f')
 
 build() {
     cd ${srcdir}/?esa-*   
 
 if [ "${_git}" = "true" ]; then
+    patch -Np1 -i ${srcdir}/git_fixes.patch
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \

Added: git_fixes.patch
===================================================================
--- git_fixes.patch	                        (rev 0)
+++ git_fixes.patch	2011-07-10 09:28:29 UTC (rev 131079)
@@ -0,0 +1,36 @@
+From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric at anholt.net>
+Date: Fri, 08 Jul 2011 22:30:48 +0000
+Subject: i965/gen4: Fix GPU hangs since the program streaming change.
+
+This was tricky.  We were doing a use-before-initialize of
+grf_reg_count, but the value usually got overwritten anyway -- when we
+didn't have to do a relocation (typical), or on gen5 when we didn't
+have relocations at all.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771
+Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
+(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7)
+---
+diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c
+index d5010a2..179ca19 100644
+--- a/src/mesa/drivers/dri/i965/brw_vs_state.c
++++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
+@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw)
+    memset(vs, 0, sizeof(*vs));
+ 
+    /* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */
++   vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
+    vs->thread0.kernel_start_pointer =
+       brw_program_reloc(brw,
+ 			brw->vs.state_offset +
+@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw)
+ 			brw->vs.prog_offset +
+ 			(vs->thread0.grf_reg_count << 1)) >> 6;
+ 
+-   vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
+    vs->thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
+    /* Choosing multiple program flow means that we may get 2-vertex threads,
+     * which will have the channel mask for dwords 4-7 enabled in the thread,
+--
+cgit v0.8.3-6-g21f6