From d246d9d1dde84770e601bc0b1376588a94c722c3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 6 May 2011 09:39:23 +1000 Subject: [PATCH 01/16] rebase for better nvc0 driver + radeon rv6xx flushing fixes. --- .gitignore | 1 + mesa-nouveau-fix-build.patch | 96 ------------------------------------ mesa.spec | 9 ++-- sources | 1 + 4 files changed, 7 insertions(+), 100 deletions(-) delete mode 100644 mesa-nouveau-fix-build.patch diff --git a/.gitignore b/.gitignore index c72e55f..1d8f174 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ mesa-20100720.tar.bz2 /mesa-20110330.tar.xz /mesa-20110401.tar.xz /mesa-20110412.tar.xz +/mesa-20110506.tar.xz diff --git a/mesa-nouveau-fix-build.patch b/mesa-nouveau-fix-build.patch deleted file mode 100644 index ac8d7ce..0000000 --- a/mesa-nouveau-fix-build.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 9882bff4ce5843b4122a0348acecc7523b9aee22 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Tue, 12 Apr 2011 21:20:48 +1000 -Subject: [PATCH] nouveau_vieux: fix build since sampler objects merge - ---- - src/mesa/drivers/dri/nouveau/nv04_state_tex.c | 8 ++++---- - src/mesa/drivers/dri/nouveau/nv10_state_tex.c | 8 ++++---- - src/mesa/drivers/dri/nouveau/nv20_state_tex.c | 8 ++++---- - 3 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c -index 6c96e58..648d6b1 100644 ---- a/src/mesa/drivers/dri/nouveau/nv04_state_tex.c -+++ b/src/mesa/drivers/dri/nouveau/nv04_state_tex.c -@@ -82,11 +82,11 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit) - - if (t->Sampler.MinFilter != GL_NEAREST && - t->Sampler.MinFilter != GL_LINEAR) { -- lod_max = CLAMP(MIN2(t->MaxLod, t->_MaxLambda), -+ lod_max = CLAMP(MIN2(t->Sampler.MaxLod, t->_MaxLambda), - 0, 15) + 1; - - lod_bias = CLAMP(ctx->Texture.Unit[i].LodBias + -- t->LodBias, -16, 15) * 8; -+ t->Sampler.LodBias, -16, 15) * 8; - } - - format |= nvgl_wrap_mode(t->Sampler.WrapT) << 28 | -@@ -96,9 +96,9 @@ nv04_emit_tex_obj(struct gl_context *ctx, int emit) - lod_max << 12 | - get_tex_format(ti); - -- filter |= log2i(t->MaxAnisotropy) << 31 | -+ filter |= log2i(t->Sampler.MaxAnisotropy) << 31 | - nvgl_filter_mode(t->Sampler.MagFilter) << 28 | -- log2i(t->MaxAnisotropy) << 27 | -+ log2i(t->Sampler.MaxAnisotropy) << 27 | - nvgl_filter_mode(t->Sampler.MinFilter) << 24 | - (lod_bias & 0xff) << 16; - -diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c -index 1d98b19..620a686 100644 ---- a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c -+++ b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c -@@ -183,7 +183,7 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit) - | nvgl_filter_mode(t->Sampler.MinFilter) << 24; - - tx_enable = NV10_3D_TEX_ENABLE_ENABLE -- | log2i(t->MaxAnisotropy) << 4; -+ | log2i(t->Sampler.MaxAnisotropy) << 4; - - if (t->Target == GL_TEXTURE_RECTANGLE) { - BEGIN_RING(chan, celsius, NV10_3D_TEX_NPOT_PITCH(i), 1); -@@ -198,9 +198,9 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit) - - if (t->Sampler.MinFilter != GL_NEAREST && - t->Sampler.MinFilter != GL_LINEAR) { -- int lod_min = t->MinLod; -- int lod_max = MIN2(t->MaxLod, t->_MaxLambda); -- int lod_bias = t->LodBias -+ int lod_min = t->Sampler.MinLod; -+ int lod_max = MIN2(t->Sampler.MaxLod, t->_MaxLambda); -+ int lod_bias = t->Sampler.LodBias - + ctx->Texture.Unit[i].LodBias; - - lod_max = CLAMP(lod_max, 0, 15); -diff --git a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c -index fdbfdf4..eab74ae 100644 ---- a/src/mesa/drivers/dri/nouveau/nv20_state_tex.c -+++ b/src/mesa/drivers/dri/nouveau/nv20_state_tex.c -@@ -195,7 +195,7 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit) - | 2 << 12; - - tx_enable = NV20_3D_TEX_ENABLE_ENABLE -- | log2i(t->MaxAnisotropy) << 4; -+ | log2i(t->Sampler.MaxAnisotropy) << 4; - - if (t->Target == GL_TEXTURE_RECTANGLE) { - BEGIN_RING(chan, kelvin, NV20_3D_TEX_NPOT_PITCH(i), 1); -@@ -210,9 +210,9 @@ nv20_emit_tex_obj(struct gl_context *ctx, int emit) - - if (t->Sampler.MinFilter != GL_NEAREST && - t->Sampler.MinFilter != GL_LINEAR) { -- int lod_min = t->MinLod; -- int lod_max = MIN2(t->MaxLod, t->_MaxLambda); -- int lod_bias = t->LodBias -+ int lod_min = t->Sampler.MinLod; -+ int lod_max = MIN2(t->Sampler.MaxLod, t->_MaxLambda); -+ int lod_bias = t->Sampler.LodBias - + ctx->Texture.Unit[i].LodBias; - - lod_max = CLAMP(lod_max, 0, 15); --- -1.7.4.2 - diff --git a/mesa.spec b/mesa.spec index f10a8a9..c3a9331 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 20110412 +%define gitdate 20110506 #% define snapshot Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.7.%{gitdate}.0%{?dist} +Release: 0.8.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -31,7 +31,6 @@ Source2: %{manpages}.tar.bz2 Source3: make-git-snapshot.sh Source4: llvmcore.mk -Patch1: mesa-nouveau-fix-build.patch Patch2: mesa-7.1-nukeglthread-debug.patch Patch3: mesa-no-mach64.patch Patch4: legacy-drivers.patch @@ -215,7 +214,6 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide %prep #setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2 %setup -q -n mesa-%{gitdate} -b2 -%patch1 -p1 -b .nv-fix %patch2 -p1 -b .intel-glthread %patch3 -p1 -b .no-mach64 %patch4 -p1 -b .classic @@ -488,6 +486,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Fri May 06 2011 Dave Airlie 7.11-0.8.20110506.0 +- rebase for better nvc0 driver + radeon rv6xx flushing fixes. + * Mon Apr 18 2011 Adam Jackson 7.11-0.7.20110412.0 - Fix intel driver exclusion to be better arched (#697555) diff --git a/sources b/sources index ccfda6e..b28395b 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 b8a15e6f9892d004c3407d6a0659fb5b mesa-20110412.tar.xz +fa2d8701bfcbb94d8c89f6c5c8be2c5e mesa-20110506.tar.xz From 3ef8e52022302a463864a06c6f4f0b1fd5d7fec9 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 9 May 2011 08:29:39 +1000 Subject: [PATCH 02/16] fix rv6xx regression in last set of changes (#702872) --- .gitignore | 1 + mesa.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1d8f174..0db8f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ mesa-20100720.tar.bz2 /mesa-20110401.tar.xz /mesa-20110412.tar.xz /mesa-20110506.tar.xz +/mesa-20110509.tar.xz diff --git a/mesa.spec b/mesa.spec index c3a9331..ad8543b 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 20110506 +%define gitdate 20110509 #% define snapshot Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.8.%{gitdate}.0%{?dist} +Release: 0.9.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -486,6 +486,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Mon May 09 2011 Dave Airlie 7.11-0.9.20110509.0 +- fix rv6xx regression in last set of changes (#702872) + * Fri May 06 2011 Dave Airlie 7.11-0.8.20110506.0 - rebase for better nvc0 driver + radeon rv6xx flushing fixes. diff --git a/sources b/sources index b28395b..1fb5c95 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 b8a15e6f9892d004c3407d6a0659fb5b mesa-20110412.tar.xz fa2d8701bfcbb94d8c89f6c5c8be2c5e mesa-20110506.tar.xz +23f54ac3859e8137c4bde6caddcf4a4f mesa-20110509.tar.xz From 11197c122c91bc88c8499a424ed5f6defda9aae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 10 May 2011 12:07:38 +0200 Subject: [PATCH 03/16] r300 needs to be explicitely disabled when with_hardware == 0 --- mesa.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index ad8543b..d184e8f 100644 --- a/mesa.spec +++ b/mesa.spec @@ -18,7 +18,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.9.%{gitdate}.0%{?dist} +Release: 0.10.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -273,11 +273,13 @@ mv libllvmcore*.so %{_lib} %if %{with_hardware} --enable-gallium-llvm \ --enable-gallium-radeon \ + --enable-gallium-r300 \ --enable-gallium-r600 \ --enable-gallium-nouveau \ %else --disable-gallium-llvm \ --disable-gallium-radeon \ + --disable-gallium-r300 \ --disable-gallium-r600 \ --disable-gallium-nouveau \ %endif @@ -486,6 +488,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Tue May 10 2011 Dan Horák 7.11-0.10.20110509.0 +- r300 needs to be explicitely disabled when with_hardware == 0 + * Mon May 09 2011 Dave Airlie 7.11-0.9.20110509.0 - fix rv6xx regression in last set of changes (#702872) From e29109096259b637424d40572bc3e61dd5b7d79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Tue, 10 May 2011 12:08:45 +0200 Subject: [PATCH 04/16] remove old sources --- sources | 2 -- 1 file changed, 2 deletions(-) diff --git a/sources b/sources index 1fb5c95..5a07852 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -b8a15e6f9892d004c3407d6a0659fb5b mesa-20110412.tar.xz -fa2d8701bfcbb94d8c89f6c5c8be2c5e mesa-20110506.tar.xz 23f54ac3859e8137c4bde6caddcf4a4f mesa-20110509.tar.xz From aa62ccdcd5684dcd24fc3fa07d212a028ea14601 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 25 May 2011 18:14:38 +1000 Subject: [PATCH 05/16] rebase to latest upstream for llvm fix + r600g cayman/eg support --- .gitignore | 1 + mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0db8f1b..e6f0865 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ mesa-20100720.tar.bz2 /mesa-20110412.tar.xz /mesa-20110506.tar.xz /mesa-20110509.tar.xz +/mesa-20110525.tar.xz diff --git a/mesa.spec b/mesa.spec index d184e8f..52e7f67 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 20110509 +%define gitdate 20110525 #% define snapshot Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.10.%{gitdate}.0%{?dist} +Release: 0.11.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -488,6 +488,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Wed May 25 2011 Dave Airlie 7.11-0.11.20110525.0 +- rebase to latest upstream for llvm fix + r600g cayman/eg support + * Tue May 10 2011 Dan Horák 7.11-0.10.20110509.0 - r300 needs to be explicitely disabled when with_hardware == 0 diff --git a/sources b/sources index 5a07852..78ebd12 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -23f54ac3859e8137c4bde6caddcf4a4f mesa-20110509.tar.xz +693ba8fe0fdd6bdf460c93f6f8db5db1 mesa-20110525.tar.xz From 3faf4cdb3117e934c5235463ca4819afd4ec74a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 30 May 2011 13:10:47 +0200 Subject: [PATCH 06/16] fix the gallium p_config header for non-x86 arches (Dave Airlie) --- mesa-20110525-gallium-config.patch | 28 ++++++++++++++++++++++++++++ mesa.spec | 10 +++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 mesa-20110525-gallium-config.patch diff --git a/mesa-20110525-gallium-config.patch b/mesa-20110525-gallium-config.patch new file mode 100644 index 0000000..7b3c84c --- /dev/null +++ b/mesa-20110525-gallium-config.patch @@ -0,0 +1,28 @@ +From: Dave Airlie + +We are getting inconsistent methods for endian detection (same answer when +it works, just doesn't work on some platforms) depending on whether __GLIBC__ +is defined, which of course depends on include ordering before p_config.h + +Just make p_config.h include limits.h to solve this. + +Signed-off-by: Dave Airlie +--- + src/gallium/include/pipe/p_config.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h +index 1818c8b..40f6f2b 100644 +--- a/src/gallium/include/pipe/p_config.h ++++ b/src/gallium/include/pipe/p_config.h +@@ -46,7 +46,7 @@ + #ifndef P_CONFIG_H_ + #define P_CONFIG_H_ + +- ++#include + /* + * Compiler + */ +-- +1.7.4.4 diff --git a/mesa.spec b/mesa.spec index 52e7f67..2d1e999 100644 --- a/mesa.spec +++ b/mesa.spec @@ -18,7 +18,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.11.%{gitdate}.0%{?dist} +Release: 0.12.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -41,6 +41,9 @@ Patch8: mesa-7.10-llvmcore.patch Patch30: mesa-7.6-hush-vblank-warning.patch Patch31: mesa-7.10-swrastg.patch +# build fix +Patch40: mesa-20110525-gallium-config.patch + BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6 @@ -225,6 +228,8 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide %patch8 -p1 -b .llvmcore %endif +%patch40 -p1 -b .header-order + %build autoreconf --install @@ -488,6 +493,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Mon May 30 2011 Dan Horák 7.11-0.12.20110525.0 +- fix the gallium p_config header for non-x86 arches (Dave Airlie) + * Wed May 25 2011 Dave Airlie 7.11-0.11.20110525.0 - rebase to latest upstream for llvm fix + r600g cayman/eg support From 3b26e3f924f449f077d7a8c35c4b78b76add33ef Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 6 Jun 2011 10:52:28 +1000 Subject: [PATCH 07/16] nouveau: fix shell segfault on pre-gallium drivers --- mesa-7.11-nouveau-old-gs.patch | 26 ++++++++++++++++++++++++++ mesa.spec | 8 ++++++++ 2 files changed, 34 insertions(+) create mode 100644 mesa-7.11-nouveau-old-gs.patch diff --git a/mesa-7.11-nouveau-old-gs.patch b/mesa-7.11-nouveau-old-gs.patch new file mode 100644 index 0000000..dbd8a1b --- /dev/null +++ b/mesa-7.11-nouveau-old-gs.patch @@ -0,0 +1,26 @@ +From 1d24e6ec1d13c2b88b858997900aa8b69de92b13 Mon Sep 17 00:00:00 2001 +From: Ben Skeggs +Date: Mon, 6 Jun 2011 10:17:59 +1000 +Subject: [PATCH] dri/nouveau: fix gnome-shell segfault + +Signed-off-by: Ben Skeggs +--- + src/mesa/drivers/dri/nouveau/nouveau_context.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c +index 71dde41..22b9957 100644 +--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c ++++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c +@@ -261,7 +261,7 @@ nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw) + assert(!ret); + } + +- _mesa_resize_framebuffer(NULL, fb, draw->w, draw->h); ++ _mesa_resize_framebuffer(ctx, fb, draw->w, draw->h); + } + + static void +-- +1.7.5.2 + diff --git a/mesa.spec b/mesa.spec index 2d1e999..55e8aca 100644 --- a/mesa.spec +++ b/mesa.spec @@ -44,6 +44,9 @@ Patch31: mesa-7.10-swrastg.patch # build fix Patch40: mesa-20110525-gallium-config.patch +# fix gnome-shell on pre-nv30 chipsets +Patch41: mesa-7.11-nouveau-old-gs.patch + BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6 @@ -230,6 +233,8 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide %patch40 -p1 -b .header-order +%patch41 -p1 -b .vieux-gs + %build autoreconf --install @@ -493,6 +498,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Mon Jul 06 2011 Ben Skeggs 7.11-0.13.20110525.0 +- nouveau: fix shell segfault on pre-gallium drivers (#708004) + * Mon May 30 2011 Dan Horák 7.11-0.12.20110525.0 - fix the gallium p_config header for non-x86 arches (Dave Airlie) From 026565821ed8c46700ee3f6fa5982430018cf376 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 6 Jun 2011 11:13:53 +1000 Subject: [PATCH 08/16] ugh, need more coffee, bump version number.. --- mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index 55e8aca..188e67c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -18,7 +18,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.12.%{gitdate}.0%{?dist} +Release: 0.13.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org From 02e68ef39fddd7a849220ad84168d998e2f0a826 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 21 Jun 2011 13:25:44 +1000 Subject: [PATCH 09/16] update to latest mesa 7.11 with nvfx g-s fix. --- legacy-drivers.patch | 20 ++++++++++---------- mesa-20110525-gallium-config.patch | 28 ---------------------------- mesa-7.1-nukeglthread-debug.patch | 16 ++++++++-------- mesa-7.11-nouveau-old-gs.patch | 26 -------------------------- mesa-no-mach64.patch | 30 +++++++++++++++--------------- mesa.spec | 19 ++++++------------- 6 files changed, 39 insertions(+), 100 deletions(-) delete mode 100644 mesa-20110525-gallium-config.patch delete mode 100644 mesa-7.11-nouveau-old-gs.patch diff --git a/legacy-drivers.patch b/legacy-drivers.patch index 3b99a79..e9b964b 100644 --- a/legacy-drivers.patch +++ b/legacy-drivers.patch @@ -1,12 +1,12 @@ -diff -up mesa-20100529/configure.ac.nouveau mesa-20100529/configure.ac ---- mesa-20100529/configure.ac.nouveau 2010-05-29 18:57:30.000000000 +1000 -+++ mesa-20100529/configure.ac 2010-05-29 18:58:24.000000000 +1000 -@@ -820,20 +820,20 @@ if test "$mesa_driver" = dri; then +diff -up mesa-20110620/configure.ac.classic mesa-20110620/configure.ac +--- mesa-20110620/configure.ac.classic 2011-06-20 13:52:52.000000000 +1000 ++++ mesa-20110620/configure.ac 2011-06-20 13:55:09.000000000 +1000 +@@ -1023,20 +1023,20 @@ if test "$mesa_driver" = dri -o "$mesa_d # x86-64 system where they could *ever* be used. if test "x$DRI_DIRS" = "xyes"; then - DRI_DIRS="i915 i965 mga r128 r200 r300 r600 radeon \ -- savage tdfx unichrome swrast" -+ savage tdfx unichrome nouveau" + DRI_DIRS="i915 i965 mga nouveau r128 r200 r300 r600 \ +- radeon savage tdfx unichrome swrast" ++ radeon savage tdfx unichrome" fi ;; powerpc*) @@ -25,12 +25,12 @@ diff -up mesa-20100529/configure.ac.nouveau mesa-20100529/configure.ac fi ;; esac -@@ -870,7 +870,7 @@ if test "$mesa_driver" = dri; then +@@ -1080,7 +1080,7 @@ if test "$mesa_driver" = dri -o "$mesa_d # default drivers if test "x$DRI_DIRS" = "xyes"; then - DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon \ + DRI_DIRS="i810 i915 i965 mga nouveau r128 r200 r300 r600 radeon \ - savage sis tdfx unichrome swrast" -+ savage sis tdfx unichrome nouveau" ++ savage sis tdfx unichrome" fi DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/ */ /g'` diff --git a/mesa-20110525-gallium-config.patch b/mesa-20110525-gallium-config.patch deleted file mode 100644 index 7b3c84c..0000000 --- a/mesa-20110525-gallium-config.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Dave Airlie - -We are getting inconsistent methods for endian detection (same answer when -it works, just doesn't work on some platforms) depending on whether __GLIBC__ -is defined, which of course depends on include ordering before p_config.h - -Just make p_config.h include limits.h to solve this. - -Signed-off-by: Dave Airlie ---- - src/gallium/include/pipe/p_config.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/gallium/include/pipe/p_config.h b/src/gallium/include/pipe/p_config.h -index 1818c8b..40f6f2b 100644 ---- a/src/gallium/include/pipe/p_config.h -+++ b/src/gallium/include/pipe/p_config.h -@@ -46,7 +46,7 @@ - #ifndef P_CONFIG_H_ - #define P_CONFIG_H_ - -- -+#include - /* - * Compiler - */ --- -1.7.4.4 diff --git a/mesa-7.1-nukeglthread-debug.patch b/mesa-7.1-nukeglthread-debug.patch index 642e505..a55ea31 100644 --- a/mesa-7.1-nukeglthread-debug.patch +++ b/mesa-7.1-nukeglthread-debug.patch @@ -1,15 +1,15 @@ -diff -up mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c.dave mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c ---- mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c.dave 2010-05-30 18:24:35.000000000 +1000 -+++ mesa-20100529/src/mesa/drivers/dri/intel/intel_fbo.c 2010-05-30 18:24:42.000000000 +1000 -@@ -558,11 +558,6 @@ intel_render_texture(GLcontext * ctx, +diff -up mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c.da mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c +--- mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c.da 2011-06-20 13:51:25.000000000 +1000 ++++ mesa-20110620/src/mesa/drivers/dri/intel/intel_fbo.c 2011-06-20 13:51:32.000000000 +1000 +@@ -612,11 +612,6 @@ intel_render_texture(struct gl_context * return; } - DBG("Begin render texture tid %lx tex=%u w=%d h=%d refcount=%d\n", - _glthread_GetID(), -- att->Texture->Name, newImage->Width, newImage->Height, +- att->Texture->Name, image->Width, image->Height, - irb->Base.RefCount); - - /* point the renderbufer's region to the texture image region */ - if (irb->region != intel_image->mt->region) { - if (irb->region) + intel_renderbuffer_set_draw_offset(irb, intel_image, att->Zoffset); + intel_image->used_as_render_target = GL_TRUE; + diff --git a/mesa-7.11-nouveau-old-gs.patch b/mesa-7.11-nouveau-old-gs.patch deleted file mode 100644 index dbd8a1b..0000000 --- a/mesa-7.11-nouveau-old-gs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1d24e6ec1d13c2b88b858997900aa8b69de92b13 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs -Date: Mon, 6 Jun 2011 10:17:59 +1000 -Subject: [PATCH] dri/nouveau: fix gnome-shell segfault - -Signed-off-by: Ben Skeggs ---- - src/mesa/drivers/dri/nouveau/nouveau_context.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c -index 71dde41..22b9957 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_context.c -+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c -@@ -261,7 +261,7 @@ nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw) - assert(!ret); - } - -- _mesa_resize_framebuffer(NULL, fb, draw->w, draw->h); -+ _mesa_resize_framebuffer(ctx, fb, draw->w, draw->h); - } - - static void --- -1.7.5.2 - diff --git a/mesa-no-mach64.patch b/mesa-no-mach64.patch index 7c8d48a..a1a91cd 100644 --- a/mesa-no-mach64.patch +++ b/mesa-no-mach64.patch @@ -1,16 +1,16 @@ -diff -up mesa-20100529/configure.ac.mach64 mesa-20100529/configure.ac ---- mesa-20100529/configure.ac.mach64 2010-05-29 11:31:22.000000000 +1000 -+++ mesa-20100529/configure.ac 2010-05-29 18:53:55.000000000 +1000 -@@ -819,7 +819,7 @@ if test "$mesa_driver" = dri; then +diff -up mesa-20110620/configure.ac.no-mach64 mesa-20110620/configure.ac +--- mesa-20110620/configure.ac.no-mach64 2011-06-20 12:19:16.000000000 +1000 ++++ mesa-20110620/configure.ac 2011-06-20 13:52:27.000000000 +1000 +@@ -1022,7 +1022,7 @@ if test "$mesa_driver" = dri -o "$mesa_d # the new interface. i810 are missing because there is no # x86-64 system where they could *ever* be used. if test "x$DRI_DIRS" = "xyes"; then -- DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \ -+ DRI_DIRS="i915 i965 mga r128 r200 r300 r600 radeon \ - savage tdfx unichrome swrast" +- DRI_DIRS="i915 i965 mach64 mga nouveau r128 r200 r300 r600 \ ++ DRI_DIRS="i915 i965 mga nouveau r128 r200 r300 r600 \ + radeon savage tdfx unichrome swrast" fi ;; -@@ -827,13 +827,13 @@ if test "$mesa_driver" = dri; then +@@ -1030,13 +1030,13 @@ if test "$mesa_driver" = dri -o "$mesa_d # Build only the drivers for cards that exist on PowerPC. # At some point MGA will be added, but not yet. if test "x$DRI_DIRS" = "xyes"; then @@ -26,21 +26,21 @@ diff -up mesa-20100529/configure.ac.mach64 mesa-20100529/configure.ac fi ;; esac -@@ -850,7 +850,7 @@ if test "$mesa_driver" = dri; then +@@ -1050,7 +1050,7 @@ if test "$mesa_driver" = dri -o "$mesa_d fi if test "x$DRI_DIRS" = "xyes"; then -- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ -+ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon tdfx \ - unichrome savage sis swrast" +- DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 \ ++ DRI_DIRS="i810 i915 i965 mga nouveau r128 r200 r300 r600 \ + radeon tdfx unichrome savage sis swrast" fi ;; -@@ -869,7 +869,7 @@ if test "$mesa_driver" = dri; then +@@ -1079,7 +1079,7 @@ if test "$mesa_driver" = dri -o "$mesa_d # default drivers if test "x$DRI_DIRS" = "xyes"; then -- DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \ -+ DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon \ +- DRI_DIRS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \ ++ DRI_DIRS="i810 i915 i965 mga nouveau r128 r200 r300 r600 radeon \ savage sis tdfx unichrome swrast" fi diff --git a/mesa.spec b/mesa.spec index 188e67c..5b847a9 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 20110525 +%define gitdate 20110621 #% define snapshot Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.13.%{gitdate}.0%{?dist} +Release: 0.14.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -41,12 +41,6 @@ Patch8: mesa-7.10-llvmcore.patch Patch30: mesa-7.6-hush-vblank-warning.patch Patch31: mesa-7.10-swrastg.patch -# build fix -Patch40: mesa-20110525-gallium-config.patch - -# fix gnome-shell on pre-nv30 chipsets -Patch41: mesa-7.11-nouveau-old-gs.patch - BuildRequires: pkgconfig autoconf automake libtool %if %{with_hardware} BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6 @@ -231,10 +225,6 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide %patch8 -p1 -b .llvmcore %endif -%patch40 -p1 -b .header-order - -%patch41 -p1 -b .vieux-gs - %build autoreconf --install @@ -498,7 +488,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog -* Mon Jul 06 2011 Ben Skeggs 7.11-0.13.20110525.0 +* Tue Jun 21 2011 Dave Airlie 7.11-0.14.20110621.0 +- update to latest mesa 7.11 with nvfx g-s fix. + +* Mon Jun 06 2011 Ben Skeggs 7.11-0.13.20110525.0 - nouveau: fix shell segfault on pre-gallium drivers (#708004) * Mon May 30 2011 Dan Horák 7.11-0.12.20110525.0 From 7561c1002a6c739a872c1da408f18a33c582dd0d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 21 Jun 2011 13:29:59 +1000 Subject: [PATCH 10/16] fix configure logic --- mesa.spec | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/mesa.spec b/mesa.spec index 5b847a9..97e3c1e 100644 --- a/mesa.spec +++ b/mesa.spec @@ -233,9 +233,9 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" %ifarch %{ix86} # i do not have words for how much the assembly dispatch code infuriates me -%define common_flags --enable-selinux --enable-pic --enable-udev --disable-asm +%define common_flags --enable-selinux --enable-pic --disable-asm %else -%define common_flags --enable-selinux --enable-pic --enable-udev +%define common_flags --enable-selinux --enable-pic %endif %define osmesa_flags --with-driver=osmesa %{common_flags} --disable-gallium --with-dri-drivers="" --disable-glu --disable-egl @@ -263,25 +263,16 @@ mv libllvmcore*.so %{_lib} --disable-gl-osmesa \ --with-driver=dri \ --with-dri-driverdir=%{_libdir}/dri \ - --with-state-trackers=dri,glx \ --enable-egl \ --enable-gles1 \ --enable-gles2 \ - --disable-gallium-intel \ - --disable-gallium-svga \ --disable-gallium-egl \ %if %{with_hardware} --enable-gallium-llvm \ - --enable-gallium-radeon \ - --enable-gallium-r300 \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ + --with-gallium-drivers=r300,r600,nouveau,swrast \ %else --disable-gallium-llvm \ - --disable-gallium-radeon \ - --disable-gallium-r300 \ - --disable-gallium-r600 \ - --disable-gallium-nouveau \ + --with-gallium-drivers="" \ %endif %{?dri_drivers} From a2f4cee3d4c2e08e5aa3bf666da0642881729e5f Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 21 Jun 2011 13:34:35 +1000 Subject: [PATCH 11/16] fix sources + no hw case --- .gitignore | 1 + mesa.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e6f0865..3b72f2d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ mesa-20100720.tar.bz2 /mesa-20110506.tar.xz /mesa-20110509.tar.xz /mesa-20110525.tar.xz +/mesa-20110621.tar.xz diff --git a/mesa.spec b/mesa.spec index 97e3c1e..c3374b0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -272,7 +272,7 @@ mv libllvmcore*.so %{_lib} --with-gallium-drivers=r300,r600,nouveau,swrast \ %else --disable-gallium-llvm \ - --with-gallium-drivers="" \ + --with-gallium-drivers=swrast \ %endif %{?dri_drivers} diff --git a/sources b/sources index 78ebd12..9d357c0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -693ba8fe0fdd6bdf460c93f6f8db5db1 mesa-20110525.tar.xz +eb02c9ec823dcaa4cc3184c9a4bf406e mesa-20110621.tar.xz From 16c38d36b8c128c539d5a8a8b3b9d2f3b99f814a Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 22 Jun 2011 09:30:51 +1000 Subject: [PATCH 12/16] disable gallium drivers in osmesa case --- mesa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index c3374b0..4c8f166 100644 --- a/mesa.spec +++ b/mesa.spec @@ -237,7 +237,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" %else %define common_flags --enable-selinux --enable-pic %endif -%define osmesa_flags --with-driver=osmesa %{common_flags} --disable-gallium --with-dri-drivers="" --disable-glu --disable-egl +%define osmesa_flags --with-driver=osmesa %{common_flags} --disable-gallium --with-dri-drivers="" --disable-glu --disable-egl --with-gallium-drivers="" # first, build osmesa. From ead41204724443371e5ae620f64bb97a7ff3f7ae Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sun, 26 Jun 2011 07:39:19 +1000 Subject: [PATCH 13/16] update to latest mesa 7.11 with intel gen5 fix --- .gitignore | 1 + mesa-intel-snb-regression-reverts.patch | 125 ------------------------ mesa.spec | 7 +- sources | 2 +- 4 files changed, 7 insertions(+), 128 deletions(-) delete mode 100644 mesa-intel-snb-regression-reverts.patch diff --git a/.gitignore b/.gitignore index 3b72f2d..ec2d631 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ mesa-20100720.tar.bz2 /mesa-20110509.tar.xz /mesa-20110525.tar.xz /mesa-20110621.tar.xz +/mesa-20110626.tar.xz diff --git a/mesa-intel-snb-regression-reverts.patch b/mesa-intel-snb-regression-reverts.patch deleted file mode 100644 index 9b33f62..0000000 --- a/mesa-intel-snb-regression-reverts.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c -index 32ee37f..21ce92c 100644 ---- a/src/mesa/drivers/dri/i965/brw_eu_emit.c -+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c -@@ -52,35 +52,6 @@ static void guess_execution_size(struct brw_compile *p, - } - - --/** -- * Prior to Sandybridge, the SEND instruction accepted non-MRF source -- * registers, implicitly moving the operand to a message register. -- * -- * On Sandybridge, this is no longer the case. This function performs the -- * explicit move; it should be called before emitting a SEND instruction. -- */ --static void --gen6_resolve_implied_move(struct brw_compile *p, -- struct brw_reg *src, -- GLuint msg_reg_nr) --{ -- struct intel_context *intel = &p->brw->intel; -- if (intel->gen != 6) -- return; -- -- if (src->file == BRW_ARCHITECTURE_REGISTER_FILE && src->nr == BRW_ARF_NULL) -- return; -- -- brw_push_insn_state(p); -- brw_set_mask_control(p, BRW_MASK_DISABLE); -- brw_set_compression_control(p, BRW_COMPRESSION_NONE); -- brw_MOV(p, retype(brw_message_reg(msg_reg_nr), BRW_REGISTER_TYPE_UD), -- retype(*src, BRW_REGISTER_TYPE_UD)); -- brw_pop_insn_state(p); -- *src = brw_message_reg(msg_reg_nr); --} -- -- - static void brw_set_dest(struct brw_compile *p, - struct brw_instruction *insn, - struct brw_reg dest) -@@ -1800,7 +1771,6 @@ void brw_dp_READ_4_vs_relative(struct brw_compile *p, - GLuint bind_table_index) - { - struct intel_context *intel = &p->brw->intel; -- struct brw_reg src = brw_vec8_grf(0, 0); - int msg_type; - - /* Setup MRF[1] with offset into const buffer */ -@@ -1817,7 +1787,6 @@ void brw_dp_READ_4_vs_relative(struct brw_compile *p, - addr_reg, brw_imm_d(offset)); - brw_pop_insn_state(p); - -- gen6_resolve_implied_move(p, &src, 0); - struct brw_instruction *insn = next_insn(p, BRW_OPCODE_SEND); - - insn->header.predicate_control = BRW_PREDICATE_NONE; -@@ -1826,7 +1795,7 @@ void brw_dp_READ_4_vs_relative(struct brw_compile *p, - insn->header.mask_control = BRW_MASK_DISABLE; - - brw_set_dest(p, insn, dest); -- brw_set_src0(insn, src); -+ brw_set_src0(insn, brw_vec8_grf(0, 0)); - - if (intel->gen == 6) - msg_type = GEN6_DATAPORT_READ_MESSAGE_OWORD_DUAL_BLOCK_READ; -@@ -1997,7 +1966,20 @@ void brw_SAMPLE(struct brw_compile *p, - { - struct brw_instruction *insn; - -- gen6_resolve_implied_move(p, &src0, msg_reg_nr); -+ /* Sandybridge doesn't have the implied move for SENDs, -+ * and the first message register index comes from src0. -+ */ -+ if (intel->gen >= 6) { -+ if (src0.file != BRW_ARCHITECTURE_REGISTER_FILE || -+ src0.nr != BRW_ARF_NULL) { -+ brw_push_insn_state(p); -+ brw_set_mask_control( p, BRW_MASK_DISABLE ); -+ brw_set_compression_control(p, BRW_COMPRESSION_NONE); -+ brw_MOV(p, retype(brw_message_reg(msg_reg_nr), src0.type), src0); -+ brw_pop_insn_state(p); -+ } -+ src0 = brw_message_reg(msg_reg_nr); -+ } - - insn = next_insn(p, BRW_OPCODE_SEND); - insn->header.predicate_control = 0; /* XXX */ -@@ -2052,7 +2034,17 @@ void brw_urb_WRITE(struct brw_compile *p, - struct intel_context *intel = &p->brw->intel; - struct brw_instruction *insn; - -- gen6_resolve_implied_move(p, &src0, msg_reg_nr); -+ /* Sandybridge doesn't have the implied move for SENDs, -+ * and the first message register index comes from src0. -+ */ -+ if (intel->gen >= 6) { -+ brw_push_insn_state(p); -+ brw_set_mask_control( p, BRW_MASK_DISABLE ); -+ brw_MOV(p, retype(brw_message_reg(msg_reg_nr), BRW_REGISTER_TYPE_UD), -+ retype(src0, BRW_REGISTER_TYPE_UD)); -+ brw_pop_insn_state(p); -+ src0 = brw_message_reg(msg_reg_nr); -+ } - - insn = next_insn(p, BRW_OPCODE_SEND); - -@@ -2162,7 +2154,17 @@ void brw_ff_sync(struct brw_compile *p, - struct intel_context *intel = &p->brw->intel; - struct brw_instruction *insn; - -- gen6_resolve_implied_move(p, &src0, msg_reg_nr); -+ /* Sandybridge doesn't have the implied move for SENDs, -+ * and the first message register index comes from src0. -+ */ -+ if (intel->gen >= 6) { -+ brw_push_insn_state(p); -+ brw_set_mask_control( p, BRW_MASK_DISABLE ); -+ brw_MOV(p, retype(brw_message_reg(msg_reg_nr), BRW_REGISTER_TYPE_UD), -+ retype(src0, BRW_REGISTER_TYPE_UD)); -+ brw_pop_insn_state(p); -+ src0 = brw_message_reg(msg_reg_nr); -+ } - - insn = next_insn(p, BRW_OPCODE_SEND); - brw_set_dest(p, insn, dest); diff --git a/mesa.spec b/mesa.spec index 4c8f166..6344b0e 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 20110621 +%define gitdate 20110626 #% define snapshot Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.14.%{gitdate}.0%{?dist} +Release: 0.15.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -479,6 +479,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Sun Jun 26 2011 Dave Airlie 7.11-0.15.20110626.0 +- update to latest mesa 7.11 with intel gen5 fix + * Tue Jun 21 2011 Dave Airlie 7.11-0.14.20110621.0 - update to latest mesa 7.11 with nvfx g-s fix. diff --git a/sources b/sources index 9d357c0..a436985 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -eb02c9ec823dcaa4cc3184c9a4bf406e mesa-20110621.tar.xz +c4b7098a3d258aad640b5f438cc208e0 mesa-20110626.tar.xz From 320f2645c2531857e7558cb548428a34a655cf40 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 9 Jul 2011 17:22:25 +1000 Subject: [PATCH 14/16] 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(-) create mode 100644 mesa-7.11-gm45-fix.patch 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@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: +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@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@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mail=mesa-dev-bounces+airlied=gmail.com@lists.freedesktop.org +Received: from gabe.freedesktop.org (localhost [127.0.0.1]) + by gabe.freedesktop.org (Postfix) with ESMTP id A8EE4A089E + for ; Fri, 8 Jul 2011 16:07:36 -0700 (PDT) +X-Original-To: mesa-dev@lists.freedesktop.org +Delivered-To: mesa-dev@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 +To: mesa-dev@lists.freedesktop.org +Date: Fri, 8 Jul 2011 15:48:16 -0700 +Message-Id: <1310165296-29051-1-git-send-email-eric@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@lists.freedesktop.org +X-Mailman-Version: 2.1.11 +Precedence: list +List-Id: "For discussion about development of the Mesa code." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +MIME-Version: 1.0 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Sender: mesa-dev-bounces+airlied=gmail.com@lists.freedesktop.org +Errors-To: mesa-dev-bounces+airlied=gmail.com@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@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 7.11-0.16.20110709.0 +- update to latest 7.11 with additional gm45 regression fix + * Sun Jun 26 2011 Dave Airlie 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 From d07dd4ab5e80f1dbd65c30041fbe3663c9ca8bae Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 29 Jul 2011 02:57:51 +1000 Subject: [PATCH 15/16] latest mesa snapshot of 7.11 branch --- .gitignore | 1 + mesa-7.11-gm45-fix.patch | 88 ---------------------------------------- mesa.spec | 9 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 93 deletions(-) delete mode 100644 mesa-7.11-gm45-fix.patch diff --git a/.gitignore b/.gitignore index 4966559..3db0fa8 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ mesa-20100720.tar.bz2 /mesa-20110621.tar.xz /mesa-20110626.tar.xz /mesa-20110709.tar.xz +/mesa-20110729.tar.xz diff --git a/mesa-7.11-gm45-fix.patch b/mesa-7.11-gm45-fix.patch deleted file mode 100644 index 5651e71..0000000 --- a/mesa-7.11-gm45-fix.patch +++ /dev/null @@ -1,88 +0,0 @@ - -Delivered-To: airlied@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: -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@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@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mail=mesa-dev-bounces+airlied=gmail.com@lists.freedesktop.org -Received: from gabe.freedesktop.org (localhost [127.0.0.1]) - by gabe.freedesktop.org (Postfix) with ESMTP id A8EE4A089E - for ; Fri, 8 Jul 2011 16:07:36 -0700 (PDT) -X-Original-To: mesa-dev@lists.freedesktop.org -Delivered-To: mesa-dev@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 -To: mesa-dev@lists.freedesktop.org -Date: Fri, 8 Jul 2011 15:48:16 -0700 -Message-Id: <1310165296-29051-1-git-send-email-eric@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@lists.freedesktop.org -X-Mailman-Version: 2.1.11 -Precedence: list -List-Id: "For discussion about development of the Mesa code." - -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Transfer-Encoding: 7bit -Sender: mesa-dev-bounces+airlied=gmail.com@lists.freedesktop.org -Errors-To: mesa-dev-bounces+airlied=gmail.com@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@lists.freedesktop.org -http://lists.freedesktop.org/mailman/listinfo/mesa-dev diff --git a/mesa.spec b/mesa.spec index 9da8908..4725755 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 20110709 +%define gitdate 20110729 #% define snapshot Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.16.%{gitdate}.0%{?dist} +Release: 0.17.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -40,7 +40,6 @@ 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} @@ -221,7 +220,6 @@ 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 @@ -481,6 +479,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Fri Jul 29 2011 Dave Airlie 7.11-0.17.20110729.0 +- latest mesa snapshot of 7.11 branch + * Sat Jul 09 2011 Dave Airlie 7.11-0.16.20110709.0 - update to latest 7.11 with additional gm45 regression fix diff --git a/sources b/sources index 98e4729..85b5ef2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -ca7528e9e4811b907269024058a8e1d0 mesa-20110709.tar.xz +1a3ef3490b91a3f2346a4bf88d00c3fe mesa-20110729.tar.xz From 130f9152845dad1ecf3197bf5b9828c3a25b2dc7 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 30 Jul 2011 00:11:34 +1000 Subject: [PATCH 16/16] latest 7.11-rc4 --- .gitignore | 1 + mesa.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3db0fa8..e161efa 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ mesa-20100720.tar.bz2 /mesa-20110626.tar.xz /mesa-20110709.tar.xz /mesa-20110729.tar.xz +/mesa-20110730.tar.xz diff --git a/mesa.spec b/mesa.spec index 4725755..6df670b 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 20110729 +%define gitdate 20110730 #% define snapshot Summary: Mesa graphics libraries Name: mesa Version: 7.11 -Release: 0.17.%{gitdate}.0%{?dist} +Release: 0.18.%{gitdate}.0%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -479,6 +479,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libOSMesa.so %changelog +* Sat Jul 30 2011 Dave Airlie 7.11-0.18.20110730.0 +- latest 7.11-rc4 + * Fri Jul 29 2011 Dave Airlie 7.11-0.17.20110729.0 - latest mesa snapshot of 7.11 branch diff --git a/sources b/sources index 85b5ef2..8311068 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2 -1a3ef3490b91a3f2346a4bf88d00c3fe mesa-20110729.tar.xz +b834a9ae95534743931a7e8a900b4272 mesa-20110730.tar.xz