libinput: Changes to 'refs/tags/libinput-1.1.3-1'

2015-12-17 Thread Timo Aaltonen 
Tag 'libinput-1.1.3-1' created by Timo Aaltonen  at 
2015-12-17 13:00 +

Tagging upload of libinput 1.1.3-1 to unstable.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJWcrH2AAoJEMtwMWWoiYTctI0P/1cfoB8pJysFRDfJt6A2AEk5
q/La50RGHTOSHR7dXoxxsrTPWaHcNSRO2moTIwodTKBZ0Dc8jaLOGammNb4SIFvP
etzbB0JG8wB6+iKGOS5F4cIYtfTTQTLh9Av3GiYOHPMQm6dbfpSwkW3Hfyi4+wRd
lK3xy2K7cc9k0bI9uQ82tbzTCHHqa8Ch3RGwLAB0jXxK05zR3qRwkkrSOe0NWFmk
Nsq5esX8wr2WoTVgivF+vHttQAQPqQuvi0B+CqHjrkJsaZDbTIe+2BY5GgtV6bOl
3VoPMDmDArU9GvBvc9l7WtcPbMr9MKLEK/mU2806WbthNsAVhRbbus6GPsMjkndg
mUWAZ7NeoZs6KXSYfHMB5Eotx4+Le/xUE6JS+Ta7/aUSv//+yjKVOp+402laXjLd
Taa+FLTnVyWYZX6SoCSHKljHUK0mnlMyouAhRYnkORiVUPLtN+ymBtSi6pLPSSpv
R7TF7qYCL1bSYmy2gAXLdiFvQ2kJ/b5aMfBYB4rcnvGh8nxYiqYHRSupp34llQCO
/2HMC1Q2P644viNGMNOToFmgEFSsN4P3YeOGWP3k1bSSYj9rkWdsswcvVAFaEy/T
axG2uztpGq09eDpW3NyqOcWm03GpEaokhVoKcLUiQRscEzMaDppVEiLomkxCVr6B
ZGuByDlcj4uaxriAvES9
=VgsG
-END PGP SIGNATURE-

Changes since libinput-1.1.2-1:
Andreas Boll (1):
  Change maintainer to Debian X Strike Force.

Peter Hutterer (6):
  test: use the double comparison macros
  test: change extra axes to take a percentage as well
  test: extend sendfile from 4kB to 40kB
  util: drop trailing semicolon from CASE_RETURN_STRING macro
  touchpad: add a special quirk for the Lenovo x220 with updated firmware
  configure.ac: libinput 1.1.3

Stephen Chandler Paul (1):
  test: Add litest_assert_double_*() macros

Timo Aaltonen (3):
  Merge branch 'upstream-unstable' into debian-unstable
  update the version
  release to unstable

---
 configure.ac  |4 +--
 debian/changelog  |   10 
 debian/control|4 +--
 doc/device-configuration-via-udev.dox |   18 +++
 src/evdev-mt-touchpad.c   |3 +-
 src/evdev.c   |1 
 src/evdev.h   |1 
 src/libinput-util.h   |2 -
 test/litest.c |   40 +-
 test/litest.h |   17 ++
 test/touchpad.c   |   22 +-
 udev/90-libinput-model-quirks.hwdb|   12 ++
 12 files changed, 107 insertions(+), 27 deletions(-)
---

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

2015-12-17 Thread Timo Aaltonen 
 man/intel.man|   26 +
 src/i915_pciids.h|   36 ++
 src/intel_module.c   |6 
 src/intel_options.c  |2 
 src/intel_options.h  |2 
 src/sna/gen3_render.c|   38 --
 src/sna/gen4_render.c|   33 --
 src/sna/gen5_render.c|   35 --
 src/sna/gen6_render.c|   35 --
 src/sna/gen7_render.c|   38 --
 src/sna/gen8_render.c|   36 --
 src/sna/kgem.c   |  173 +++
 src/sna/kgem.h   |2 
 src/sna/sna.h|1 
 src/sna/sna_accel.c  |   10 
 src/sna/sna_display.c|  631 ---
 src/sna/sna_dri2.c   |   29 +
 src/sna/sna_driver.c |5 
 src/sna/sna_video_textured.c |6 
 src/uxa/intel_driver.c   |2 
 20 files changed, 725 insertions(+), 421 deletions(-)

New commits:
commit 82293901da23d79fd074e5255fda5c95405d52de
Author: Chris Wilson 
Date:   Tue Dec 15 17:56:32 2015 +

sna: Need function definitions as well

Oops, accidentally only commited the function declaration and not the
function definition for the non-debug path.

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 3de232b..1b39f20 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1306,8 +1306,8 @@ static void kmsg_close(struct kmsg *k, int dump)
 }
 #else
 struct kmsg { int unused; };
-static void kmsg_open(struct kmsg *k);
-static void kmsg_close(struct kmsg *k, int dump);
+static void kmsg_open(struct kmsg *k) {}
+static void kmsg_close(struct kmsg *k, int dump) {}
 #endif
 
 static bool

commit f458e8c41112cf56a132ac42cc9e6a4be893ff2c
Author: Chris Wilson 
Date:   Tue Dec 15 16:46:47 2015 +

sna: Dump kernel debug messages for KMS failures

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index cc1c258..3de232b 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1235,6 +1235,81 @@ bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, 
uint32_t rotation)
rotation_reduce(_sna_crtc(crtc)->sprite, 
rotation));
 }
 
+#if HAS_DEBUG_FULL
+struct kmsg {
+   int fd;
+   int saved_loglevel;
+};
+
+static int kmsg_get_debug(void)
+{
+   FILE *file;
+   int v = -1;
+
+   file = fopen("/sys/module/drm/parameters/debug", "r");
+   if (file) {
+   fscanf(file, "%d", );
+   fclose(file);
+   }
+
+   return v;
+}
+
+static void kmsg_set_debug(int v)
+{
+   FILE *file;
+
+   file = fopen("/sys/module/drm/parameters/debug", "w");
+   if (file) {
+   fprintf(file, "%d\n", v);
+   fclose(file);
+   }
+}
+
+static void kmsg_open(struct kmsg *k)
+{
+   k->saved_loglevel = kmsg_get_debug();
+   if (k->saved_loglevel != -1)
+   kmsg_set_debug(0xff);
+
+   k->fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
+   if (k->fd != -1)
+   lseek(k->fd, 0, SEEK_END);
+}
+
+static void kmsg_close(struct kmsg *k, int dump)
+{
+   FILE *file;
+
+   file = NULL;
+   if (k->fd != -1 && dump)
+   file = fdopen(k->fd, "r");
+   if (file) {
+   size_t len = 0;
+   char *line = NULL;
+
+   while (getline(, , file) != -1) {
+   char *start = strchr(line, ';');
+   if (start)
+   LogF("KMSG: %s", start + 1);
+   }
+
+   free(line);
+   fclose(file);
+   }
+
+   if (k->fd != -1)
+   close(k->fd);
+
+   if (k->saved_loglevel != -1)
+   kmsg_set_debug(k->saved_loglevel);
+}
+#else
+struct kmsg { int unused; };
+static void kmsg_open(struct kmsg *k);
+static void kmsg_close(struct kmsg *k, int dump);
+#endif
+
 static bool
 sna_crtc_apply(xf86CrtcPtr crtc)
 {
@@ -1245,6 +1320,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
uint32_t output_ids[32];
int output_count = 0;
int sigio, i;
+   struct kmsg kmsg;
bool ret = false;
 
DBG(("%s CRTC:%d [pipe=%d], handle=%d\n", __FUNCTION__,
@@ -1257,6 +1333,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
}
 
sigio = sigio_block();
+   kmsg_open();
 
assert(sna->mode.num_real_output < ARRAY_SIZE(output_ids));
sna_crtc_disable_cursor(sna, sna_crtc);
@@ -1348,6 +1425,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
sna_crtc_force_outputs_on(crtc);
}
 unblock:
+   kmsg_close(, !ret);
sigio_unblock(sigio);
return ret;
 }

commit 6c4ffba39acb114cbbbfa3359a8c1ba7dfcc7df6
Author: Chris Wilson 
Date:   Thu Dec 10 16:19:21 2015 +

sna: Don't disable the native backlight around modesets

The kernel

xserver-xorg-video-intel: Changes to 'pristine-tar'

2015-12-17 Thread Timo Aaltonen 
 xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.delta |binary
 xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.id|1 +
 2 files changed, 1 insertion(+)

New commits:
commit 705f85088065c973b2e628fc8fe4d51c0d589cd9
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:08:11 2015 +0200

pristine-tar data for 
xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz

diff --git a/xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.delta 
b/xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.delta
new file mode 100644
index 000..6609116
Binary files /dev/null and 
b/xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.delta differ
diff --git a/xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.id 
b/xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.id
new file mode 100644
index 000..24a944d
--- /dev/null
+++ b/xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz.id
@@ -0,0 +1 @@
+b195042937ac262fd69dfe0e249a8354df45161b

mesa: Changes to 'ubuntu+1'

2015-12-17 Thread Timo Aaltonen 
 VERSION  |2 
 debian/changelog |   33 
 debian/copyright |  273 --
 debian/libgbm1.lintian-overrides |1 
 debian/libgl1-mesa-dri.lintian-overrides |3 
 debian/libgl1-mesa-glx.shlibs|1 
 debian/libgl1-mesa-glx.symbols   | 1295 
++
 debian/patches/glapi-Build-glapi_gentable.c-only-on-Darwin.patch |  137 +
 debian/patches/series|1 
 docs/envvars.html|6 
 docs/relnotes/11.1.0.html|  191 +
 include/GLES2/gl2ext.h   |  940 +++
 src/gallium/auxiliary/vl/vl_video_buffer.c   |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp   |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp   |   15 
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp|6 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nv50.cpp|5 
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp|2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_peephole.cpp |   40 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nv50.cpp  |2 
 src/gallium/drivers/nouveau/codegen/nv50_ir_target_nvc0.cpp  |2 
 src/gallium/drivers/r600/r600_pipe.h |2 
 src/gallium/drivers/r600/r600_shader.c   |  158 +
 src/gallium/drivers/r600/r600_state.c|   29 
 src/gallium/drivers/r600/r600_state_common.c |   18 
 src/gallium/drivers/r600/r600d.h |1 
 src/gallium/drivers/radeon/r600_pipe_common.c|7 
 src/gallium/drivers/radeon/r600_texture.c|4 
 src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c  |2 
 src/gallium/drivers/radeonsi/si_debug.c  |2 
 src/gallium/drivers/radeonsi/si_shader.c |   28 
 src/gallium/drivers/vc4/Makefile.sources |1 
 src/gallium/drivers/vc4/kernel/vc4_packet.h  |   15 
 src/gallium/drivers/vc4/kernel/vc4_render_cl.c   |  276 +-
 src/gallium/drivers/vc4/kernel/vc4_validate.c|   94 
 src/gallium/drivers/vc4/kernel/vc4_validate_shaders.c|   71 
 src/gallium/drivers/vc4/vc4_blit.c   |   65 
 src/gallium/drivers/vc4/vc4_context.c|   25 
 src/gallium/drivers/vc4/vc4_context.h|   11 
 src/gallium/drivers/vc4/vc4_draw.c   |   16 
 src/gallium/drivers/vc4/vc4_drm.h|   11 
 src/gallium/drivers/vc4/vc4_emit.c   |   46 
 src/gallium/drivers/vc4/vc4_job.c|  105 
 src/gallium/drivers/vc4/vc4_nir_lower_blend.c|  133 -
 src/gallium/drivers/vc4/vc4_nir_lower_io.c   |   14 
 src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c   |  172 +
 src/gallium/drivers/vc4/vc4_opt_algebraic.c  |8 
 src/gallium/drivers/vc4/vc4_program.c|  162 +
 src/gallium/drivers/vc4/vc4_qir.c|   13 
 src/gallium/drivers/vc4/vc4_qir.h|   34 
 src/gallium/drivers/vc4/vc4_qpu.h|   11 
 src/gallium/drivers/vc4/vc4_qpu_emit.c   |   15 
 src/gallium/drivers/vc4/vc4_qpu_schedule.c   |4 
 src/gallium/drivers/vc4/vc4_resource.c   |  284 ++
 src/gallium/drivers/vc4/vc4_resource.h   |3 
 src/gallium/drivers/vc4/vc4_screen.c |5 
 src/gallium/drivers/vc4/vc4_simulator_validate.h |2 
 src/gallium/drivers/vc4/vc4_state.c  |   21 
 src/gallium/drivers/vc4/vc4_uniforms.c   |   26 
 src/gallium/state_trackers/clover/core/platform.cpp  |3 
 src/gallium/state_trackers/va/config.c   |   10 
 src/gallium/targets/opencl/Makefile.am   |2 
 src/glsl/ast_function.cpp|6 
 src/glsl/ast_to_hir.cpp  |8 
 src/glsl/glsl_parser.yy  |   20 
 src/glsl/glsl_parser_extras.cpp  |2 
 src/glsl/glsl_parser_extras.h|5

libinput_1.1.3-1_amd64.changes ACCEPTED into unstable

2015-12-17 Thread Debian FTP Masters 


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Thu, 17 Dec 2015 14:54:35 +0200
Source: libinput
Binary: libinput10 libinput10-udeb libinput10-dbg libinput-dev libinput-tools
Architecture: source amd64
Version: 1.1.3-1
Distribution: unstable
Urgency: medium
Maintainer: Debian X Strike Force 
Changed-By: Timo Aaltonen 
Description:
 libinput-dev - input device management and event handling library - development
 libinput-tools - input device management and event handling library - command 
line
 libinput10 - input device management and event handling library - shared libra
 libinput10-dbg - input device management and event handling library - 
debugging sy
 libinput10-udeb - input device management and event handling library - shared 
libra (udeb)
Changes:
 libinput (1.1.3-1) unstable; urgency=medium
 .
   [ Andreas Boll ]
   * Change maintainer to Debian X Strike Force.
 .
   [ Timo Aaltonen ]
   * New upstream release.
Checksums-Sha1:
 07caaac27e7c62682af57b0157f371f1f7bcb9f5 2276 libinput_1.1.3-1.dsc
 19c24289b0575ddbff7c07735522e69ea48976f7 564888 libinput_1.1.3.orig.tar.xz
 b4fc7400774fe09f293d50569ebd0bc2caaa684b 5068 libinput_1.1.3-1.debian.tar.xz
 4b3ca0f0b0ffe5b77ed49355f2610efc42a3f63d 21334 libinput-dev_1.1.3-1_amd64.deb
 aa72c705301f744c4a8856482bdf4cb4f6b941ff 17072 libinput-tools_1.1.3-1_amd64.deb
 6914c0bdea0b5ba4ee99986d3cd44fe2f34882b2 207462 
libinput10-dbg_1.1.3-1_amd64.deb
 150e78086f4fe4d43e7e90dd89bdf908a73f6c1c 49434 
libinput10-udeb_1.1.3-1_amd64.udeb
 ea38140c17d3715c47bd4080bf5f5be971c7792b 54102 libinput10_1.1.3-1_amd64.deb
Checksums-Sha256:
 272f1e4b2dd2918657b5ea609e9b236e4a11c996c55860c92b29a58c69616086 2276 
libinput_1.1.3-1.dsc
 afe15a2867f4fea6f66ae65ae9335ac19e08efce5283fdc1fd49cfce9bec6af4 564888 
libinput_1.1.3.orig.tar.xz
 61d4f23fa3d9d7c0d9c08d9ac696d94c159c6e60e78c4acb3c670abb7c9783da 5068 
libinput_1.1.3-1.debian.tar.xz
 cd24fbf9e3d01458328494dcadd95126fa7ba3d7cc384fa536268da9daba3b27 21334 
libinput-dev_1.1.3-1_amd64.deb
 0e6779bc1986a0bac3e2ed6622761c8064e47097bbab6f186d5bffcb4d496720 17072 
libinput-tools_1.1.3-1_amd64.deb
 042af70061f3a905beeb5255ff82c68a13f8f78facd0959f0d313b8b7b5fb706 207462 
libinput10-dbg_1.1.3-1_amd64.deb
 c82f0b7fb7728fbef3b07f2a6881a94260cf07c361d2557f814f891558d1342b 49434 
libinput10-udeb_1.1.3-1_amd64.udeb
 d437ea9b9e4b54c81d541ba689587254933d171ca13f93145b090b896593a864 54102 
libinput10_1.1.3-1_amd64.deb
Files:
 f4163b43f7ae9a27fc3be811faaef341 2276 libs optional libinput_1.1.3-1.dsc
 36b7b283f9a24e5d8c89e2ca4bbb087b 564888 libs optional 
libinput_1.1.3.orig.tar.xz
 83e3c447007bf347daab1192953a34f8 5068 libs optional 
libinput_1.1.3-1.debian.tar.xz
 f8178a211c6c46a46ac08549a0b71e64 21334 libdevel extra 
libinput-dev_1.1.3-1_amd64.deb
 b3ea878bd330a9abd41a87642ec93442 17072 libdevel extra 
libinput-tools_1.1.3-1_amd64.deb
 8c675fe47fadd5fc967f12e69b9d6a77 207462 debug extra 
libinput10-dbg_1.1.3-1_amd64.deb
 0c574424ddfb73a53cf7572dc9a954c4 49434 debian-installer optional 
libinput10-udeb_1.1.3-1_amd64.udeb
 13366026a54cc455d832302b30eaf2b7 54102 libs optional 
libinput10_1.1.3-1_amd64.deb
Package-Type: udeb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBAgAGBQJWcrG2AAoJEMtwMWWoiYTc+9EP/izKLARRjyxPY7jjmvWPKOEx
Mt9rzUuouQTQjtzPaZV0rNw0b/fhEgKwiohXhPBRbYepWz4nN05JTsgQi+sOxvOA
lNmrwUkfY1TK/6IqM+zF3zR0sBI8MoucBEEMU2AEQ2aQz06mNHbjofqULBxMGPKu
0mlg2/yVbxL6I+ss5madUNmCoW42Fibw4hzZoi6Nwm30kyELsCxFUIyYHCEIcVaW
9VGLalLR+VYlidfwa3QqBe0KWkjbOp1ZN3tQRfrLGLNEzGK+XQKw8PUNYNYXpIuq
IBlHFOqgoNXyO1aqE2l2vMQxtWkoCeP4aFfL4SIauX8x9v+ZNxVOLT1CBHl7yfZ7
5T1giuRI3LIOP/qDIzE5+lCeOu7TER+C4ogGBKyfR+PLs8p1y+dp05ciIFAJUwWB
FENpe1+O2K4qqUjtep/BNspuRdcl6zpj8O551PMJpKzYKVk+2uEr49y2xgDthjTx
YfxHqqsTkRgB1l2LhaBdmgUIxWCrlCbAgCT/dpEEC/BBjBItJxpKsiHUR8bTwuV6
k1oSadCmouOPHdiX7SZsz9T8sV2tgdeXTGGDHO+JrzbKQOMSb27hnP+a0wP+wBfe
BHfVTVUNXBxhqGYXzoWASFZ9K8gqVVbU2jHJ6Qihi9Hn6FJvqql9JXnZ9F9fUDbA
DJpVLS6wqBq0B3EgcfsF
=4ev7
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

Processing of libinput_1.1.3-1_amd64.changes

2015-12-17 Thread Debian FTP Masters 
libinput_1.1.3-1_amd64.changes uploaded successfully to localhost
along with the files:
  libinput_1.1.3-1.dsc
  libinput_1.1.3.orig.tar.xz
  libinput_1.1.3-1.debian.tar.xz
  libinput-dev_1.1.3-1_amd64.deb
  libinput-tools_1.1.3-1_amd64.deb
  libinput10-dbg_1.1.3-1_amd64.deb
  libinput10-udeb_1.1.3-1_amd64.udeb
  libinput10_1.1.3-1_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

Processing of xserver-xorg-video-intel_2.99.917+git20151217-1~exp1_amd64.changes

2015-12-17 Thread Debian FTP Masters 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1_amd64.changes uploaded 
successfully to localhost
along with the files:
  xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.dsc
  xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz
  xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.diff.gz
  xserver-xorg-video-intel-dbg_2.99.917+git20151217-1~exp1_amd64.deb
  xserver-xorg-video-intel_2.99.917+git20151217-1~exp1_amd64.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

libinput: Changes to 'debian-unstable'

2015-12-17 Thread Timo Aaltonen 
 configure.ac  |4 +--
 debian/changelog  |8 +-
 doc/device-configuration-via-udev.dox |   18 +++
 src/evdev-mt-touchpad.c   |3 +-
 src/evdev.c   |1 
 src/evdev.h   |1 
 src/libinput-util.h   |2 -
 test/litest.c |   40 +-
 test/litest.h |   17 ++
 test/touchpad.c   |   22 +-
 udev/90-libinput-model-quirks.hwdb|   12 ++
 11 files changed, 101 insertions(+), 27 deletions(-)

New commits:
commit c471942a7d85b4a2249930514562d175a898b959
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:00:03 2015 +0200

release to unstable

diff --git a/debian/changelog b/debian/changelog
index 00c58ea..288102e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libinput (1.1.3-1) UNRELEASED; urgency=medium
+libinput (1.1.3-1) unstable; urgency=medium
 
   [ Andreas Boll ]
   * Change maintainer to Debian X Strike Force.
@@ -6,7 +6,7 @@ libinput (1.1.3-1) UNRELEASED; urgency=medium
   [ Timo Aaltonen ]
   * New upstream release.
 
- -- Andreas Boll   Fri, 06 Nov 2015 09:49:11 +0100
+ -- Timo Aaltonen   Thu, 17 Dec 2015 14:54:35 +0200
 
 libinput (1.1.2-1) unstable; urgency=medium
 

commit 0b5642c78b4ec0e911aabc6c272a5c174331cf9d
Author: Timo Aaltonen 
Date:   Thu Dec 17 14:53:48 2015 +0200

update the version

diff --git a/debian/changelog b/debian/changelog
index 01b471d..00c58ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-libinput (1.1.2-2) UNRELEASED; urgency=medium
+libinput (1.1.3-1) UNRELEASED; urgency=medium
 
+  [ Andreas Boll ]
   * Change maintainer to Debian X Strike Force.
 
+  [ Timo Aaltonen ]
+  * New upstream release.
+
  -- Andreas Boll   Fri, 06 Nov 2015 09:49:11 +0100
 
 libinput (1.1.2-1) unstable; urgency=medium

commit 6922adba058c5adc27161700835208415ad8818f
Author: Peter Hutterer 
Date:   Wed Dec 16 07:19:30 2015 +1000

configure.ac: libinput 1.1.3

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 51350bb..92f3e22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
 
 m4_define([libinput_major_version], [1])
 m4_define([libinput_minor_version], [1])
-m4_define([libinput_micro_version], [2])
+m4_define([libinput_micro_version], [3])
 m4_define([libinput_version],
   
[libinput_major_version.libinput_minor_version.libinput_micro_version])
 
@@ -31,7 +31,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 # b) If interfaces have been changed or added, but binary compatibility has
 #been preserved, change to C+1:0:A+1
 # c) If the interface is the same as the previous version, change to C:R+1:A
-LIBINPUT_LT_VERSION=16:2:6
+LIBINPUT_LT_VERSION=16:3:6
 AC_SUBST(LIBINPUT_LT_VERSION)
 
 AM_SILENT_RULES([yes])

commit 53c28a7d75a0a22bc96d780b9082fd6d8d3ed741
Author: Peter Hutterer 
Date:   Fri Dec 11 11:10:25 2015 +1000

touchpad: add a special quirk for the Lenovo x220 with updated firmware

If an x220 is updated to the touchpad firmware version 8.1, the touchpad
suffers from the same issues as the x230 and needs custom acceleration code.
Unfortunately we cannot detect this otherwise, so it is left to the user as 
a
custom hwdb setting.

https://bugzilla.redhat.com/show_bug.cgi?id=1264453

Signed-off-by: Peter Hutterer 
Reviewed-by: Hans de Goede 

diff --git a/doc/device-configuration-via-udev.dox 
b/doc/device-configuration-via-udev.dox
index 85c5c9c..6e9a3dc 100644
--- a/doc/device-configuration-via-udev.dox
+++ b/doc/device-configuration-via-udev.dox
@@ -117,4 +117,22 @@ defaults or any other reason. The effects of setting these 
properties, the
 format of the property and the value of the property are subject to change
 at any time.
 
+@subsection model_specific_configuration_x220fw81 Lenovo x220 with touchpad 
firmware v8.1
+
+The property LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81 may be set by a
+user in a local hwdb file. This property designates the touchpad on a Lenovo
+x220 with a touchpad firmware version 8.1. When this firmware version is
+installed, the touchpad is imprecise. The touchpad device does not send
+continuos x/y axis position updates, a behavior also observed on its
+successor model, the Lenovo x230 which has the same firmware version. If the
+above property is set, libinput adjusts its behavior to better suit this
+particular model.
+
+The touchpad firmware version cannot be detected automatically by libinput,
+local configuration is required to set this property. Refer to

libinput: Changes to 'upstream-unstable'

2015-12-17 Thread Timo Aaltonen 
 configure.ac  |4 +--
 doc/device-configuration-via-udev.dox |   18 +++
 src/evdev-mt-touchpad.c   |3 +-
 src/evdev.c   |1 
 src/evdev.h   |1 
 src/libinput-util.h   |2 -
 test/litest.c |   40 +-
 test/litest.h |   17 ++
 test/touchpad.c   |   22 +-
 udev/90-libinput-model-quirks.hwdb|   12 ++
 10 files changed, 95 insertions(+), 25 deletions(-)

New commits:
commit 6922adba058c5adc27161700835208415ad8818f
Author: Peter Hutterer 
Date:   Wed Dec 16 07:19:30 2015 +1000

configure.ac: libinput 1.1.3

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 51350bb..92f3e22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.64])
 
 m4_define([libinput_major_version], [1])
 m4_define([libinput_minor_version], [1])
-m4_define([libinput_micro_version], [2])
+m4_define([libinput_micro_version], [3])
 m4_define([libinput_version],
   
[libinput_major_version.libinput_minor_version.libinput_micro_version])
 
@@ -31,7 +31,7 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 # b) If interfaces have been changed or added, but binary compatibility has
 #been preserved, change to C+1:0:A+1
 # c) If the interface is the same as the previous version, change to C:R+1:A
-LIBINPUT_LT_VERSION=16:2:6
+LIBINPUT_LT_VERSION=16:3:6
 AC_SUBST(LIBINPUT_LT_VERSION)
 
 AM_SILENT_RULES([yes])

commit 53c28a7d75a0a22bc96d780b9082fd6d8d3ed741
Author: Peter Hutterer 
Date:   Fri Dec 11 11:10:25 2015 +1000

touchpad: add a special quirk for the Lenovo x220 with updated firmware

If an x220 is updated to the touchpad firmware version 8.1, the touchpad
suffers from the same issues as the x230 and needs custom acceleration code.
Unfortunately we cannot detect this otherwise, so it is left to the user as 
a
custom hwdb setting.

https://bugzilla.redhat.com/show_bug.cgi?id=1264453

Signed-off-by: Peter Hutterer 
Reviewed-by: Hans de Goede 

diff --git a/doc/device-configuration-via-udev.dox 
b/doc/device-configuration-via-udev.dox
index 85c5c9c..6e9a3dc 100644
--- a/doc/device-configuration-via-udev.dox
+++ b/doc/device-configuration-via-udev.dox
@@ -117,4 +117,22 @@ defaults or any other reason. The effects of setting these 
properties, the
 format of the property and the value of the property are subject to change
 at any time.
 
+@subsection model_specific_configuration_x220fw81 Lenovo x220 with touchpad 
firmware v8.1
+
+The property LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81 may be set by a
+user in a local hwdb file. This property designates the touchpad on a Lenovo
+x220 with a touchpad firmware version 8.1. When this firmware version is
+installed, the touchpad is imprecise. The touchpad device does not send
+continuos x/y axis position updates, a behavior also observed on its
+successor model, the Lenovo x230 which has the same firmware version. If the
+above property is set, libinput adjusts its behavior to better suit this
+particular model.
+
+The touchpad firmware version cannot be detected automatically by libinput,
+local configuration is required to set this property. Refer to the libinput
+model quirks hwdb for instructions.
+
+This property must not be used for any other purpose, no specific behavior
+is guaranteed.
+
 */
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 4fba147..d78a54b 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1565,7 +1565,8 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
tp->accel.x_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_x;
tp->accel.y_scale_coeff = (DEFAULT_MOUSE_DPI/25.4) / res_y;
 
-   if (tp->device->model_flags & EVDEV_MODEL_LENOVO_X230)
+   if (tp->device->model_flags & EVDEV_MODEL_LENOVO_X230 ||
+   tp->device->model_flags & EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81)
filter = 
create_pointer_accelerator_filter_lenovo_x230(tp->device->dpi);
else
filter = 
create_pointer_accelerator_filter_touchpad(tp->device->dpi);
diff --git a/src/evdev.c b/src/evdev.c
index 55641c5..9fecdc4 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1650,6 +1650,7 @@ evdev_read_model_flags(struct evdev_device *device)
enum evdev_device_model model;
} model_map[] = {
{ "LIBINPUT_MODEL_LENOVO_X230", EVDEV_MODEL_LENOVO_X230 },
+   { "LIBINPUT_MODEL_LENOVO_X220_TOUCHPAD_FW81", 
EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 },
{ "LIBINPUT_MODEL_CHROMEBOOK", EVDEV_MODEL_CHROMEBOOK },
{ "LIBINPUT_MODEL_SYSTEM76_BONOBO",

xserver-xorg-video-intel_2.99.917+git20151217-1~exp1_amd64.changes ACCEPTED into experimental

2015-12-17 Thread Debian FTP Masters 


Accepted:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Format: 1.8
Date: Thu, 17 Dec 2015 15:10:01 +0200
Source: xserver-xorg-video-intel
Binary: xserver-xorg-video-intel xserver-xorg-video-intel-dbg
Architecture: source amd64
Version: 2:2.99.917+git20151217-1~exp1
Distribution: experimental
Urgency: medium
Maintainer: Debian X Strike Force 
Changed-By: Timo Aaltonen 
Description:
 xserver-xorg-video-intel - X.Org X server -- Intel i8xx, i9xx display driver
 xserver-xorg-video-intel-dbg - X.Org X server -- Intel i8xx, i9xx display 
driver (debug symbols)
Changes:
 xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) experimental; 
urgency=medium
 .
   * New upstream snapshot.
Checksums-Sha1:
 e420e3d8650b04b787188bd329fcfff299025040 3214 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.dsc
 c9d7d43eb80e39a9d5a0878467f8a7fd9e90de40 1597673 
xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz
 3f4cc4ffe6216324dcc05ecad309e6f5c4500475 946403 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.diff.gz
 4586812af4d859883ed3a779004bbc33c0dd25a2 2929322 
xserver-xorg-video-intel-dbg_2.99.917+git20151217-1~exp1_amd64.deb
 d4bde59ea9111f4737b2e754db0969d63d44668c 1633366 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1_amd64.deb
Checksums-Sha256:
 c70f40f24dd0c11efaafb933e9e9ed652631414d4b532b2b746da21afadadc16 3214 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.dsc
 5c3242f7e8b20ce7a1f9934b2939d6da514a0e91fada1e8407380bef00dc2667 1597673 
xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz
 2f20fbe8c1d3393cd2ebb14f295978ef27c8f696599a926264ff546537deb976 946403 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.diff.gz
 38af78101f64c86a7fc101f96c009cc639d413fec591828748bd4fa425ae0911 2929322 
xserver-xorg-video-intel-dbg_2.99.917+git20151217-1~exp1_amd64.deb
 ae3f3fca9405e6bcc32fb42e792c3e4ebfc2adff1a556cde4b7654aa74af4e92 1633366 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1_amd64.deb
Files:
 95bb2dd99c1d66a3aca1b6b81183f3d9 3214 x11 optional 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.dsc
 ff66afd3aef9a8520056c174f95b00c3 1597673 x11 optional 
xserver-xorg-video-intel_2.99.917+git20151217.orig.tar.gz
 78f7c552d2a88ba03272d8c9c2b321f0 946403 x11 optional 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1.diff.gz
 d3e70d77949f9e5f01a5f366202abd12 2929322 debug extra 
xserver-xorg-video-intel-dbg_2.99.917+git20151217-1~exp1_amd64.deb
 fa83a9a4de88c3cb65ba3fb85c754750 1633366 x11 optional 
xserver-xorg-video-intel_2.99.917+git20151217-1~exp1_amd64.deb

-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAEBAgAGBQJWcrYXAAoJEMtwMWWoiYTcbksQAIHCPtXwjo5Ru1Wb5BX5ffpa
7atgRL1WY7jbLO6NhdqhM8ENqj2pqelClEM3PjkyjuUv3P63OBksfH/GD3BZ+MQd
oePY+W/CR+pUwmO5VPJOtJ+sEWh/t2Yoc9OIj9v1VJs9iPXm9+RMUclCMyjBl/gW
YHbCsMXiGfeAR3QIYZOfHGxvZMl6lcBUMr6gRQgANIQswAgYHJVFgdk8SgHwsKAt
R53VU7Rs9bjO6GlDEF9TLf3JpXEZDEUzzbn5kjBDCoITW97NDZsdCXMHp1gGNkJo
iiVNxzFB0f9NctCRbT+1x3lY6H7DEKhMhpxfc9R6UxaTJLbymy/an2Text+wB7A3
BODxLPHtn6toKScvdG72NmbcxAzZKhNCA+nCV7oyeYC4BF64MELWvktJx2LzmYG1
229K8XiWXfb0/6TGnAI0PuHVtUCCU6sEVzzrNyRpYLcJPrZ1DzJRfkcEif1YE0Ln
IuknDCCyxRE3cE+C/mRRqLPFJlrEM7VyNE+hqJwbHM/ml3FquBn+ibysrJBhkOiQ
13JhnEVnQnUD0ykFfxK65Q1njiK3Zbi0QH8KjzwvQXkAPJVEWmeBPkOL6agSxG3m
5rPyDOqtp9Xd0JewtOo72dzqDDkVQdN7Mpwtl7I7D6w1yieO82m2C59/ptQZ3RHe
s1x6j/+VvaGY2vYtawtA
=JO1s
-END PGP SIGNATURE-


Thank you for your contribution to Debian.

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

2015-12-17 Thread Timo Aaltonen 
 debian/changelog |6 
 man/intel.man|   26 +
 src/i915_pciids.h|   36 ++
 src/intel_module.c   |6 
 src/intel_options.c  |2 
 src/intel_options.h  |2 
 src/sna/gen3_render.c|   38 --
 src/sna/gen4_render.c|   33 --
 src/sna/gen5_render.c|   35 --
 src/sna/gen6_render.c|   35 --
 src/sna/gen7_render.c|   38 --
 src/sna/gen8_render.c|   36 --
 src/sna/kgem.c   |  173 +++
 src/sna/kgem.h   |2 
 src/sna/sna.h|1 
 src/sna/sna_accel.c  |   10 
 src/sna/sna_display.c|  631 ---
 src/sna/sna_dri2.c   |   29 +
 src/sna/sna_driver.c |5 
 src/sna/sna_video_textured.c |6 
 src/uxa/intel_driver.c   |2 
 21 files changed, 731 insertions(+), 421 deletions(-)

New commits:
commit 116f9e95c34b0a1724e6c99a1c14214b44dcdf25
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:10:21 2015 +0200

release to experimental

diff --git a/debian/changelog b/debian/changelog
index 8965b8f..e9c81e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) experimental; 
urgency=medium
 
   * New upstream snapshot.
 
- -- Timo Aaltonen   Thu, 17 Dec 2015 15:07:27 +0200
+ -- Timo Aaltonen   Thu, 17 Dec 2015 15:10:01 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20151019-1~exp1) experimental; 
urgency=medium
 

commit 9fd307f4b926230fcc275c53086f974ef8293ac7
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:07:56 2015 +0200

update the changelog

diff --git a/debian/changelog b/debian/changelog
index 9bcf66e..8965b8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) UNRELEASED; 
urgency=medium
+
+  * New upstream snapshot.
+
+ -- Timo Aaltonen   Thu, 17 Dec 2015 15:07:27 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20151019-1~exp1) experimental; 
urgency=medium
 
   * New upstream snapshot.

commit 82293901da23d79fd074e5255fda5c95405d52de
Author: Chris Wilson 
Date:   Tue Dec 15 17:56:32 2015 +

sna: Need function definitions as well

Oops, accidentally only commited the function declaration and not the
function definition for the non-debug path.

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 3de232b..1b39f20 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1306,8 +1306,8 @@ static void kmsg_close(struct kmsg *k, int dump)
 }
 #else
 struct kmsg { int unused; };
-static void kmsg_open(struct kmsg *k);
-static void kmsg_close(struct kmsg *k, int dump);
+static void kmsg_open(struct kmsg *k) {}
+static void kmsg_close(struct kmsg *k, int dump) {}
 #endif
 
 static bool

commit f458e8c41112cf56a132ac42cc9e6a4be893ff2c
Author: Chris Wilson 
Date:   Tue Dec 15 16:46:47 2015 +

sna: Dump kernel debug messages for KMS failures

Signed-off-by: Chris Wilson 

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index cc1c258..3de232b 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1235,6 +1235,81 @@ bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc, 
uint32_t rotation)
rotation_reduce(_sna_crtc(crtc)->sprite, 
rotation));
 }
 
+#if HAS_DEBUG_FULL
+struct kmsg {
+   int fd;
+   int saved_loglevel;
+};
+
+static int kmsg_get_debug(void)
+{
+   FILE *file;
+   int v = -1;
+
+   file = fopen("/sys/module/drm/parameters/debug", "r");
+   if (file) {
+   fscanf(file, "%d", );
+   fclose(file);
+   }
+
+   return v;
+}
+
+static void kmsg_set_debug(int v)
+{
+   FILE *file;
+
+   file = fopen("/sys/module/drm/parameters/debug", "w");
+   if (file) {
+   fprintf(file, "%d\n", v);
+   fclose(file);
+   }
+}
+
+static void kmsg_open(struct kmsg *k)
+{
+   k->saved_loglevel = kmsg_get_debug();
+   if (k->saved_loglevel != -1)
+   kmsg_set_debug(0xff);
+
+   k->fd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK);
+   if (k->fd != -1)
+   lseek(k->fd, 0, SEEK_END);
+}
+
+static void kmsg_close(struct kmsg *k, int dump)
+{
+   FILE *file;
+
+   file = NULL;
+   if (k->fd != -1 && dump)
+   file = fdopen(k->fd, "r");
+   if (file) {
+   size_t len = 0;
+   char *line = NULL;
+
+   while (getline(, , file) != -1) {
+   char *start = strchr(line, ';');
+   if (start)
+

xserver-xorg-video-intel: Changes to 'refs/tags/xserver-xorg-video-intel-2_2.99.917+git20151217-1-exp1'

2015-12-17 Thread Timo Aaltonen 
Tag 'xserver-xorg-video-intel-2_2.99.917+git20151217-1-exp1' created by Timo 
Aaltonen  at 2015-12-17 13:46 +

Tagging upload of xserver-xorg-video-intel 2:2.99.917+git20151217-1~exp1 to 
experimental.
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJWcry1AAoJEMtwMWWoiYTcrQcQAIwDGsAZ4ZPPl1NtVSnwe8Us
7WmyJZrYO223rSw7sWi6EFlbE9f20CiMySJTSJTLlXYDFmM9PYyt9RBNG0mY0bbe
WhSuRcl1I+HLNUa9UNArXuriGhikOAJ5/JRbmwYbGKFy9BR27hhMYQV2c4dkzb1P
QuCYxEmZof4FzTjySLXad9+t5K1R67Z/WHIZr0c3xgSeHANJ3IwsYeN9EmDDHSay
DYsNikk/y6UUuQDop2qvin2OF1A9s8r72GHSyNxFofEIbZjDlV2Kc/Q2RvRyN3z2
pu97MPracpxrH/PS88Tz5Rm2uorzdisQkoSWvWPhpxtCGQZmu44mZDJm2kYzOTyA
26Bv5z0FA4o+Gf2yb+oXVRcWdB+/mJ8W84oAAYCnIAyE0dWcJ/e/MyGmB/b1ffAV
JBP/lvKqzIldeyIEkmEqtLa0c221GrueNhV/1uvW29PMBYY2/1wxLwUsRp3Ld3k/
+jmcqQHqoP21oKNW/YL/+B6WqSer+FDJl3M9wfEZgefl87jmbuJkyClRYh6qgPvS
C8tBtd93LKqi1Knv6+2grqN/GizX8sujmqjzfgaGKngiCPrJ8NK7/knGJpg3CrbN
pjg/bAQ9Fc1VMqpv3RwwjinHAdtMaGoeZf3ShcW2nFmT3WSXifFxR9f7Zz09HsSy
OcUp8FG+ZbFBpswKiP32
=xHvB
-END PGP SIGNATURE-

Changes since xserver-xorg-video-intel-2_2.99.917-2:
Adel Gadllah (1):
  Set the vdpau driver to va_gl

Bob Paauwe (1):
  sna: Fix the reduction of xy reflection onto rotations.

Chris Wilson (503):
  sna/gen7: Limit threads on HSW GT1
  sna: Don't record old vblank events
  sna: Don't force a batch flush at the start of a BLT fill op
  sna: Enable mmap(wc) support by default
  sna/video: Do an early check for a wedged GPU before texturing
  sna: Reject CPU blits that require format conversions
  sna: Disable GPU preferences when marking it as wedged
  sna: Allow scanouts to force late attachment
  sna: Clip copy to CRTC shadow
  sna: Allow scanouts to be directly accessed via the GTT even when wedged
  sna: Copy mode.vrefresh between kernel and X
  sna/video: Provide fallback support for filling the colorkey
  sna/video: Reuse fallback colorkey filler from overlay for sprites
  sna/trapezoids: Fix typo in construction of polygon lines
  sna: Add mmap(wc) handling to has_coherent_ptr assertion
  sna: Differentiate between disabling CRTC and turning off DPMS
  sna: Allow use of mmap(wc) for inplace GetImage
  sna: Capitlize log message "display hotplut detection"
  sna: Add a couple of guards against using the GPU to write into snooped bo
  sna: Replace assert with conditional setting of sna_pixmap->mapped
  sna: Wrap mmap accessors with sigtrap to catch oom SIGBUS
  sna: Actually set the priv->mapped type for mmap(wc)
  sna: Disable detiling for gen2
  sna/dri2: Fix build with DRI2INFOREC version 5
  sna: Add basic unswizzled manual detilers for gen2
  sna: Use correct octal value for gen3
  sna: Throw away CRTC damage if the CRTC is outside the screen bounds
  sna: Add a small DBG message for when PRIME slave tracking is enabled
  sna: Combine slave CRTC offsets with rotation
  sna: Only instantiate the frontbuffer on the GPU if used
  sna: Wrap direct access to ScrnInfoPtr->pScreen
  sna: Actually check for has_wc_mmap before use
  sna/dri2: Add a DBG message for when Xorg triple buffering is available
  sna/gen6+: Prefer using RENDER pipeline for uncached destinations on 
large GT
  sna/dri2: Track tracking of active-scanout for back buffer replacement
  sna/dri2: Exchange flags when exchanging DRI2Buffers after SwapBuffers
  sna/gen6+: Prefer not to switch away from active RENDER pipeline
  sna: Provide a few compiler hints
  sna: Add a loud DBG message when enabled
  sna: Finish e6227daff1e3e
  sna: Add missing include of DPMS constants
  sna: Keep front_active consistent across DPMS events
  sna/dri2: Prefer to use normal selection criteria for CopyRegion on small 
GT
  sna: Declare outputs as hidden at start
  sna: Reorganise assertions when retiring idle bo
  sna/dri2: Only preserve back buffers with the same pitch
  sna: Add a fallback DBG for the git version
  sna: GETPROPBLOB only works with exact length matches
  sna: Assert that the shadow buffer has a compatible pitch to the front
  sna/gen6+: Tweak engine placement when considering src/dst combinations
  sna: Tweak treatment of DPMS mode to be consistent at all layers
  sna: Expand mask to match uintptr_t
  legacy/i810: Expand mask to match unsigned long
  sna/dri2: Use existing busy state if semaphores are disabled
  sna: Log maximum number of CPU threads
  sna/dri2: Check for comparable back/front pitches more carefully
  sna: Clear the per-crtc shadow buffer if they are clipped
  test/dri2: Use xcb for more accurate timing of SwapBuffers
  sna/dri2: Keep the per-drawable swap cache alive for 50ms
  sna/dri2: Fix interoperation between keepalive and fake-triple-buffering
  sna/dri2: Fix use of stale flip_pending after removing window
  sna/dri2: Smooth out

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

2015-12-17 Thread Timo Aaltonen 
 debian/changelog |   13 
 debian/patches/revert-dpms-fix.patch |   28 -
 man/intel.man|   26 +
 src/i915_pciids.h|   36 +
 src/intel_module.c   |6 
 src/intel_options.c  |2 
 src/intel_options.h  |2 
 src/sna/gen3_render.c|   38 --
 src/sna/gen4_render.c|   33 -
 src/sna/gen5_render.c|   35 -
 src/sna/gen6_render.c|   35 -
 src/sna/gen7_render.c|   38 --
 src/sna/gen8_render.c|   36 -
 src/sna/kgem.c   |  173 +
 src/sna/kgem.h   |2 
 src/sna/sna.h|1 
 src/sna/sna_accel.c  |   10 
 src/sna/sna_display.c|  631 ++-
 src/sna/sna_dri2.c   |   29 +
 src/sna/sna_driver.c |5 
 src/sna/sna_video_textured.c |6 
 src/uxa/intel_driver.c   |2 
 22 files changed, 751 insertions(+), 436 deletions(-)

New commits:
commit 1e788671761ec32a00e0930d86ae00db955000fe
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:43:23 2015 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index 165bd83..2349f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1ubuntu1) UNRELEASED; 
urgency=medium
+xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1ubuntu1) xenial; 
urgency=medium
 
   * Merge from debian.
   * Refresh revert-dpms-fix.patch.
 
- -- Timo Aaltonen   Thu, 17 Dec 2015 15:37:31 +0200
+ -- Timo Aaltonen   Thu, 17 Dec 2015 15:43:05 +0200
 
 xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) experimental; 
urgency=medium
 

commit 917c09efcd79c80612b5660be037e3fba05f6fb3
Author: Timo Aaltonen 
Date:   Thu Dec 17 15:43:02 2015 +0200

refresh patch

diff --git a/debian/changelog b/debian/changelog
index eb0a803..165bd83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1ubuntu1) UNRELEASED; 
urgency=medium
+
+  * Merge from debian.
+  * Refresh revert-dpms-fix.patch.
+
+ -- Timo Aaltonen   Thu, 17 Dec 2015 15:37:31 +0200
+
 xserver-xorg-video-intel (2:2.99.917+git20151217-1~exp1) experimental; 
urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/patches/revert-dpms-fix.patch 
b/debian/patches/revert-dpms-fix.patch
index 283c1f3..d642ba2 100644
--- a/debian/patches/revert-dpms-fix.patch
+++ b/debian/patches/revert-dpms-fix.patch
@@ -9,11 +9,9 @@ This reverts commit 7d9a74622e5a936e4860fcef8358619bf59adae8.
  src/sna/sna_display.c | 41 ++---
  1 file changed, 14 insertions(+), 27 deletions(-)
 
-Index: xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
-===
 xserver-xorg-video-intel-2.99.917+git20150808.orig/src/sna/sna_display.c
-+++ xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
-@@ -222,7 +222,7 @@ struct sna_output {
+--- a/src/sna/sna_display.c
 b/src/sna/sna_display.c
+@@ -262,7 +262,7 @@ struct sna_output {
int panel_vdisplay;
  
uint32_t dpms_id;
@@ -22,7 +20,7 @@ Index: 
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
struct backlight backlight;
int backlight_active_level;
  
-@@ -260,7 +260,6 @@ enum { /* XXX copied from hw/xfree86/mod
+@@ -300,7 +300,6 @@ enum { /* XXX copied from hw/xfree86/mod
OPTION_DEFAULT_MODES,
  };
  
@@ -30,16 +28,16 @@ Index: 
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
  static void sna_crtc_disable_cursor(struct sna *sna, struct sna_crtc *crtc);
  
  static bool is_zaphod(ScrnInfoPtr scrn)
-@@ -969,7 +968,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
+@@ -1099,7 +1098,7 @@ sna_crtc_force_outputs_on(xf86CrtcPtr cr
if (output->crtc != crtc)
continue;
  
 -  __sna_output_dpms(output, DPMSModeOn, false);
 +  output->funcs->dpms(output, DPMSModeOn);
-   to_sna_output(output)->last_detect = now;
+   if (to_sna_output(output)->last_detect)
+   to_sna_output(output)->last_detect = now;
}
- 
-@@ -999,7 +998,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
+@@ -1131,7 +1130,7 @@ sna_crtc_force_outputs_off(xf86CrtcPtr c
if (output->crtc != crtc)
continue;
  
@@ -48,7 +46,7 @@ Index: 
xserver-xorg-video-intel-2.99.917+git20150808/src/sna/sna_display.c
}
  }
  
-@@ -1135,7 +1134,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
+@@ -1356,7 +1355,7 @@ sna_crtc_apply(xf86CrtcPtr crtc)
 * and we lose

libinput: Changes to 'ubuntu'

2015-12-17 Thread Timo Aaltonen 
 configure.ac  |4 
 debian/changelog  |   26 
 debian/control|   30 
 debian/libinput-tools.install |2 
 debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch |   19 
 debian/patches/touch-point-orientation-size.patch |   24 
 doc/device-configuration-via-udev.dox |   18 
 doc/palm-detection.dox|5 
 doc/svg/edge-scrolling.svg|2 
 doc/svg/twofinger-scrolling.svg   |2 
 src/evdev-mt-touchpad-gestures.c  |2 
 src/evdev-mt-touchpad.c   |6 
 src/evdev.c   |   63 +
 src/evdev.h   |1 
 src/libinput-util.h   |2 
 src/libinput.c|2 
 test/Makefile.am  |2 
 test/gestures.c   |8 
 test/litest-device-asus-rog-gladius.c |  334 
++
 test/litest-device-mouse-wheel-click-angle.c  |   74 ++
 test/litest.c |   65 +
 test/litest.h |   19 
 test/pointer.c|   34 -
 test/touchpad.c   |   99 ++
 tools/event-debug.c   |   18 
 udev/90-libinput-model-quirks.hwdb|   12 
 26 files changed, 776 insertions(+), 97 deletions(-)

New commits:
commit b4654b3daaca631c1fc058c61a690090f022fb47
Author: Timo Aaltonen 
Date:   Thu Dec 17 16:15:58 2015 +0200

release to xenial

diff --git a/debian/changelog b/debian/changelog
index da38120..31d6954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-libinput (1.1.3-1ubuntu1) UNRELEASED; urgency=medium
+libinput (1.1.3-1ubuntu1) xenial; urgency=medium
 
   * Merge from debian.
   * patches: Refreshed.
 
- -- Timo Aaltonen   Thu, 17 Dec 2015 16:12:19 +0200
+ -- Timo Aaltonen   Thu, 17 Dec 2015 16:15:47 +0200
 
 libinput (1.1.3-1) unstable; urgency=medium
 

commit 80fffb5d25fe6432f9dd8d9388126c9ca9751c2d
Author: Timo Aaltonen 
Date:   Thu Dec 17 16:14:53 2015 +0200

add libinput-tools.install..

diff --git a/debian/libinput-tools.install b/debian/libinput-tools.install
new file mode 100644
index 000..68671de
--- /dev/null
+++ b/debian/libinput-tools.install
@@ -0,0 +1,2 @@
+usr/bin/*
+usr/share/man/man1/*

commit 6e9a9ed2e27d0109ac0ad9a64e0dfeb32d64d821
Author: Timo Aaltonen 
Date:   Thu Dec 17 16:13:42 2015 +0200

refresh patches

diff --git a/debian/changelog b/debian/changelog
index 0e5b5ef..da38120 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libinput (1.1.3-1ubuntu1) UNRELEASED; urgency=medium
+
+  * Merge from debian.
+  * patches: Refreshed.
+
+ -- Timo Aaltonen   Thu, 17 Dec 2015 16:12:19 +0200
+
 libinput (1.1.3-1) unstable; urgency=medium
 
   [ Andreas Boll ]
diff --git a/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch 
b/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch
index 790c144..e1fb1d6 100644
--- a/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch
+++ b/debian/patches/fix-premature-flushing-of-evdev-event-on-mx4.patch
@@ -15,20 +15,9 @@ Signed-off-by: Andreas Pokorny 

  test/touch.c | 110 +++
  2 files changed, 115 insertions(+), 5 deletions(-)
 
-diff --git a/src/evdev.c b/src/evdev.c
-index 04df275..3e22aa9 100644
 --- a/src/evdev.c
 +++ b/src/evdev.c
-@@ -557,7 +557,7 @@ evdev_flush_pending_event(struct evdev_device *device, 
uint64_t time)
- static enum evdev_key_type
- get_key_type(uint16_t code)
- {
--  if (code == BTN_TOUCH)
-+  if (code >= BTN_DIGI && code <= BTN_TOOL_QUADTAP)
-   return EVDEV_KEY_TYPE_NONE;
- 
-   if (code >= KEY_ESC && code <= KEY_MICMUTE)
-@@ -630,16 +630,16 @@ evdev_process_key(struct evdev_device *device,
+@@ -654,16 +654,16 @@ evdev_process_key(struct evdev_device *d
if (e->value == 2)
return;
  
@@ -49,11 +38,9 @@ index 04df275..3e22aa9 100644
/* Ignore key release events from the kernel for keys that libinput
 * never got a pressed event for. */
if (e->value == 0) {

mesa: Changes to 'ubuntu+1'

2015-12-17 Thread Christopher Halse Rogers 
 debian/patches/egl-platform-mir.patch |   94 +++---
 1 file changed, 66 insertions(+), 28 deletions(-)

New commits:
commit df57b8f4e0f246dad236c2f58d9896a7bbd2cceb
Author: Christopher James Halse Rogers 
Date:   Fri Dec 18 17:37:01 2015 +1100

Mir: Implement buffer_age because it's easy, and stop advertising 
swap_buffers_with_damage because it isn't

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 3906473..13f6759 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -133,7 +133,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
 __DRIbuffer   *dri_buffers[__DRI_BUFFER_COUNT];
 struct {
  #ifdef HAVE_WAYLAND_PLATFORM
-@@ -274,9 +282,12 @@ struct dri2_egl_surface
+@@ -274,9 +282,13 @@ struct dri2_egl_surface
void *data;
int data_size;
  #endif
@@ -143,11 +143,12 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
  #endif
 +#ifdef HAVE_MIR_PLATFORM
 +  int fd;
++  int buffer_age;
 +#endif
int locked;
int age;
 } color_buffers[4], *back, *current;
-@@ -289,6 +300,10 @@ struct dri2_egl_surface
+@@ -289,6 +301,10 @@ struct dri2_egl_surface
 /* EGL-owned buffers */
 __DRIbuffer   *local_buffers[__DRI_BUFFER_COUNT];
  #endif
@@ -158,7 +159,7 @@ Index: mesa/src/egl/drivers/dri2/egl_dri2.h
  };
  
  
-@@ -379,4 +394,7 @@ const __DRIconfig *
+@@ -379,4 +395,7 @@ const __DRIconfig *
  dri2_get_dri_config(struct dri2_egl_config *conf, EGLint surface_type,
  EGLenum colorspace);
  
@@ -170,7 +171,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 ===
 --- /dev/null
 +++ mesa/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,620 @@
+@@ -0,0 +1,633 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -478,6 +479,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   update_cached_buffer_ages(dri2_surf, buf_slot);
 +
 +   dri2_surf->back = _surf->color_buffers[buf_slot];
++   dri2_surf->back->buffer_age = buffer_package.age;
 +   dri2_surf->dri_buffers[__DRI_BUFFER_BACK_LEFT]->name = 0;
 +   dri2_surf->dri_buffers[__DRI_BUFFER_BACK_LEFT]->fd = buffer_package.fd[0];
 +   dri2_surf->dri_buffers[__DRI_BUFFER_BACK_LEFT]->pitch = 
buffer_package.stride;
@@ -691,6 +693,18 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   }
 +}
 +
++static EGLint
++dri2_mir_query_buffer_age(_EGLDriver *drv, _EGLDisplay *dpy,
++   _EGLSurface *surf)
++{
++   struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
++   if (dri2_surf->back)
++   {
++  return dri2_surf->back->buffer_age;
++   }
++   return 0;
++}
++
 +static struct dri2_egl_display_vtbl dri2_mir_display_vtbl = {
 +   .authenticate = dri2_mir_authenticate,
 +   .create_window_surface = dri2_create_mir_window_surface,
@@ -704,8 +718,8 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   .swap_buffers_region = dri2_fallback_swap_buffers_region,
 +   .post_sub_buffer = dri2_fallback_post_sub_buffer,
 +   .copy_buffers = dri2_fallback_copy_buffers,
-+   .query_buffer_age = dri2_fallback_query_buffer_age,
-+   .create_wayland_buffer_from_image = NULL,
++   .query_buffer_age = dri2_mir_query_buffer_age,
++   .create_wayland_buffer_from_image = 
dri2_fallback_create_wayland_buffer_from_image,
 +   .get_sync_values = dri2_fallback_get_sync_values,
 +   .get_dri_drawable = dri2_surface_get_dri_drawable,
 +};
@@ -779,7 +793,7 @@ Index: mesa/src/egl/drivers/dri2/platform_mir.c
 +   }
 +
 +   disp->Extensions.EXT_buffer_age = EGL_TRUE;
-+   disp->Extensions.EXT_swap_buffers_with_damage = EGL_TRUE;
++   disp->Extensions.EXT_swap_buffers_with_damage = EGL_FALSE;
 +   disp->Extensions.KHR_image_pixmap = EGL_TRUE;
 +
 +   dri2_dpy->vtbl = _mir_display_vtbl;

commit 1fe07ef9fb906a051783b945112b6bda6a1cf9f7
Author: Christopher James Halse Rogers 
Date:   Fri Dec 18 17:26:09 2015 +1100

Update egl-platform-mir patch for vtable changes

diff --git a/debian/patches/egl-platform-mir.patch 
b/debian/patches/egl-platform-mir.patch
index 6b4320f..3906473 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -1,5 +1,7 @@
 a/configure.ac
-+++ b/configure.ac
+Index: mesa/configure.ac
+===
+--- mesa.orig/configure.ac
 mesa/configure.ac
 @@ -1824,7 +1824,9 @@ for plat in $egl_platforms; do
test "x$have_libdrm" != xyes &&
AC_MSG_ERROR([EGL platform surfaceless requires libdrm 
>= $LIBDRM_REQUIRED])
@@ -19,8 +21,10 @@
  
  AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
  
 a/include/EGL/eglplatform.h
-+++ b/include/EGL/eglplatform.h
+Index: mesa/include/EGL/eglplatform.h