xserver-xorg-video-intel: Changes to 'ubuntu'

2013-04-09 Thread Timo Aaltonen 
 ChangeLog|  386 +++
 NEWS |   30 +++
 configure.ac |   22 ++
 debian/changelog |   15 +
 src/intel_display.c  |   77 +++-
 src/intel_dri.c  |   14 +
 src/sna/blt.c|4 
 src/sna/compiler.h   |6 
 src/sna/gen4_render.c|   70 ---
 src/sna/gen4_vertex.c|  354 ++-
 src/sna/gen5_render.c|9 -
 src/sna/gen6_render.c|9 -
 src/sna/gen7_render.c|   25 +-
 src/sna/gen7_render.h|2 
 src/sna/kgem.c   |   47 +++--
 src/sna/kgem.h   |2 
 src/sna/sna_accel.c  |   54 --
 src/sna/sna_cpu.c|   24 ++
 src/sna/sna_display.c|   78 
 src/sna/sna_dri.c|   45 +++--
 src/sna/sna_io.c |   25 --
 src/sna/sna_render.c |2 
 src/sna/sna_video_textured.c |5 
 23 files changed, 1164 insertions(+), 141 deletions(-)

New commits:
commit 1ec867cb883eff7df971cab802d4da99ae7c625d
Author: Timo Aaltonen 
Date:   Tue Apr 9 21:05:45 2013 +0300

release to raring

diff --git a/debian/changelog b/debian/changelog
index e5fcc6d..434fc7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.6-0ubuntu1) raring; urgency=low
+
+  * Merge from unreleased debian git
+- new upstream minor release (LP: #1162046)
+
+ -- Timo Aaltonen   Tue, 09 Apr 2013 17:31:20 +0300
+
 xserver-xorg-video-intel (2:2.21.6-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]

commit 107503b8d1fa8c9feff3992d59ae976005dd8759
Author: Timo Aaltonen 
Date:   Mon Apr 8 14:03:16 2013 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index b6dbf4b..38312d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,389 @@
+commit 678279eb373310f1a71a3d74e5a500b343e98830
+Author: Chris Wilson 
+Date:   Sat Apr 6 15:58:50 2013 +0100
+
+2.21.6 release
+
+commit 5332d5a7e055042233e279385bfe1388adfe15fa
+Author: Chris Wilson 
+Date:   Sat Apr 6 15:42:23 2013 +0100
+
+configure: Allow valgrind support to be manually enabled
+
+Irrespective of the DDX debug settings, some people wish to run Xorg
+under valgrind and so prefer to have the cleaner output by making the
+DDX valgrind aware.
+
+(Actually Maarten wants valgrind support enabled by default...)
+
+Suggested-by: Maarten Lankhorst 
+Signed-off-by: Chris Wilson 
+
+commit 091cf6f0477824c5826547c02394752b6dc944ce
+Author: Chris Wilson 
+Date:   Sat Apr 6 09:30:57 2013 +0100
+
+sna: Improve assertions to detect rogue priv->cpu status
+
+Signed-off-by: Chris Wilson 
+
+commit 4a43aa81e27e8a651fde8a4761fd14bd8824d90c
+Author: Chris Wilson 
+Date:   Thu Apr 4 10:53:55 2013 +0100
+
+sna: Restore bo->flush status for large bo
+
+Since we started discarding the flush flags on cached bo (in order to
+prevent DRI flush states leaking), we failed to preserve the flush flag
+for large bo (which uses it to keep batches trim and other hints).
+
+Signed-off-by: Chris Wilson 
+
+commit ed3dab44a717a1a88470228b5e33f20de1e4ad0d
+Author: Chris Wilson 
+Date:   Tue Apr 2 15:20:52 2013 +0100
+
+sna: Adjust userptr structure for implicit padding
+
+Signed-off-by: Chris Wilson 
+
+commit 4e2fc5aee035c3059ca33dbcafc71dc5988d6b09
+Author: Chris Wilson 
+Date:   Tue Apr 2 14:29:29 2013 +0100
+
+sna: Relax scanline waits on HSW to be emittable from either ring
+
+My overzealous reading of the bspec lead me to the conclusion that the
+MI_LOAD_SCANLINES command was only available on the blitter ring. This
+is false, thankfully, and allows us to do vsync'ed Xv.
+
+Signed-off-by: Chris Wilson 
+
+commit 5a36fdcee769195d5c6e642e84a8976114e7c6de
+Author: Chris Wilson 
+Date:   Tue Apr 2 11:01:53 2013 +0100
+
+sna/gen4: Kill stray debugging ErrorF from previous commit
+
+Signed-off-by: Chris Wilson 
+
+commit 3d7e16addb2fb5f35936aafe8e16685a91d30f59
+Author: Chris Wilson 
+Date:   Tue Apr 2 10:58:52 2013 +0100
+
+sna/gen4: Break the Video rendering loop into 16 rectangle chunks
+
+If we feed more than 16 rectangles into the video rendering pipeline,
+the GPU goes crazy and starts emitting corruption. Lalalala.
+
+Bugzilla: 
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1162046
+Signed-off-by: Chris Wilson 
+
+commit f09aa788d79d36688bcfdd3b49b92367590c5f16
+Author: Chris Wilson 
+Date:   Tue Apr 2 10:01:21 2013 +0100
+
+DRI2GetMSC: Do not send a bogus ust for when the drawable is not displayed
+
+According to the opengl glx_sync_control spec, the Unadjusted System Time
+(or UST) is a 64-bit monotonically increasing counter that is available
+throughout the system:
+http://www.opengl.org/registry/specs/OML/glx_sync_control.txt
+

xserver-xorg-video-intel: Changes to 'upstream-experimental'

2013-04-09 Thread Timo Aaltonen 
 NEWS |   30 +++
 configure.ac |   22 ++
 src/intel_display.c  |   77 -
 src/intel_dri.c  |   14 +
 src/sna/blt.c|4 
 src/sna/compiler.h   |6 
 src/sna/gen4_render.c|   70 +---
 src/sna/gen4_vertex.c|  354 ++-
 src/sna/gen5_render.c|9 -
 src/sna/gen6_render.c|9 -
 src/sna/gen7_render.c|   25 +--
 src/sna/gen7_render.h|2 
 src/sna/kgem.c   |   47 +++--
 src/sna/kgem.h   |2 
 src/sna/sna_accel.c  |   54 --
 src/sna/sna_cpu.c|   24 ++
 src/sna/sna_display.c|   78 +
 src/sna/sna_dri.c|   45 +++--
 src/sna/sna_io.c |   25 ---
 src/sna/sna_render.c |2 
 src/sna/sna_video_textured.c |5 
 21 files changed, 767 insertions(+), 137 deletions(-)

New commits:
commit 678279eb373310f1a71a3d74e5a500b343e98830
Author: Chris Wilson 
Date:   Sat Apr 6 15:58:50 2013 +0100

2.21.6 release

diff --git a/NEWS b/NEWS
index 05a20fa..4fc9a6b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,33 @@
+Release 2.21.6 (2013-04-06)
+===
+A surprising highlight of this release is a little refresh to the KMS
+support for OpenBSD. OpenBSD now has its own KMS implementation which is
+mostly compatible with the interface in Linux, with one or two tweaks
+supplied by Mark Kettenis. This release continues to cleanup behaviour
+for Haswell.
+
+ * Workaround a failure by the xserver to invalidate DRI buffers
+   following a pixmap change for XComposite redirection.
+   https://bugs.freedesktop.org/show_bug.cgi?id=62614
+
+ * Fix computation of clip extents for stippling
+   https://bugs.freedesktop.org/show_bug.cgi?id=62618
+
+ * Support KMS on OpenBSD, by Mark Kettenis
+
+ * Clean up sockets upon CloseScreen (making ourselves better behaved
+   for muxed setups).
+
+ * Fix the tests for AVX/AVX2 support in CPUID and remember to check for
+   OS support as well.
+
+ * Report a monotonic UST value for undisplayed drawables rather than 0
+   by Daniel Kurtz
+
+ * Fix video playback on gen4 through a complex clip (more gen4 GPU woes)
+   
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1162046
+
+
 Release 2.21.5 (2013-03-21)
 ===
 Haswell reintroduces a command to load the scanline window from the
diff --git a/configure.ac b/configure.ac
index 794b383..fa82507 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-intel],
-[2.21.5],
+[2.21.6],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-video-intel])
 AC_CONFIG_SRCDIR([Makefile.am])

commit 5332d5a7e055042233e279385bfe1388adfe15fa
Author: Chris Wilson 
Date:   Sat Apr 6 15:42:23 2013 +0100

configure: Allow valgrind support to be manually enabled

Irrespective of the DDX debug settings, some people wish to run Xorg
under valgrind and so prefer to have the cleaner output by making the
DDX valgrind aware.

(Actually Maarten wants valgrind support enabled by default...)

Suggested-by: Maarten Lankhorst 
Signed-off-by: Chris Wilson 

diff --git a/configure.ac b/configure.ac
index 8b12d01..794b383 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,12 @@ AC_ARG_ENABLE(debug,
 [Enables internal debugging [default=no]]),
   [DEBUG="$enableval"],
   [DEBUG=no])
+AC_ARG_ENABLE(valgrind,
+ AS_HELP_STRING([--enable-valgrind],
+[Enables valgrindified ioctls for debugging 
[default=no]]),
+  [VG="$enableval"],
+  [VG=no])
+
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -439,12 +445,22 @@ AM_CONDITIONAL(DEBUG, test x$DEBUG != xno)
 AM_CONDITIONAL(FULL_DEBUG, test x$DEBUG = xfull)
 if test "x$DEBUG" = xno; then
AC_DEFINE(NDEBUG,1,[Disable internal debugging])
+else
+   if test "x$VG" != xyes; then
+   VG=auto
+   fi
 fi
-if test "x$DEBUG" != xno; then
+if test "x$VG" != xno; then
PKG_CHECK_MODULES(VALGRIND, [valgrind], have_valgrind=yes, 
have_valgrind=no)
+   AC_MSG_CHECKING([whether to include valgrind support])
if test x$have_valgrind = xyes; then
AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to 
suppress false warnings])
+   else
+   if test "x$VG" = xyes; then
+   AC_MSG_ERROR([valgrind support requested, but 
valgrind-dev headers not found])
+   fi
fi
+   AC_MSG_RESULT([$have_valgrind ($VG)])
 fi
 if test "x$DEBUG" = xsync; then
AC_DEFINE(DEBUG_SYNC,1,[Enable synchronous rendering for debugging])

xserver-xorg-video-intel: Changes to 'debian-experimental'

2013-04-09 Thread Timo Aaltonen 
 ChangeLog|  386 +++
 NEWS |   30 +++
 configure.ac |   22 ++
 debian/changelog |2 
 src/intel_display.c  |   77 +++-
 src/intel_dri.c  |   14 +
 src/sna/blt.c|4 
 src/sna/compiler.h   |6 
 src/sna/gen4_render.c|   70 ---
 src/sna/gen4_vertex.c|  354 ++-
 src/sna/gen5_render.c|9 -
 src/sna/gen6_render.c|9 -
 src/sna/gen7_render.c|   25 +-
 src/sna/gen7_render.h|2 
 src/sna/kgem.c   |   47 +++--
 src/sna/kgem.h   |2 
 src/sna/sna_accel.c  |   54 --
 src/sna/sna_cpu.c|   24 ++
 src/sna/sna_display.c|   78 
 src/sna/sna_dri.c|   45 +++--
 src/sna/sna_io.c |   25 --
 src/sna/sna_render.c |2 
 src/sna/sna_video_textured.c |5 
 23 files changed, 1154 insertions(+), 138 deletions(-)

New commits:
commit 107503b8d1fa8c9feff3992d59ae976005dd8759
Author: Timo Aaltonen 
Date:   Mon Apr 8 14:03:16 2013 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index b6dbf4b..38312d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,389 @@
+commit 678279eb373310f1a71a3d74e5a500b343e98830
+Author: Chris Wilson 
+Date:   Sat Apr 6 15:58:50 2013 +0100
+
+2.21.6 release
+
+commit 5332d5a7e055042233e279385bfe1388adfe15fa
+Author: Chris Wilson 
+Date:   Sat Apr 6 15:42:23 2013 +0100
+
+configure: Allow valgrind support to be manually enabled
+
+Irrespective of the DDX debug settings, some people wish to run Xorg
+under valgrind and so prefer to have the cleaner output by making the
+DDX valgrind aware.
+
+(Actually Maarten wants valgrind support enabled by default...)
+
+Suggested-by: Maarten Lankhorst 
+Signed-off-by: Chris Wilson 
+
+commit 091cf6f0477824c5826547c02394752b6dc944ce
+Author: Chris Wilson 
+Date:   Sat Apr 6 09:30:57 2013 +0100
+
+sna: Improve assertions to detect rogue priv->cpu status
+
+Signed-off-by: Chris Wilson 
+
+commit 4a43aa81e27e8a651fde8a4761fd14bd8824d90c
+Author: Chris Wilson 
+Date:   Thu Apr 4 10:53:55 2013 +0100
+
+sna: Restore bo->flush status for large bo
+
+Since we started discarding the flush flags on cached bo (in order to
+prevent DRI flush states leaking), we failed to preserve the flush flag
+for large bo (which uses it to keep batches trim and other hints).
+
+Signed-off-by: Chris Wilson 
+
+commit ed3dab44a717a1a88470228b5e33f20de1e4ad0d
+Author: Chris Wilson 
+Date:   Tue Apr 2 15:20:52 2013 +0100
+
+sna: Adjust userptr structure for implicit padding
+
+Signed-off-by: Chris Wilson 
+
+commit 4e2fc5aee035c3059ca33dbcafc71dc5988d6b09
+Author: Chris Wilson 
+Date:   Tue Apr 2 14:29:29 2013 +0100
+
+sna: Relax scanline waits on HSW to be emittable from either ring
+
+My overzealous reading of the bspec lead me to the conclusion that the
+MI_LOAD_SCANLINES command was only available on the blitter ring. This
+is false, thankfully, and allows us to do vsync'ed Xv.
+
+Signed-off-by: Chris Wilson 
+
+commit 5a36fdcee769195d5c6e642e84a8976114e7c6de
+Author: Chris Wilson 
+Date:   Tue Apr 2 11:01:53 2013 +0100
+
+sna/gen4: Kill stray debugging ErrorF from previous commit
+
+Signed-off-by: Chris Wilson 
+
+commit 3d7e16addb2fb5f35936aafe8e16685a91d30f59
+Author: Chris Wilson 
+Date:   Tue Apr 2 10:58:52 2013 +0100
+
+sna/gen4: Break the Video rendering loop into 16 rectangle chunks
+
+If we feed more than 16 rectangles into the video rendering pipeline,
+the GPU goes crazy and starts emitting corruption. Lalalala.
+
+Bugzilla: 
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1162046
+Signed-off-by: Chris Wilson 
+
+commit f09aa788d79d36688bcfdd3b49b92367590c5f16
+Author: Chris Wilson 
+Date:   Tue Apr 2 10:01:21 2013 +0100
+
+DRI2GetMSC: Do not send a bogus ust for when the drawable is not displayed
+
+According to the opengl glx_sync_control spec, the Unadjusted System Time
+(or UST) is a 64-bit monotonically increasing counter that is available
+throughout the system:
+http://www.opengl.org/registry/specs/OML/glx_sync_control.txt
+
+Therefore, sending 0, even in this corner case, is out of spec. However,
+we cannot just return FALSE here as that triggers a BadDrawable error to
+be sent, and as is often the case mishandled, to the client. This results
+in a certain compositor terminating, for example.
+
+As an alternative we can use the monotonic system timestamp which in
+theory should also be monotonic with the previous and subsequent vblank
+times.
+
+Based on a patch by Daniel Kurtz.
+
+Reported-by: Daniel Kurtz 
+Signed-off-by: Chris Wilson

xserver-xorg-video-intel: Changes to 'debian-experimental'

2013-04-09 Thread Maarten Lankhorst 
 debian/changelog |1 +
 debian/rules |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ebd43d99918531e770f5747cfdce914c3803b8eb
Author: Maarten Lankhorst 
Date:   Tue Apr 9 20:20:40 2013 +0200

Enable valgrind by default.

diff --git a/debian/changelog b/debian/changelog
index b2a751d..fce74d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-intel (2:2.21.6-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * Add valgrind to build-depends.
+  * Enable valgrind by default.
 
  -- Timo Aaltonen   Fri, 07 Dec 2012 09:33:39 +0200
 
diff --git a/debian/rules b/debian/rules
index 451de4d..e13426f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ BUILDER:= $(shell dpkg-parsechangelog | awk -F': ' 
'/^Maintainer: / {pri
 
 # Enable SNA, pass builderstring:
 override_dh_auto_configure:
-   dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=uxa 
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))"
+   dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=uxa 
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" 
--enable-valgrind
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1upd9w-0004rg...@vasks.debian.org

xserver-xorg-video-intel: Changes to 'ubuntu'

2013-04-09 Thread Maarten Lankhorst 
 debian/changelog |1 +
 debian/rules |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ebd43d99918531e770f5747cfdce914c3803b8eb
Author: Maarten Lankhorst 
Date:   Tue Apr 9 20:20:40 2013 +0200

Enable valgrind by default.

diff --git a/debian/changelog b/debian/changelog
index b2a751d..fce74d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xserver-xorg-video-intel (2:2.21.6-1) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * Add valgrind to build-depends.
+  * Enable valgrind by default.
 
  -- Timo Aaltonen   Fri, 07 Dec 2012 09:33:39 +0200
 
diff --git a/debian/rules b/debian/rules
index 451de4d..e13426f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ BUILDER:= $(shell dpkg-parsechangelog | awk -F': ' 
'/^Maintainer: / {pri
 
 # Enable SNA, pass builderstring:
 override_dh_auto_configure:
-   dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=uxa 
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))"
+   dh_auto_configure -- --enable-sna --enable-uxa --with-default-accel=uxa 
--with-builderstring="$(SOURCE_NAME) $(SOURCE_VERSION) ($(BUILDER))" 
--enable-valgrind
 
 # Install in debian/tmp to retain control through dh_install:
 override_dh_auto_install:


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1updap-0004t2...@vasks.debian.org

mesa: Changes to 'ubuntu+1'

2013-04-09 Thread Timo Aaltonen 
 debian/changelog|2 
 debian/patches/revert-a64c1eb9b110.diff |  392 
 debian/patches/series   |   37 +--
 3 files changed, 412 insertions(+), 19 deletions(-)

New commits:
commit acaaa5da70d6ee44e781149165fd32c36b5d800c
Author: Timo Aaltonen 
Date:   Wed Apr 10 00:55:49 2013 +0300

revert a64c1eb9b110 instead of using a ton of patches that still doesn't 
fix blur on ILK

diff --git a/debian/changelog b/debian/changelog
index 7c8652a..ff6a1d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mesa (9.1.1-0ubuntu1) UNRELEASED; urgency=low
   [ Timo Aaltonen ]
   * Merge from unreleased debian git
 - new upstream release (LP: #1112147)
-  * Added a bunch of patches to fix slow blur on intel.
+  * Revert a commit to fix slow blur on intel.
   * vbo-fix-crash.diff: Patch from the stable tree that fixes a crasher
 with shared display lists.
 
diff --git a/debian/patches/revert-a64c1eb9b110.diff 
b/debian/patches/revert-a64c1eb9b110.diff
new file mode 100644
index 000..950157f
--- /dev/null
+++ b/debian/patches/revert-a64c1eb9b110.diff
@@ -0,0 +1,392 @@
+--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
 b/src/mesa/drivers/dri/i965/brw_fs.cpp
+@@ -219,45 +219,6 @@ fs_visitor::CMP(fs_reg dst, fs_reg src0,
+return inst;
+ }
+ 
+-exec_list
+-fs_visitor::VARYING_PULL_CONSTANT_LOAD(fs_reg dst, fs_reg surf_index,
+-   fs_reg offset)
+-{
+-   exec_list instructions;
+-   fs_inst *inst;
+-
+-   if (intel->gen >= 7) {
+-  inst = new(mem_ctx) fs_inst(FS_OPCODE_VARYING_PULL_CONSTANT_LOAD_GEN7,
+-  dst, surf_index, offset);
+-  instructions.push_tail(inst);
+-   } else {
+-  int base_mrf = 13;
+-  bool header_present = true;
+-
+-  fs_reg mrf = fs_reg(MRF, base_mrf + header_present);
+-  mrf.type = BRW_REGISTER_TYPE_D;
+-
+-  /* On gen6+ we want the dword offset passed in, but on gen4/5 we need a
+-   * dword-aligned byte offset.
+-   */
+-  if (intel->gen == 6) {
+- instructions.push_tail(MOV(mrf, offset));
+-  } else {
+- instructions.push_tail(MUL(mrf, offset, fs_reg(4)));
+-  }
+-  inst = MOV(mrf, offset);
+-  inst = new(mem_ctx) fs_inst(FS_OPCODE_VARYING_PULL_CONSTANT_LOAD,
+-  dst, surf_index);
+-  inst->header_present = header_present;
+-  inst->base_mrf = base_mrf;
+-  inst->mlen = header_present + dispatch_width / 8;
+-
+-  instructions.push_tail(inst);
+-   }
+-
+-   return instructions;
+-}
+-
+ /**
+  * A helper for MOV generation for fixing up broken hardware SEND dependency
+  * handling.
+@@ -443,7 +404,6 @@ fs_reg::equals(const fs_reg &r) const
+type == r.type &&
+negate == r.negate &&
+abs == r.abs &&
+-   !reladdr && !r.reladdr &&
+memcmp(&fixed_hw_reg, &r.fixed_hw_reg,
+   sizeof(fixed_hw_reg)) == 0 &&
+smear == r.smear &&
+@@ -1561,81 +1521,6 @@ fs_visitor::remove_dead_constants()
+return true;
+ }
+ 
+-/*
+- * Implements array access of uniforms by inserting a
+- * PULL_CONSTANT_LOAD instruction.
+- *
+- * Unlike temporary GRF array access (where we don't support it due to
+- * the difficulty of doing relative addressing on instruction
+- * destinations), we could potentially do array access of uniforms
+- * that were loaded in GRF space as push constants.  In real-world
+- * usage we've seen, though, the arrays being used are always larger
+- * than we could load as push constants, so just always move all
+- * uniform array access out to a pull constant buffer.
+- */
+-void
+-fs_visitor::move_uniform_array_access_to_pull_constants()
+-{
+-   int pull_constant_loc[c->prog_data.nr_params];
+-
+-   for (unsigned int i = 0; i < c->prog_data.nr_params; i++) {
+-  pull_constant_loc[i] = -1;
+-   }
+-
+-   /* Walk through and find array access of uniforms.  Put a copy of that
+-* uniform in the pull constant buffer.
+-*
+-* Note that we don't move constant-indexed accesses to arrays.  No
+-* testing has been done of the performance impact of this choice.
+-*/
+-   foreach_list_safe(node, &this->instructions) {
+-  fs_inst *inst = (fs_inst *)node;
+-
+-  for (int i = 0 ; i < 3; i++) {
+- if (inst->src[i].file != UNIFORM || !inst->src[i].reladdr)
+-continue;
+-
+- int uniform = inst->src[i].reg;
+-
+- /* If this array isn't already present in the pull constant buffer,
+-  * add it.
+-  */
+- if (pull_constant_loc[uniform] == -1) {
+-const float **values = &c->prog_data.param[uniform];
+-
+-pull_constant_loc[uniform] = c->prog_data.nr_pull_params;
+-
+-assert(param_size[uniform]);
+-
+-for (int j = 0; j < param_size[uniform]; j++) {
+-   c->prog_data.pull_param[c->prog_data.nr_pull_p

xserver-xorg-input-evdev: Changes to 'debian-experimental'

2013-04-09 Thread Timo Aaltonen 
 ChangeLog |  380 +-
 autogen.sh|4 
 configure.ac  |3 
 debian/changelog  |2 
 src/Makefile.am   |3 
 src/axis_labels.h |  198 +++
 src/emuMB.c   |4 
 src/emuWheel.c|2 
 src/evdev.c   |  677 ++
 src/evdev.h   |   10 
 10 files changed, 872 insertions(+), 411 deletions(-)

New commits:
commit fa931895b62b07b3fec008079fd7028ef9a952ef
Author: Timo Aaltonen 
Date:   Wed Apr 10 09:29:22 2013 +0300

update the changelogs

diff --git a/ChangeLog b/ChangeLog
index a4aa1cc..89834ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,246 @@
-commit 777cfa148f8b5febaab1330e8df791f2188c046b
+commit 5138cd2ff47a1a28db82688b932cb1ecd618778f
 Author: Peter Hutterer 
-Date:   Mon Aug 13 16:22:00 2012 +1000
+Date:   Tue Mar 26 16:01:39 2013 +1000
 
-evdev 2.7.3
+evdev 2.8.0
 
 Signed-off-by: Peter Hutterer 
 
-commit 447fd220e05752ec9ab388cc78826c297e1b7e24
+commit c085c8b6c1f8e95f6f4d91bc65268fe57154018c
+Author: Peter Hutterer 
+Date:   Tue Feb 12 12:58:08 2013 +1000
+
+Return BadValue if EvdevOpenMTDev fails
+
+FALSE == Success, so if we fail during EvdevOpenMTDev, the caller thinks
+that everything worked fine, proceeds to set up the fd, etc.
+
+This may later cause a crash, when a device comes back later as different
+device and posts axis events where we didn't configure axes in the first
+place.
+
+Note: Unclear why there was no udev event received for the device being
+removed and coming back as different device though.
+
+Signed-off-by: Peter Hutterer 
+
+commit 2b675f85aef6df3bb3fb5e68648982e11b752764
+Author: Peter Hutterer 
+Date:   Tue Feb 12 12:48:38 2013 +1000
+
+Make errors on EVIOCGBIT more obvious
+
+Signed-off-by: Peter Hutterer 
+
+commit 2b8b0df62ec554952784f2820fb4143c495232b0
+Author: Peter Hutterer 
+Date:   Thu Jan 24 16:18:48 2013 +1000
+
+Always init axis mapping for the first two rel axes (#59784)
+
+Fixes regression introduced in 2f67509b53b27dd7f51ca2aadd19605aee613a61.
+
+If evdev is used for touchpads, the abs axis movement is converted to a rel
+movement. Without the two relative axes initialized, the events are
+discarded.
+
+Axes 0 and 1 are always x/y anyway unless specifically configured 
otherwise.
+
+X.Org Bug 59784 
+
+Signed-off-by: Peter Hutterer 
+
+commit bb9b4146cb828bd366675e8736fc145e92c9269a
+Merge: f5fe533 67e5376
+Author: Peter Hutterer 
+Date:   Fri Jan 25 11:12:05 2013 +1000
+
+Merge branch 'touch-axis-swap'
+
+commit f5fe533f1bef0c636b98658aaf40748c219c9879
+Author: Peter Hutterer 
+Date:   Tue Mar 27 12:18:46 2012 +1000
+
+Allow relative scroll valuators on absolute devices (#54387)
+
+Special-case RHEL_WHEEL, RHEL_HWHEEL and REL_DIAL to add scroll valuators
+for those axes in addition to the absolute axes.
+
+X.Org Bug 54387 
+
+Signed-off-by: Peter Hutterer 
+
+commit 2f67509b53b27dd7f51ca2aadd19605aee613a61
+Author: Peter Hutterer 
+Date:   Wed Jan 16 08:38:52 2013 +1000
+
+Split rel and abs axis mapping into two separate arrays
+
+This will enable a device to have relative scrolling axes in addition to
+absolute axes (required by the QEMU tablet).
+
+Signed-off-by: Peter Hutterer 
+
+commit ffc0a34642d5ab573c2ae63c873a5befd8688493
+Author: Peter Hutterer 
+Date:   Tue Jan 15 16:15:47 2013 +1000
+
+Move some stuff into the new alloc function
+
+Signed-off-by: Peter Hutterer 
+
+commit 93de7b0b73d4c5f6f68e3a2ffe8f76b5212ee016
+Author: Peter Hutterer 
+Date:   Tue Jan 15 16:11:16 2013 +1000
+
+Move allocation of EvdevRec into a helper function
+
+Makes it easier to initialise everything to the right values.
+
+Signed-off-by: Peter Hutterer 
+
+commit 9ec9d214d072ef4aaffb65b5575eff58edcb62ed
+Author: Colin Walters 
+Date:   Wed Jan 4 17:37:06 2012 -0500
+
+autogen.sh: Implement GNOME Build API
+
+http://people.gnome.org/~walters/docs/build-api.txt
+
+Signed-off-by: Adam Jackson 
+
+commit 94e6df8f5f6048b8d0c7aa34efe1c0dc70b997d1
+Author: Adam Jackson 
+Date:   Wed Jan 16 13:11:11 2013 -0500
+
+configure: Drop AM_MAINTAINER_MODE
+
+Signed-off-by: Adam Jackson 
+
+commit 67e5376aaa62a1586fee37d610b3ad7e3b8bbcab
+Author: Peter Hutterer 
+Date:   Mon Jan 14 14:45:58 2013 +1000
+
+Handle axis swap, calibration, and inversion for touch events (#59340)
+
+X.Org Bug 59340 
+
+Reported-by: Bastien Nocera 
+Signed-off-by: Peter Hutterer 
+
+commit 2432626b70b7f55a337bcfdc9ba415811634c062
+Author: Peter Hutterer 
+Date:   Mon Jan 14 14:10:14 2013 +1000
+
+Move calibration adjustments to helper functi

xserver-xorg-input-evdev: Changes to 'upstream-experimental'

2013-04-09 Thread Timo Aaltonen 
Rebased ref, commits from common ancestor:
commit 5138cd2ff47a1a28db82688b932cb1ecd618778f
Author: Peter Hutterer 
Date:   Tue Mar 26 16:01:39 2013 +1000

evdev 2.8.0

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index f0d0a78..41d1017 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-evdev],
-[2.7.0],
+[2.8.0],
 [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
 [xf86-input-evdev])
 AC_CONFIG_SRCDIR([Makefile.am])

commit c085c8b6c1f8e95f6f4d91bc65268fe57154018c
Author: Peter Hutterer 
Date:   Tue Feb 12 12:58:08 2013 +1000

Return BadValue if EvdevOpenMTDev fails

FALSE == Success, so if we fail during EvdevOpenMTDev, the caller thinks
that everything worked fine, proceeds to set up the fd, etc.

This may later cause a crash, when a device comes back later as different
device and posts axis events where we didn't configure axes in the first
place.

Note: Unclear why there was no udev event received for the device being
removed and coming back as different device though.

Signed-off-by: Peter Hutterer 

diff --git a/src/evdev.c b/src/evdev.c
index ea2410b..052e9f0 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2511,7 +2511,7 @@ EvdevOpenDevice(InputInfoPtr pInfo)
 if (!EvdevOpenMTDev(pInfo)) {
 xf86Msg(X_ERROR, "%s: Couldn't open mtdev device\n", pInfo->name);
 EvdevCloseDevice(pInfo);
-return FALSE;
+return BadValue;
 }
 #endif
 

commit 2b675f85aef6df3bb3fb5e68648982e11b752764
Author: Peter Hutterer 
Date:   Tue Feb 12 12:48:38 2013 +1000

Make errors on EVIOCGBIT more obvious

Signed-off-by: Peter Hutterer 

diff --git a/src/evdev.c b/src/evdev.c
index 731ebb3..ea2410b 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2000,7 +2000,7 @@ EvdevCache(InputInfoPtr pInfo)
 
 len = ioctl(pInfo->fd, EVIOCGBIT(0, sizeof(bitmask)), bitmask);
 if (len < 0) {
-xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT failed: %s\n",
+xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT for bitmask failed: %s\n",
 strerror(errno));
 goto error;
 }
@@ -2009,7 +2009,7 @@ EvdevCache(InputInfoPtr pInfo)
 
 len = ioctl(pInfo->fd, EVIOCGBIT(EV_REL, sizeof(rel_bitmask)), 
rel_bitmask);
 if (len < 0) {
-xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT failed: %s\n",
+xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT for EV_REL failed: %s\n",
 strerror(errno));
 goto error;
 }
@@ -2018,7 +2018,7 @@ EvdevCache(InputInfoPtr pInfo)
 
 len = ioctl(pInfo->fd, EVIOCGBIT(EV_ABS, sizeof(abs_bitmask)), 
abs_bitmask);
 if (len < 0) {
-xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT failed: %s\n",
+xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT for EV_ABS failed: %s\n",
 strerror(errno));
 goto error;
 }
@@ -2027,7 +2027,7 @@ EvdevCache(InputInfoPtr pInfo)
 
 len = ioctl(pInfo->fd, EVIOCGBIT(EV_LED, sizeof(led_bitmask)), 
led_bitmask);
 if (len < 0) {
-xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT failed: %s\n",
+xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT for EV_LED failed: %s\n",
 strerror(errno));
 goto error;
 }
@@ -2053,7 +2053,7 @@ EvdevCache(InputInfoPtr pInfo)
 
 len = ioctl(pInfo->fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), 
key_bitmask);
 if (len < 0) {
-xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT failed: %s\n",
+xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT for EV_KEY failed: %s\n",
 strerror(errno));
 goto error;
 }
@@ -2435,8 +2435,8 @@ EvdevOpenMTDev(InputInfoPtr pInfo)
 /* Use ioctl here, this may be called before EvdevCache */
 len = ioctl(pInfo->fd, EVIOCGBIT(0, sizeof(bitmask)), bitmask);
 if (len < 0) {
-xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT failed: %s\n",
-strerror(errno));
+xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT for bitmask in %s failed: 
%s\n",
+__func__, strerror(errno));
 return FALSE;
 }
 
@@ -2445,8 +2445,8 @@ EvdevOpenMTDev(InputInfoPtr pInfo)
 
 len = ioctl(pInfo->fd, EVIOCGBIT(EV_ABS, sizeof(abs_bitmask)), 
abs_bitmask);
 if (len < 0) {
-xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT failed: %s\n",
-strerror(errno));
+xf86IDrvMsg(pInfo, X_ERROR, "ioctl EVIOCGBIT for EV_ABS in %s failed: 
%s\n",
+__func__, strerror(errno));
 return FALSE;
 }
 

commit 2b8b0df62ec554952784f2820fb4143c495232b0
Author: Peter Hutterer 
Date:   Thu Jan 24 16:18:48 2013 +1000

Always init axis mapping for the first two rel axes (#59784)

Fixes regression introduced in 2f67509b53b27dd7f51ca2aadd19605aee613a61.

If evdev is used for touchpads, the abs axis