[mesa/f15] update to latest 7.11 with additional gm45 regression fix
Dave Airlie
airlied at fedoraproject.org
Sat Jul 9 07:22:25 UTC 2011
commit 320f2645c2531857e7558cb548428a34a655cf40
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Jul 9 17:22:25 2011 +1000
update to latest 7.11 with additional gm45 regression fix
.gitignore | 1 +
mesa-7.11-gm45-fix.patch | 88 ++++++++++++++++++++++++++++++++++++++++++++++
mesa.spec | 9 ++++-
sources | 2 +-
4 files changed, 97 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec2d631..4966559 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ mesa-20100720.tar.bz2
/mesa-20110525.tar.xz
/mesa-20110621.tar.xz
/mesa-20110626.tar.xz
+/mesa-20110709.tar.xz
diff --git a/mesa-7.11-gm45-fix.patch b/mesa-7.11-gm45-fix.patch
new file mode 100644
index 0000000..5651e71
--- /dev/null
+++ b/mesa-7.11-gm45-fix.patch
@@ -0,0 +1,88 @@
+
+Delivered-To: airlied at gmail.com
+Received: by 10.216.48.73 with SMTP id u51cs50311web;
+ Fri, 8 Jul 2011 16:20:21 -0700 (PDT)
+Received: by 10.68.55.225 with SMTP id v1mr3424881pbp.15.1310166457511;
+ Fri, 08 Jul 2011 16:07:37 -0700 (PDT)
+Return-Path: <mesa-dev-bounces+airlied=gmail.com at lists.freedesktop.org>
+Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
+ by mx.google.com with ESMTP id u20si57111251wfu.81.2011.07.08.16.07.36;
+ Fri, 08 Jul 2011 16:07:37 -0700 (PDT)
+Received-SPF: pass (google.com: domain of mesa-dev-bounces+airlied=gmail.com at lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177;
+Authentication-Results: mx.google.com; spf=pass (google.com: domain of mesa-dev-bounces+airlied=gmail.com at lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mail=mesa-dev-bounces+airlied=gmail.com at lists.freedesktop.org
+Received: from gabe.freedesktop.org (localhost [127.0.0.1])
+ by gabe.freedesktop.org (Postfix) with ESMTP id A8EE4A089E
+ for <airlied at gmail.com>; Fri, 8 Jul 2011 16:07:36 -0700 (PDT)
+X-Original-To: mesa-dev at lists.freedesktop.org
+Delivered-To: mesa-dev at lists.freedesktop.org
+Received: from annarchy.freedesktop.org (annarchy.freedesktop.org
+ [131.252.210.176])
+ by gabe.freedesktop.org (Postfix) with ESMTP id 8392F9E9F7;
+ Fri, 8 Jul 2011 15:48:17 -0700 (PDT)
+Received: from pollan.anholt.net (annarchy.freedesktop.org [127.0.0.1])
+ by annarchy.freedesktop.org (Postfix) with ESMTP id 76A46130125;
+ Fri, 8 Jul 2011 15:48:17 -0700 (PDT)
+Received: by pollan.anholt.net (Postfix, from userid 1000)
+ id 59AF4C0410C; Fri, 8 Jul 2011 15:48:16 -0700 (PDT)
+From: Eric Anholt <eric at anholt.net>
+To: mesa-dev at lists.freedesktop.org
+Date: Fri, 8 Jul 2011 15:48:16 -0700
+Message-Id: <1310165296-29051-1-git-send-email-eric at anholt.net>
+X-Mailer: git-send-email 1.7.5.4
+Subject: [Mesa-dev] [PATCH] i965/gen4: Fix GPU hangs since the program
+ streaming change.
+X-BeenThere: mesa-dev at lists.freedesktop.org
+X-Mailman-Version: 2.1.11
+Precedence: list
+List-Id: "For discussion about development of the Mesa code."
+ <mesa-dev.lists.freedesktop.org>
+List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/mesa-dev>,
+ <mailto:mesa-dev-request at lists.freedesktop.org?subject=unsubscribe>
+List-Archive: <http://lists.freedesktop.org/archives/mesa-dev>
+List-Post: <mailto:mesa-dev at lists.freedesktop.org>
+List-Help: <mailto:mesa-dev-request at lists.freedesktop.org?subject=help>
+List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/mesa-dev>,
+ <mailto:mesa-dev-request at lists.freedesktop.org?subject=subscribe>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+Sender: mesa-dev-bounces+airlied=gmail.com at lists.freedesktop.org
+Errors-To: mesa-dev-bounces+airlied=gmail.com at lists.freedesktop.org
+
+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
+---
+ src/mesa/drivers/dri/i965/brw_vs_state.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c
+index f171a8a..fc4373a 100644
+--- a/src/mesa/drivers/dri/i965/brw_vs_state.c
++++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
+@@ -48,6 +48,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 +
+@@ -55,7 +56,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,
+--
+1.7.5.4
+
+_______________________________________________
+mesa-dev mailing list
+mesa-dev at lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/mesa-dev
diff --git a/mesa.spec b/mesa.spec
index 6344b0e..9da8908 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -12,13 +12,13 @@
%define _default_patch_fuzz 2
%define manpages gl-manpages-1.0.1
-%define gitdate 20110626
+%define gitdate 20110709
#% define snapshot
Summary: Mesa graphics libraries
Name: mesa
Version: 7.11
-Release: 0.15.%{gitdate}.0%{?dist}
+Release: 0.16.%{gitdate}.0%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
@@ -40,6 +40,7 @@ Patch8: mesa-7.10-llvmcore.patch
Patch30: mesa-7.6-hush-vblank-warning.patch
Patch31: mesa-7.10-swrastg.patch
+Patch32: mesa-7.11-gm45-fix.patch
BuildRequires: pkgconfig autoconf automake libtool
%if %{with_hardware}
@@ -220,6 +221,7 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide
#patch7 -p1 -b .dricore
%patch30 -p1 -b .vblank-warning
#patch31 -p1 -b .swrastg
+%patch32 -p1 -b .gm45
%if %{with_llvmcore}
%patch8 -p1 -b .llvmcore
@@ -479,6 +481,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libOSMesa.so
%changelog
+* Sat Jul 09 2011 Dave Airlie <airlied at redhat.com> 7.11-0.16.20110709.0
+- update to latest 7.11 with additional gm45 regression fix
+
* Sun Jun 26 2011 Dave Airlie <airlied at redhat.com> 7.11-0.15.20110626.0
- update to latest mesa 7.11 with intel gen5 fix
diff --git a/sources b/sources
index a436985..98e4729 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
-c4b7098a3d258aad640b5f438cc208e0 mesa-20110626.tar.xz
+ca7528e9e4811b907269024058a8e1d0 mesa-20110709.tar.xz
More information about the scm-commits
mailing list