summaryrefslogtreecommitdiff
path: root/xserver/ChangeLog
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2017-12-08 15:02:03 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2017-12-08 15:02:03 +0000
commite2e6e25be1cbd7ecc45bbd9130c4527f7715e547 (patch)
tree85e40fcfbc819cb0394346c69db478a22e9ed122 /xserver/ChangeLog
parent63d0911c1d9f1be4f8755144bced468fcbc398a6 (diff)
Update to xserver 1.19.5.
Tested by bru@, jsg@ and others
Diffstat (limited to 'xserver/ChangeLog')
-rw-r--r--xserver/ChangeLog14577
1 files changed, 12301 insertions, 2276 deletions
diff --git a/xserver/ChangeLog b/xserver/ChangeLog
index 5cc1db39f..4dcd10d1e 100644
--- a/xserver/ChangeLog
+++ b/xserver/ChangeLog
@@ -1,54 +1,6335 @@
-commit 8b312db7d1d98be67f0283d982428545cf948a66
+commit b96e982e3a43513549636850186ff80a82190f64
Author: Adam Jackson <ajax@redhat.com>
-Date: Tue Jul 19 13:27:08 2016 -0400
+Date: Thu Oct 12 12:32:31 2017 -0400
- xserver 1.18.4
+ xserver 1.19.5
Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 42a74080ffe93502904ede7555652f01ab11d12d
+commit 95f605b42d8bbb6bea2834a1abfc205981c5b803
+Author: Nathan Kidd <nkidd@opentext.com>
+Date: Fri Jan 9 10:15:46 2015 -0500
+
+ Unvalidated extra length in ProcEstablishConnection (CVE-2017-12176)
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Nathan Kidd <nkidd@opentext.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit b747da5e25be944337a9cd1415506fc06b70aa81)
+
+commit cc41e5b581d287c56f8d7113a97a4882dcfdd696
+Author: Nathan Kidd <nkidd@opentext.com>
+Date: Fri Jan 9 10:09:14 2015 -0500
+
+ dbe: Unvalidated variable-length request in ProcDbeGetVisualInfo (CVE-2017-12177)
+
+ v2: Protect against integer overflow (Alan Coopersmith)
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Nathan Kidd <nkidd@opentext.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit 4ca68b878e851e2136c234f40a25008297d8d831)
+
+commit 6c15122163a2d2615db7e998e8d436815a08dec6
+Author: Nathan Kidd <nkidd@opentext.com>
+Date: Wed Dec 24 16:22:18 2014 -0500
+
+ Xi: fix wrong extra length check in ProcXIChangeHierarchy (CVE-2017-12178)
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Nathan Kidd <nkidd@opentext.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit 859b08d523307eebde7724fd1a0789c44813e821)
+
+commit c77cd08efcf386bcc5d8dfbd0427134b2b2d0888
+Author: Nathan Kidd <nkidd@opentext.com>
+Date: Fri Jan 9 10:04:41 2015 -0500
+
+ Xi: integer overflow and unvalidated length in (S)ProcXIBarrierReleasePointer
+
+ [jcristau: originally this patch fixed the same issue as commit
+ 211e05ac85 "Xi: Test exact size of XIBarrierReleasePointer", with the
+ addition of these checks]
+
+ This addresses CVE-2017-12179
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Signed-off-by: Nathan Kidd <nkidd@opentext.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit d088e3c1286b548a58e62afdc70bb40981cdb9e8)
+
+commit d264da92f7f8129b8aad4f0114a6467fc38fc896
+Author: Nathan Kidd <nkidd@opentext.com>
+Date: Sun Dec 21 01:10:03 2014 -0500
+
+ hw/xfree86: unvalidated lengths
+
+ This addresses:
+ CVE-2017-12180 in XFree86-VidModeExtension
+ CVE-2017-12181 in XFree86-DGA
+ CVE-2017-12182 in XFree86-DRI
+
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Nathan Kidd <nkidd@opentext.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit 1b1d4c04695dced2463404174b50b3581dbd857b)
+
+commit 61502107a30d64f991784648c3228ebc6694a032
+Author: Nathan Kidd <nkidd@opentext.com>
+Date: Fri Jan 9 11:43:05 2015 -0500
+
+ xfixes: unvalidated lengths (CVE-2017-12183)
+
+ v2: Use before swap (Jeremy Huddleston Sequoia)
+
+ v3: Fix wrong XFixesCopyRegion checks (Alan Coopersmith)
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Signed-off-by: Nathan Kidd <nkidd@opentext.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit 55caa8b08c84af2b50fbc936cf334a5a93dd7db5)
+
+commit c206f36a4b6ecf2555ab2291c349ab7d7d0b02f5
+Author: Nathan Kidd <nkidd@opentext.com>
+Date: Fri Jan 9 09:57:23 2015 -0500
+
+ Unvalidated lengths
+
+ v2: Add overflow check and remove unnecessary check (Julien Cristau)
+
+ This addresses:
+ CVE-2017-12184 in XINERAMA
+ CVE-2017-12185 in MIT-SCREEN-SAVER
+ CVE-2017-12186 in X-Resource
+ CVE-2017-12187 in RENDER
+
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Nathan Kidd <nkidd@opentext.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit cad5a1050b7184d828aef9c1dd151c3ab649d37e)
+
+commit e751722a7b0c5b595794e60b054ade0b3f6cdb4d
+Author: Michal Srb <msrb@suse.com>
+Date: Fri Jul 7 17:04:03 2017 +0200
+
+ os: Make sure big requests have sufficient length.
+
+ A client can send a big request where the 32B "length" field has value
+ 0. When the big request header is removed and the length corrected,
+ the value will underflow to 0xFFFFFFFF. Functions processing the
+ request later will think that the client sent much more data and may
+ touch memory beyond the receive buffer.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 9c23685009aa96f4b861dcc5d2e01dbee00c4dd9)
+
+commit 784d205ff6527c761ffbb1c43c9ad3669dd8d26e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Oct 12 12:17:53 2017 -0400
+
+ Revert "xf86-video-modesetting: Add ms_queue_vblank helper [v3]"
+
+ Apparently introduces a regression:
+
+ https://bugs.freedesktop.org/103243
+
+ This reverts commit 388dc1aeac9acf2d51ad5103570beffd81d78b96.
+
+commit ec37e559614cf4eaba67d3ca0693f09fd95a5d57
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Oct 4 15:29:18 2017 -0400
+
+ xserver 1.19.4
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 12fe3d3e9f494ef84832efe94ba00db92be499b1
+Author: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
+Date: Wed Sep 27 01:19:58 2017 -0400
+
+ present: Check the whole exec queue on event
+
+ Later events are sometimes added in front of the queue (e.g.
+ if page flipping fails) so we need to check the whole queue
+ on event.
+
+ Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit c2f2b25ab55c67f9f3ad07c02fa746eae7c61196)
+
+commit 388dc1aeac9acf2d51ad5103570beffd81d78b96
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 29 08:48:33 2017 -0700
+
+ xf86-video-modesetting: Add ms_queue_vblank helper [v3]
+
+ This provides an API wrapper around the kernel interface for queueing
+ a vblank event, simplifying all of the callers.
+
+ v2: Fix missing '|' in computing vbl.request.type
+
+ v3: Remove spurious bit of next patch (thanks, Michel Dänzer)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 677c32bcda98a96585bb1f66b57e0755a157b772)
+
+commit 8bd33a2db7337b2801fc630a57e36b6aeea219d9
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jul 27 10:08:32 2017 -0700
+
+ xkb: Handle xkb formated string output safely (CVE-2017-13723)
+
+ Generating strings for XKB data used a single shared static buffer,
+ which offered several opportunities for errors. Use a ring of
+ resizable buffers instead, to avoid problems when strings end up
+ longer than anticipated.
+
+ Reviewed-by: Michal Srb <msrb@suse.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit 94f11ca5cf011ef123bd222cabeaef6f424d76ac)
+
+commit 3094c4c6d879215923f2183ecd048b4f5429b182
+Author: Michal Srb <msrb@suse.com>
+Date: Thu Jul 27 11:54:26 2017 +0200
+
+ xkb: Escape non-printable characters correctly.
+
+ XkbStringText escapes non-printable characters using octal numbers. Such escape
+ sequence would be at most 5 characters long ("\0123"), so it reserves 5 bytes
+ in the buffer. Due to char->unsigned int conversion, it would print much longer
+ string for negative numbers.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit eaf1f72ed8994b708d94ec2de7b1a99f5c4a39b8)
+
+commit a510fb811100bc27f0bfafe5d073998551161819
+Author: Michal Srb <msrb@suse.com>
+Date: Fri Jul 28 16:27:10 2017 +0200
+
+ Xext/shm: Validate shmseg resource id (CVE-2017-13721)
+
+ Otherwise it can belong to a non-existing client and abort X server with
+ FatalError "client not in use", or overwrite existing segment of another
+ existing client.
+
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ (cherry picked from commit b95f25af141d33a65f6f821ea9c003f66a01e1f1)
+
+commit 3cea13cc40e2421ebefcf2ee0eb949a7bc4e63fd
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 16 15:44:47 2017 -0400
+
+ dmx: Remove some not-very-interesting debug prints
+
+ gcc/glibc think the snprintf in dmxExecOS() might truncate. Yes, it
+ might, and we also don't care. Just delete all this.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Acked-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit d6db66811643d3762716f6b144a7358572216a4f)
+
+commit 320e48c9217a8bdcd07dc8ce4aebec043e4afa3c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jun 16 15:44:46 2017 -0400
+
+ dmx: Silence an unused-result warning
+
+ Modern glibc is very insistent that you care about whether write()
+ succeeds:
+
+ ../hw/dmx/input/usb-keyboard.c: In function ‘kbdUSBCtrl’:
+ ../hw/dmx/input/usb-keyboard.c:292:9: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result [-Wunused-result]
+ write(priv->fd, &event, sizeof(event));
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 17ad6e5d5616039021455bc821d6ee2497f7ebde)
+
+commit c5d409a292008c4219c77a1bdb7621eb0ac42991
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Mon Jun 26 14:54:04 2017 +0100
+
+ Move statically linked xorgxkb files from dixmods to a separate directory
+
+ [ajax: Fixed test/Makefile.am as well]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit fbdd73fac68383c93f6f5c6a7615860503039999)
+
+commit 359186b13bc6ea6d8c3340c392c0aba5b9376a5d
+Author: Dawid Kurek <dawid.kurek@displaylink.com>
+Date: Thu Jul 6 14:51:11 2017 +0200
+
+ modesetting: Blacklist EVDI devices from PRIME sync
+
+ UDL (usb) devices are blacklisted because of they weird behaviour when
+ it comes to vblank events. As EVDI uses very similar model of handling
+ vblanks it should be treated similarly.
+
+ When doing a page flip, EVDI does not wait for real vblank, but
+ simulates it by adding constant delay. It also does not support
+ DRM_IOCTL_WAIT_VBLANK.
+
+ In contrast to UDL, EVDI uses platform devices, thus instead of 'usb' in
+ path they all have 'platform'.
+
+ It is possible to blacklist by 'platform', so without explicitly saying
+ 'evdi', but it might be misleading when it comes to real reason for it.
+
+ Signed-off-by: Dawid Kurek <dawid.kurek@displaylink.com>
+ (cherry picked from commit fbd80b2c8ebe9fd41229dc5438524d107c071ff1)
+
+commit 5571318f22f17883e26977a4c72e1e46d17bdf5d
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Sep 25 16:18:22 2017 -0700
+
+ modesetting: Skip no-longer-present connectors when resetting BAD links
+
+ Outputs may have NULL mode_output (connector) pointers if the
+ connector disappears while the server is running. Skip these when
+ resetting outputs with BAD link status.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 37f4e7651a2fd51efa613a08a1e705553be33e76)
+
+commit 787655d5df0c8c43e5e424af3e6e35b8daf54a7d
+Author: Martin Peres <martin.peres@linux.intel.com>
+Date: Mon Apr 10 16:48:21 2017 +0300
+
+ modesetting: re-set the crtc's mode when link-status goes BAD
+
+ Despite all the careful planning of the kernel, a link may become
+ insufficient to handle the currently-set mode. At this point, the
+ kernel should mark this particular configuration as being broken
+ and potentially prune the mode before setting the offending connector's
+ link-status to BAD and send the userspace a hotplug event. This may
+ happen right after a modeset or later on.
+
+ Upon receiving a hot-plug event, we iterate through the connectors to
+ re-apply the currently-set mode on all the connectors that have a
+ link-status property set to BAD. The kernel may be able to get the
+ link to work by dropping to using a lower link bpp (with the same
+ display bpp). However, the modeset may fail if the kernel has pruned
+ the mode, so to make users aware of this problem a warning is outputed
+ in the logs to warn about having a potentially-black display.
+
+ This patch does not modify the current behaviour of always propagating
+ the events to the randr clients. This allows desktop environments to
+ re-probe the connectors and select a new resolution based on the new
+ (currated) mode list if a mode disapeared. This behaviour is expected in
+ order to pass the Display Port compliance tests.
+
+ Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit bcee1b76aa0db8525b491485e90b8740763d7de6)
+
+commit 126144c2355ce5a3a350f15ef97389c7f34bb6fb
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri May 5 09:04:35 2017 +1000
+
+ xfree86: up the path name size to 512 in xf86MatchDriverFromFiles
+
+ ./hw/xfree86/common/xf86pciBus.c: In function ‘xf86MatchDriverFromFiles’:
+ ../hw/xfree86/common/xf86pciBus.c:1330:52: warning: ‘snprintf’ output may be
+ truncated before the last format character [-Wformat-truncation=]
+ snprintf(path_name, sizeof(path_name), "%s/%s", ^~~~~~~
+ ../hw/xfree86/common/xf86pciBus.c:1330:13: note: ‘snprintf’ output between 2
+
+ dirent->d_name is 256, so sprintf("%s/%s") into a 256 buffer gives us:
+
+ and 257 bytes into a destination of size 256
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 96af794dc648eadcd596893412d7530e92cb5421)
+
+commit a114286c079c42067b001ac330501496e2e297a1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Sep 6 11:53:02 2017 +1000
+
+ test: fix compiler warning
+
+ signal-logging.c:182:12: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit ea82ececbf85a7ac3d0931687f44c57534fde17c)
+
+commit d230e12d7dac4461626d0c6edfd692571592a280
+Author: Nick Sarnie <commendsarnex@gmail.com>
+Date: Sat Sep 23 17:35:48 2017 -0400
+
+ suid: Include sysmacros.h to fix build after glibc-2.25
+
+ [Added HAVE_SYS_SYSMACROS_H guard - ajax]
+
+ Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 84e3b96b531363e47f6789aacfcae4aa60135e2e)
+
+commit c5320244a3501aaf9558715e9097a2a625cb768b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Apr 27 14:45:25 2017 -0400
+
+ xfree86: Silence a new glibc warning
+
+ glibc would like to stop declaring major()/minor() macros in
+ <sys/types.h> because that header gets included absolutely everywhere
+ and unix device major/minor is perhaps usually not what's expected. Fair
+ enough. If one includes <sys/sysmacros.h> as well then glibc knows we
+ meant it and doesn't warn, so do that if it exists.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit d732c36597fab2e9bc4f2aa72cf1110997697557)
+
+commit 0e79797e3cb3f8fafe271f4f233a8a8fd25f2001
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Aug 30 15:11:45 2017 -0400
+
+ os: Fix warning in LockServer
+
+ The meson build gives me:
+
+ ../os/utils.c: In function ‘LockServer’:
+ ../os/utils.c:310:40: warning: ‘snprintf’ output may be truncated before the last format character [-Wformat-truncation=]
+ snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
+ ^~~~~~~~~
+ ../os/utils.c:310:5: note: ‘snprintf’ output between 12 and 13 bytes into a destination of size 12
+ snprintf(pid_str, sizeof(pid_str), "%10ld\n", (long) getpid());
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Which seems to be due to the %d part meaning that a negative number's -
+ sign would be one wider than we're expecting. Fine, just coerce it to
+ unsigned.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit aabf65d2a0206bd1a9c6e9a9f3153ded873dfd43)
+
+commit 69ab094a08513849bb68cd2750840e88db6e5933
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Jul 26 16:00:38 2017 +0200
+
+ glamor: Avoid overflow between box32 and box16 box
+
+ glamor_compute_transform_clipped_regions() uses a temporary box32
+ internally which is copied back to a box16 to init the regions16,
+ thus causing a potential overflow.
+
+ If an overflow occurs, the given region is invalid and the pixmap
+ init region will fail.
+
+ Simply check that the coordinates won't overflow when copying back to
+ the box16, avoiding a crash later down the line in glamor.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101894
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Tested-by: Fabrice Bellet <fabrice@bellet.info>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 9869dcb349b49f6d4cc2fab5d927cd8b1d1f463c)
+
+commit 421814bc81ba8dfaa9be59b8b35b3a9114dbcb8b
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Jul 26 16:00:37 2017 +0200
+
+ glamor: handle NULL source picture
+
+ COMPOSITE_REGION() can pass NULL as a source picture, make sure we
+ handle that nicely in both glamor_composite_clipped_region() and
+ glamor_composite_choose_shader().
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101894
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit bd353e9b84e013fc34ed730319d5b63d20977903)
+
+commit baa25315014af350c9c04c2c83beeee36aead042
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu Aug 31 10:23:00 2017 +0200
+
+ xwayland: Fix a segfault with pointer locking
+
+ Xwayland would crash in some circumstances while trying to issue a
+ pointer locking when the cursor is hidden when there is no seat focus
+ window set.
+
+ The crash signature looks like:
+
+ #0 zwp_pointer_constraints_v1_lock_pointer ()
+ #1 xwl_pointer_warp_emulator_lock () at xwayland-input.c:2584
+ #2 xwl_seat_maybe_lock_on_hidden_cursor () at xwayland-input.c:2756
+ #3 xwl_seat_maybe_lock_on_hidden_cursor () at xwayland-input.c:2765
+ #4 xwl_seat_cursor_visibility_changed () at xwayland-input.c:2768
+ #5 xwl_set_cursor () at xwayland-cursor.c:245
+ #6 miPointerUpdateSprite () at mipointer.c:468
+ #7 miPointerDisplayCursor () at mipointer.c:206
+ #8 CursorDisplayCursor () at cursor.c:150
+ #9 AnimCurDisplayCursor () at animcur.c:220
+ #10 ChangeToCursor () at events.c:936
+ #11 ActivatePointerGrab () at events.c:1542
+ #12 GrabDevice () at events.c:5120
+ #13 ProcGrabPointer () at events.c:4908
+ #14 Dispatch () at dispatch.c:478
+ #15 dix_main () at main.c:276
+
+ xwl_pointer_warp_emulator_lock() tries to use the surface from the
+ xwl_seat->focus_window leading to a NULL pointer dereference when that
+ value is NULL.
+
+ Check that xwl_seat->focus_window is not NULL earlier in the stack in
+ xwl_seat_maybe_lock_on_hidden_cursor() and return early if not the case
+ to avoid the crash.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=102474
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit cdd0352ba05d4d8482aaca41797e05d40e58da36)
+
+commit 6f29c8375281c0337ab94f7919a70c20149b0fc6
+Author: Michal Srb <msrb@suse.com>
+Date: Fri Jul 7 17:21:46 2017 +0200
+
+ Xi: Test exact size of XIBarrierReleasePointer
+
+ Otherwise a client can send any value of num_barriers and cause reading or swapping of values on heap behind the receive buffer.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 211e05ac85a294ef361b9f80d689047fa52b9076)
+
+commit c8eb79c1834cef5657e227844111052e0dd78661
+Author: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Date: Thu Jun 29 13:29:58 2017 -0700
+
+ dri2: Sync i965_pci_ids.h from Mesa.
+
+ Copied from Mesa with no modifications.
+
+ Gives us Coffee Lake and Cannon Lake PCI IDs.
+
+ Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
+ Acked-by: Kenneth Graunke <kenneth@whitecape.org>
+ (cherry picked from commit abb031e731f5c159add1b3351de9c4bb121bf00a)
+
+commit 37815323721790c4311faff9743f4d2f902b5506
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Jun 29 10:32:00 2017 -0400
+
+ wayland: Sync drm.xml with Mesa
+
+ ... where it is named src/egl/wayland/wayland-drm/wayland-drm.xml and
+ has its requests sorted by protocol version number, avoiding a warning
+ from wayland-scanner.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+ (cherry picked from commit 04511a0476b5c860e7d157b01080dff94d935f74)
+
+commit 0934d56dc804780f3e83ae0153c797d392e6faba
Author: Michel Dänzer <michel.daenzer@amd.com>
-Date: Wed Mar 30 18:23:04 2016 +0900
+Date: Fri Jun 16 11:30:03 2017 +0900
- os: Use strtok instead of xstrtokenize in ComputeLocalClient
+ xfree86/modes: Use RRTransformEqual in xf86RandR12CrtcSet
- Fixes leaking the memory pointed to by the members of the array returned
- by xstrtokenize.
+ The memcmp didn't catch when e.g. only the filter changed. Tested by
+ alternately running
+
+ xrandr --output DVI-I-0 --scale-from 3840x2160 --filter bilinear
+ xrandr --output DVI-I-0 --scale-from 3840x2160 --filter nearest
+
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+ (cherry picked from commit 4212c884c423e5ce2cd3b4d67c0d656475fddc79)
+
+commit 358f0bcd4f6703302b8895e42e20d1cbdfff102e
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Jun 15 14:28:27 2017 -0700
+
+ randr: Use RRTransformEqual in RRCrtcPendingTransform
+
+ Currently, RRCrtcPendingTransform returns false unless the
+ transformation matrix itself is changing. This makes RRCrtcSet skip
+ doing anything if the only thing that is changing is the transform
+ filter.
+
+ There's already a function for comparing RRTransformPtrs, so use that
+ instead.
+
+ Tested by running
+
+ xrandr --output DP-1 --mode 1920x1080 --rate 144 --scale 0.5x0.5 --filter nearest
+
+ follwed by
+
+ xrandr --output DP-1 --mode 1920x1080 --rate 144 --scale 0.5x0.5 --filter bilinear
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+ Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit 091af80be48c37f16c679d35fc12ad33e6b0cd74)
+
+commit ed8fbabacac3cd4c7798bd36713894a2068cee13
+Author: Michal Srb <msrb@suse.com>
+Date: Wed May 24 15:54:42 2017 +0300
+
+ Xi: Do not try to swap GenericEvent.
+
+ The SProcXSendExtensionEvent must not attempt to swap GenericEvent because
+ it is assuming that the event has fixed size and gives the swapping function
+ xEvent-sized buffer.
+
+ A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway.
+
+ Signed-off-by: Michal Srb <msrb@suse.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit ba336b24052122b136486961c82deac76bbde455)
+
+commit e8f6a1bb77cbd1bb30d8dc956c5fdc98e25a22aa
+Author: Michal Srb <msrb@suse.com>
+Date: Wed May 24 15:54:41 2017 +0300
+
+ Xi: Verify all events in ProcXSendExtensionEvent.
+
+ The requirement is that events have type in range
+ EXTENSION_EVENT_BASE..lastEvent, but it was tested
+ only for first event of all.
+
+ Signed-off-by: Michal Srb <msrb@suse.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 8caed4df36b1f802b4992edcfd282cbeeec35d9d)
+
+commit 21f559038c8776acc6439faadbdcab7df4300c66
+Author: Michal Srb <msrb@suse.com>
+Date: Wed May 24 15:54:40 2017 +0300
+
+ dix: Disallow GenericEvent in SendEvent request.
+
+ The SendEvent request holds xEvent which is exactly 32 bytes long, no more,
+ no less. Both ProcSendEvent and SProcSendEvent verify that the received data
+ exactly match the request size. However nothing stops the client from passing
+ in event with xEvent::type = GenericEvent and any value of
+ xGenericEvent::length.
+
+ In the case of ProcSendEvent, the event will be eventually passed to
+ WriteEventsToClient which will see that it is Generic event and copy the
+ arbitrary length from the receive buffer (and possibly past it) and send it to
+ the other client. This allows clients to copy unitialized heap memory out of X
+ server or to crash it.
+
+ In case of SProcSendEvent, it will attempt to swap the incoming event by
+ calling a swapping function from the EventSwapVector array. The swapped event
+ is written to target buffer, which in this case is local xEvent variable. The
+ xEvent variable is 32 bytes long, but the swapping functions for GenericEvents
+ expect that the target buffer has size matching the size of the source
+ GenericEvent. This allows clients to cause stack buffer overflows.
+
+ Signed-off-by: Michal Srb <msrb@suse.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 215f894965df5fb0bb45b107d84524e700d2073c)
+
+commit cdf15ab8f94d54bce72f37653fc46daf482b1671
+Author: Michal Srb <msrb@suse.com>
+Date: Wed May 24 15:54:39 2017 +0300
+
+ Xi: Zero target buffer in SProcXSendExtensionEvent.
+
+ Make sure that the xEvent eventT is initialized with zeros, the same way as
+ in SProcSendEvent.
+
+ Some event swapping functions do not overwrite all 32 bytes of xEvent
+ structure, for example XSecurityAuthorizationRevoked. Two cooperating
+ clients, one swapped and the other not, can send
+ XSecurityAuthorizationRevoked event to each other to retrieve old stack data
+ from X server. This can be potentialy misused to go around ASLR or
+ stack-protector.
+
+ Signed-off-by: Michal Srb <msrb@suse.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 05442de962d3dc624f79fc1a00eca3ffc5489ced)
+
+commit 3a53e4407fb9e0c0e0dbf8d147b67f6e36aea5ae
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Jun 6 18:42:06 2017 +0900
+
+ glamor: Fix temporary pixmap coordinate offsets
+
+ The previous values happened to work in basic cases, but not in general
+ if the destination is a subwindow or has a border.
+
+ Fixes crash with xli, which moves a large subwindow inside a smaller
+ parent window for scrolling.
+
+ No regressions with xterm, x11perf -copyplane or the xscreensaver
+ phosphor hack.
+
+ Bug: https://bugs.debian.org/857983
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit ffda82ed04d28feae2e001dbd0c32d6c795d90b1)
+
+commit 87a7393799ab5d1ea4a19ae7687cd50ac0dceeb4
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 12 14:43:23 2017 -0400
+
+ modesetting: Validate the atom for enum properties
+
+ The client could have said anything here, and if what they said doesn't
+ actually name an atom NameForAtom() will return NULL, and strcmp() will
+ be unhappy about that.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit d4995a3936ae283b9080fdaa0905daa669ebacfc)
+
+commit faeee7646695261e60ea03d934a0c496a429f31b
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Sun May 28 15:56:21 2017 +0200
+
+ Xi: Use WarpPointerProc hook on XI pointer warping implementation
+
+ Just like we do with XWarpPointer's.
+
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 95febc42cadf392a888104ad6d5cf4f34fdde7d5)
+
+commit c6df0d03de22b57d5faa77b19ac1ec0311f4f3a5
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Sun May 28 15:56:20 2017 +0200
+
+ xwayland: Lock the pointer if it is confined and has no cursor
+
+ In the typical pattern in games of "hide cursor, grab with a confineTo,
+ warp constantly the pointer to the middle of the window" the last warping
+ step is actually rather optional. Some games may choose to just set up a
+ grab with confineTo argument, and trust that they'll get correct relative
+ X/Y axis values despite the hidden cursor hitting the confinement window
+ edge.
+
+ To cater for these cases, lock the pointer whenever there is a pointer
+ confinement and the cursor is hidden. This ensures the pointer position
+ is in sync with the compositor's when it's next shown again, and more
+ importantly resorts to the relative pointer for event delivery.
+
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit ca17f3e9fd3b59fdc5ffd0e5d78e4db6ddc87aa1)
+
+commit 2ccea152c091e25474a83588e18475567471e7c8
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Sun May 28 15:56:19 2017 +0200
+
+ xwayland: Update root window size when desktop size changes
+
+ This fixes grabs on InputOnly windows whose parent is the root window
+ failing with GrabNotViewable. This is due to window->borderSize/windowSize
+ being computed as clipped by its parent, resulting in a null region.
+
+ Setting up the right size on the root window makes the InputOnly size
+ correct too, so the GrabNotViewable paths aren't hit anymore.
+
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 513e3bd3870fdb8a8e0e2e52c0fa93872300bc8b)
+
+commit 0e5b08f2eef946e9d9d071f0a79ead379419d8a7
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Sun May 28 15:56:18 2017 +0200
+
+ xwayland: "Accept" confineTo on InputOnly windows
+
+ Of sorts, actually make it confine to the pointer focus, as the
+ InputOnly window is entirely invisible to xwayland accounting,
+ we don't have a xwl_window for it.
+
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit fafdb0cc9697eb53635ed1e78bec1d4cd87ab3a2)
+
+commit 420f77a1ba8bfbbf8c06f6dd57e9ee36124b7360
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Sun May 28 15:56:17 2017 +0200
+
+ xwayland: Allow pointer warp on root/None window
+
+ Of sorts, as we can't honor pointer warping across the whole root window
+ coordinates, peek the pointer focus in these cases.
+
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit c217fcb4c4640ffd2fefee63c6fcd7ea5e64b942)
+
+commit 40edd409bfc527223dfae89c7f84fea0721dec49
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri May 26 12:30:13 2017 +0900
+
+ glamor: Store the actual EGL/GLX context pointer in lastGLContext
+
+ Fixes subtle breakage which could sometimes trigger after a server reset
+ with multiple screens using glamor:
+
+ Screen A enters glamor_close_screen last and calls various cleanup
+ functions, which at some point call glamor_make_current to make sure
+ screen A's GL context is current. This sets lastGLContext to screen A's
+ &glamor_priv->ctx. Finally, glamor_close_screen calls
+ glamor_release_screen_priv, which calls free(glamor_priv).
+
+ Later, screen B enters glamor_init, which allocates a new glamor_priv.
+ With bad luck, this can return the same pointer which was previously
+ used for screen A's glamor_priv. So when screen B's glamor_init calls
+ glamor_make_current, lastGLContext == &glamor_priv->ctx, so MakeCurrent
+ isn't called for screen B's GL context, and the following OpenGL API
+ calls triggered by glamor_init mess up screen A's GL context.
+
+ The observed end result of this was a crash in glamor_get_vbo_space
+ because glamor_priv->vbo didn't match the GL context, though there might
+ be other possible outcomes.
+
+ Assigning the actual GL context pointer to lastGLContext prevents this
+ by preventing the false negative test in glamor_make_current.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit 7c88977d338a01aca866e52c9e736f8857fb9ae4)
+
+commit 7c4f7b3a49a43984ab90788b85b35078feadf42a
+Author: Lyude <lyude@redhat.com>
+Date: Tue May 30 16:39:49 2017 -0400
+
+ xwayland: Don't load extension list more than once
+
+ When running an Xwayland server from the command line, we end up
+ resetting the server every time all of the clients connected to the
+ server leave. This would be fine, except that xwayland makes the mistake
+ of unconditionally calling LoadExtensionList(). This causes us to setup
+ the glxExtension twice in a row which means that when we lose our last
+ client on the second server generation, we end up trying to call the glx
+ destructors twice in a row resulting in a segfault:
+
+ (EE)
+ (EE) Backtrace:
+ (EE) 0: Xwayland (OsSigHandler+0x3b) [0x4982f9]
+ (EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x70845bf]
+ (EE) 2: /usr/lib64/dri/swrast_dri.so (__driDriverGetExtensions_virtio_gpu+0x32897d) [0x1196e5bd]
+ (EE) 3: /usr/lib64/dri/swrast_dri.so (__driDriverGetExtensions_virtio_gpu+0x328a45) [0x1196e745]
+ (EE) 4: /usr/lib64/dri/swrast_dri.so (__driDriverGetExtensions_virtio_gpu+0x32665f) [0x11969f7f]
+ (EE) 5: Xwayland (__glXDRIscreenDestroy+0x30) [0x54686e]
+ (EE) 6: Xwayland (glxCloseScreen+0x3f) [0x5473db]
+ (EE) 7: Xwayland (glxCloseScreen+0x53) [0x5473ef]
+ (EE) 8: Xwayland (dix_main+0x7b6) [0x44c8c9]
+ (EE) 9: Xwayland (main+0x28) [0x61c503]
+ (EE) 10: /lib64/libc.so.6 (__libc_start_main+0xf1) [0x72b1401]
+ (EE) 11: Xwayland (_start+0x2a) [0x4208fa]
+ (EE) 12: ? (?+0x2a) [0x2a]
+ (EE)
+ (EE) Segmentation fault at address 0x18
+ (EE)
+ Fatal server error:
+ (EE) Caught signal 11 (Segmentation fault). Server aborting
+ (EE)
+
+ Easy reproduction recipe:
+ - Start an Xwayland session with the default settings
+ - Open a window
+ - Close that window
+ - Open another window
+ - Close that window
+ - Total annihilation occurs
+
+ Signed-off-by: Lyude <lyude@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 4f29366f1e5678505fb882143c9b4a892d5b8273)
+
+commit d8f63717e05ae8d820ceae74216916ebd180441d
+Author: Jason Gerecke <killertofu@gmail.com>
+Date: Fri May 26 14:27:19 2017 -0700
+
+ xfree86: Fix interpretation of xf86WaitForInput timeout
+
+ Commit aa6717ce2 switched xf86WaitForInput from using select(2) to using
+ poll(2). Before this change, the timeout was interpreted as being in
+ microseconds; afterwards it is fed directly to xorg_poll which interprets
+ it as being in milliseconds. This results in the function potentially
+ blocking 1000x longer than intended. This commit scales down the timeout
+ argument before passing it to xorg_poll, being careful to ensure the result
+ is not rounded down due to integer division.
+
+ Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 2fbf62b2fb3dcb29551251d09aa695715bb754f4)
+
+commit 444929b446a0ef5873d6346c3f3091adb8fbe6bb
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 10 21:50:45 2017 -0700
+
+ dix: Remove clients from input and output ready queues after closing
+
+ Delay removing the client from these two queues until all potential
+ I/O has completed in case we mark the client as ready for reading or
+ with pending output during the close operation.
+
+ Bugzilla: https://bugs.freedesktop.org/100957
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Nick Sarnie <commendsarnex@gmail.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit d9e23ea4228575344e3b4c0443cecc5eb75356e4)
+
+commit d808b573992ae1fc7706d8897a92783b847040e3
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Apr 29 00:26:10 2017 -0700
+
+ os: Mark client as ready to read when closing due to write failure [100863]
+
+ This makes sure the server will go look at the client again, notice
+ that the FD is no longer valid and close the client down.
+
+ Bugzilla: https://bugs.freedesktop.org/100863
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit e2f68296ffb8e40035c0ebd949b67d1e2e424e11)
+
+commit 7a2525fba60a04a95a4a8b26c2b628dc8fdfdeff
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Apr 29 00:21:47 2017 -0700
+
+ os: un-duplicate code to close client on write failure
+
+ There are three copies of the same short sequence of operations to
+ close down a client when a write error occurs. Create a new function,
+ AbortClient, which performs these operations and then call it from the
+ three places.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit a82971b07035ee9a4e3ed01326e7c1eab34b5a19)
+
+commit b3de3ebcf450fd4ab1543dd2f133e45e9c0b9e7e
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Apr 26 18:31:08 2017 +0900
+
+ os: Handle SIGABRT
+
+ Without this, assertion failures can make life hard for users and those
+ trying to help them.
+
+ v2:
+ * Change commit log wording slightly to "can make life hard", since
+ apparently e.g. logind can alleviate that somewhat.
+ * Set default handler for SIGABRT in
+ hw/xfree86/common/xf86Init.c:InstallSignalHandlers() and
+ hw/xquartz/quartz.c:QuartzInitOutput() (Eric Anholt)
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit 27a6b9f7c84c914d0f5909ec1069d72f5035bc04)
+
+commit e59a32c897c9f093f54ce4b695e9aff1ba20bda2
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri Apr 21 09:05:51 2017 +0200
+
+ glamor: an FBO is not needed for Xv pixmaps
+
+ It appears that on some hardware/diver combo such as nv30/nouveau, using
+ GL_ALPHA as format for 8-bit depth will cause an incomplete attachment
+ error (GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT) when trying to bind the
+ texture.
+
+ As a result, the FBO is NULL and glamor segfaults when trying to access
+ the FBO width/height in pixmap_priv_get_scale() in glamor_xv_render().
+
+ This happens with glamor-xv which uses 8-bit pixmaps, meaning that on
+ such hardware/driver, trying to play a video using Xv will lead to a
+ crash of the Xserver. This affects Xwayland, Xephyr, modesetting driver
+ with glamor accel.
+
+ But the use of an FBO is not actually needed for glamox-xv, so by
+ disabling FBO at pixmap creation, we can avoid the issue entirely.
+
+ Fix suggested by Eric Anholt <eric@anholt.net>
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100710
+ Fixes: https://bugzilla.redhat.com/1412814
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit 7bfb87a2137853295ecc9e544a15626cfd773a02)
+
+commit 6a6bf1ae046124a9d8a6f3f53f02707951c85c43
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Apr 12 17:58:05 2017 +0900
+
+ xfree86/modes: Make colormap/gamma glue code work with RandR disabled
+
+ E.g. because Xinerama is enabled.
+
+ Fixes crash on startup and wrong colours in that case.
+
+ Bugzilla: https://bugs.freedesktop.org/100293
+ Bugzilla: https://bugs.freedesktop.org/100294
+ Fixes: 62f44052573b ("xfree86/modes: Move gamma initialization to
+ xf86RandR12Init12 v2")
+ Tested-by: Mariusz Bialonczyk <manio@skyboo.net>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ (cherry picked from commit 41dafcc2a2942fc4c94ce3cbafc4a1b413c460c3)
+
+commit 74126530c0c22cf3e5f8bd2dd2740fded2df098f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Apr 7 10:24:54 2017 -0400
+
+ xephyr: Check for host XVideo support before trying to use it
+
+ Otherwise xcb will treat our attempt to send xv requests as a connection
+ error (quite reasonably: we're asking it to emit a request for which
+ there is no defined major opcode), and we'll die quietly the first time
+ we hit KdBlockhandler.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit 14d2fe74f4e51c5b37eab4b7475c804a0340b530)
+
+commit 60ae865a703cb2c51c0b00cd768a46a20d79f0f1
+Author: Daniel Stone <daniels@collabora.com>
+Date: Fri Apr 7 14:27:58 2017 +0100
+
+ modesetting: Set correct DRM event context version
+
+ DRM_EVENT_CONTEXT_VERSION is the latest context version supported by
+ whatever version of libdrm is present. modesetting was blindly asserting
+ it supported whatever version that may be, even if it actually didn't.
+
+ With libdrm 2.4.78, setting a higher context version than 2 will attempt
+ to call the page_flip_handler2 vfunc if it was non-NULL, which being a
+ random chunk of stack memory, it might well have been.
+
+ Set the version as 2, which should be bumped only with the appropriate
+ version checks.
Reviewed-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit e156c0ccb530897d3a428255bd5585f7ea7b9b41)
+ Signed-off-by: Daniel Stone <daniels@collabora.com>
+ (cherry picked from commit 0c8e6ed85810e96d84173a52d628863802a78d82)
+
+commit df4d01e6aa957ec8eb2814832de2f78ca42ee238
+Author: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Sun Mar 12 14:21:38 2017 +0100
+
+ dmx: Fix null pointer dereference
+
+ A null pointer dereference can occur in dmxSync, because TimerForce
+ does not handle a null pointer.
+
+ dmxSyncTimer is set to NULL a few lines above on a certain condition,
+ which happened on my machine. The explicit NULL check allowed me to
+ start Xdmx again without a segmentation fault.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 21eda7464d0e13ac6558edaf6531c3d3251e05df)
+
+commit e23000d83f8dbab4effd9f344f3d776634a1d56e
+Author: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Sun Mar 19 17:55:07 2017 +0100
+
+ record: Fix OOB access in ProcRecordUnregisterClients
+
+ If a client sends a RecordUnregisterClients request with an nClients
+ field larger than INT_MAX / 4, an integer overflow leads to an
+ out of boundary access in RecordSanityCheckClientSpecifiers.
+
+ An example line with libXtst would be:
+ XRecordUnregisterClients(dpy, rc, clients, 0x40000001);
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 40c12a76c2ae57adefd3b1d412387ebbfe2fb784)
+
+commit 3166138ea681537dbe164e2888ccb96bb022220b
+Author: Kenneth Graunke <kenneth@whitecape.org>
+Date: Fri Mar 17 13:45:04 2017 -0700
+
+ dri2: Sync i965_pci_ids.h from Mesa.
+
+ Copied from Mesa with no modifications. Gives us Geminilake PCI IDs.
+
+ Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
+ Acked-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit 368f60d461421fe5e2bbd90652d6ac858dbff8fe)
+
+commit 2191f9b49e5e542e39f451d1819de00043a90e8f
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri Mar 17 15:58:26 2017 +0100
+
+ glamor: avoid a crash if texture allocation failed
+
+ Texture creation in _glamor_create_tex() can fail if a GL_OUT_OF_MEMORY
+ is raised, in which case the texture returned is zero.
+
+ But the texture value is not checked in glamor_create_fbo() and glamor
+ will abort in glamor_pixmap_ensure_fb() because the fbo->tex is 0:
+
+ Truncated backtrace:
+ Thread no. 1 (10 frames)
+ #4 glamor_pixmap_ensure_fb at glamor_fbo.c:57
+ #5 glamor_create_fbo_from_tex at glamor_fbo.c:112
+ #6 glamor_create_fbo at glamor_fbo.c:159
+ #7 glamor_create_fbo_array at glamor_fbo.c:210
+ #8 glamor_create_pixmap at glamor.c:226
+ #9 compNewPixmap at compalloc.c:536
+ #10 compAllocPixmap at compalloc.c:605
+ #11 compCheckRedirect at compwindow.c:167
+ #12 compRealizeWindow at compwindow.c:267
+ #13 RealizeTree at window.c:2617
+
+ Check the value returned by _glamor_create_tex() in glamor_create_fbo()
+ and return NULL in the texture is zero.
+
+ All callers of glamor_create_fbo() actually check the returned value and
+ will use a fallback code path if it's NULL.
+
+ Please cherry-pick this to active stable branches.
+
+ Bugzilla: https://bugzilla.redhat.com/1433305
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit 8805a48ed35afb2ca66315656c1575ae5a01c639)
-commit 3c4cead499f10dabac20ab87728746ec41dae799
+commit 0f3196bf805b1d36b786852096dd86be290a2c9d
Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Mar 28 18:11:09 2016 +0900
+Date: Fri Mar 17 12:40:03 2017 -0400
- os: Treat ssh as a non-local client (v4)
+ ephyr: Don't clobber bitsPerPixel when using glamor
- By the time we get to ComputeLocalClient, we've already done
- NextAvailableClient → ReserveClientIds → DetermineClientCmd (assuming
- we're built with #define CLIENTIDS), so we can look up the name of the
- client process and refuse to treat ssh's X forwarding as if it were
- local.
+ This ends up passing 0 as the bpp argument to fb screen setup, which is
+ not really the best plan.
- v2: (Michel Dänzer)
- * Only match "ssh" itself, not other executable names starting with
- that prefix.
- * Ignore executable path for the match.
- v3: (Michel Dänzer)
- * Use GetClientCmdName (Mark Kettenis)
- * Perform check on Windows as well, but only ignore path on Cygwin
- (Martin Peres, Emil Velikov, Jon Turney)
- v4: (Michel Dänzer)
- * Cut of any colon and whatever comes after it. (Adam Jackson)
- * Add bugzilla reference.
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 83c4297d2c4fd501a9d36bc0cb7d357a8d22394c)
+
+commit c58bff7e9601b3eeb0be95c0a60c6588d051e923
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Mar 15 17:51:46 2017 -0700
+
+ glamor: Fix dashed line rendering.
- Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261
+ We were binding the screen pixmap as the dash and sampling its alpha,
+ which is usually just 1.0 (no dashing at all).
+
+ Please cherry-pick this to active stable branches.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit fe0b297420fc1de8a7fab28457d0864b3182e967)
+
+commit 2f36c6faa0dac168cee6049d7dfac59a5e32edcd
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Nov 2 12:49:25 2016 -0400
+
+ xinerama: Implement graphics exposures for window->pixmap copies (v4)
+
+ This code is using GetImage to accumulate a logical view of the window
+ image (since the windows will be clipped to their containing screen),
+ and then PutImage to load that back into the pixmap. What it wasn't
+ doing was constructing a region for the obscured areas of the window and
+ emitting graphics exposures for same.
+
+ v2: Fix coordinate translation when the source is the root window
+ v3: Create sourceBox with the right coordinates initially instead of
+ translating (Keith Packard)
+ v4: Clamp the region to 15 bits to avoid overflow (Keith Packard)
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit e337de2d488a124e5fee0fdcb882567b68f1767d)
+
+commit 8c609764004560081bad23ac14e7d3975e83ce6b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jan 23 11:31:36 2017 -0500
+
+ parser: Fix crash when xf86nameCompare(s1 = x, s2 = NULL)
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit f1f865e909090406841a9b9416ea6259a75c2086)
+
+commit 9db3361b29396684122b3db056368e927e8de6d6
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Mar 14 15:06:34 2017 +0100
+
+ glamor: Check glamor_set_destination_drawable() return value
+
+ Check the value returned by glamor_set_destination_drawable() and use
+ the fallback code path where possible.
+
+ Bugzilla: https://bugzilla.redhat.com/1417575
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ (cherry picked from commit 455051a0f1d2bc84f605c325f647bd64d414c47d)
+
+commit 703ba42ce658faadb3d8ad32ea03fa9c9f0c91b1
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Mar 14 14:58:26 2017 +0100
+
+ glamor: glamor_set_destination_drawable() can fail
+
+ The fbo_array of a given glamor pixmap can be NULL in some cases, as
+ glamor_create_fbo_array() can fail to allocate the FBO array.
+
+ If this is the case, glamor_pixmap_fbo_at() will return NULL even though
+ the box index is valid, and glamor_set_destination_drawable() simply
+ assumes glamor_pixmap_fbo_at() will return an FBO prior to pass the
+ value to glamor_set_destination_pixmap_fbo(), which will segfault.
+
+ We need a way for glamor_set_destination_drawable() to fail safely and
+ let the caller know about the failure.
+
+ Add a boolean return value to glamor_set_destination_drawable() for that
+ purpose.
+
+ Bugzilla: https://bugzilla.redhat.com/1417575
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ (cherry picked from commit 04b4bad7c048fd077fe839f10634c99ef1e488af)
+
+commit 52ab10aa9a98076227e7db40fcd4b19b55a66861
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Mar 14 15:22:32 2017 +0100
+
+ Xephyr: Check screen resources creation success
+
+ If the screen pixmap or the corresponding texture creation with glamor
+ fails, exit cleanly with an error message instead of segfaulting.
+
+ Fixes: https://bugzilla.redhat.com/1431633
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ (cherry picked from commit b0ce1d088a863492f5de11e4dbde10af4261d892)
+
+commit 2a47e328641c061d73b3fc4602343500d18500c1
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Mar 14 15:22:31 2017 +0100
+
+ glamor: Check for NULL pixmap in glamor_get_pixmap_texture()
+
+ glamor_create_pixmap() would return a NullPixmap if the given size is
+ larger than the maximum size of a pixmap.
+
+ But glamor_get_pixmap_texture() won't check if the given pixmap is
+ non-null, leading to a segfault if glamor_create_pixmap() failed.
+
+ This can be reproduced by passing Xephyr a very large screen width,
+ e.g.:
+
+ $ Xephyr -glamor -screen 32768x1024 :10
+
+ (EE)
+ (EE) Backtrace:
+ (EE) 0: Xephyr (OsSigHandler+0x29)
+ (EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0)
+ (EE) 2: Xephyr (glamor_get_pixmap_texture+0x30)
+ (EE) 3: Xephyr (ephyr_glamor_create_screen_resources+0xc6)
+ (EE) 4: Xephyr (ephyrCreateResources+0x98)
+ (EE) 5: Xephyr (dix_main+0x275)
+ (EE) 6: /lib64/libc.so.6 (__libc_start_main+0xf1)
+ (EE) 7: Xephyr (_start+0x2a)
+ (EE) 8: ? (?+0x2a) [0x2a]
+ (EE)
+ (EE) Segmentation fault at address 0x0
+ (EE)
+ Fatal server error:
+ (EE) Caught signal 11 (Segmentation fault). Server aborting
+ (EE)
+ Aborted (core dumped)
+
+ Bugzilla: https://bugzilla.redhat.com/1431633
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ (cherry picked from commit f40ff18c96e02ff18a367bf53feeb4bd8ee952a0)
+
+commit d88937ba8354d6a4e0be2a398037443146701ddc
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 15 13:44:05 2017 -0400
+
+ xserver 1.19.3
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit b258ed457d8f22cfba8a45b35a9be9b53fd37e1e
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Feb 17 08:18:52 2017 +0000
+
+ os: Fix iteration over busfaults
+
+ Fixes a regression from
+
+ commit 41da295eb50fa08eaacd0ecde99f43a716fcb41a
+ Author: Keith Packard <keithp@keithp.com>
+ Date: Sun Nov 3 13:12:40 2013 -0800
+
+ Trap SIGBUS to handle truncated shared memory segments
+
+ that causes the SIGBUS handler to fail to chain up correctly and
+ corrupts nearby memory instead.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit acdb5bf2de57c0080d2a6e730c788a0a428e13dc)
+
+commit 7c4fab2f1f411b6f7d7adc76271fca7c29365ac4
+Author: Tobias Stoeckmann <tobias@stoeckmann.org>
+Date: Mon Mar 13 19:13:14 2017 +0100
+
+ render: Fix out of boundary heap access
+
+ ProcRenderCreateRadialGradient and ProcRenderCreateConicalGradient must
+ be protected against an integer overflow during length check. This is
+ already included in ProcRenderCreateLinearGradient since the fix for
+ CVE-2008-2362.
+
+ This can only be successfully exploited on a 32 bit system for an
+ out of boundary read later on. Validated by using ASAN.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit ac15d4cecca377c5c31ab852c39bbd554ca48fe2)
+
+commit fbb46e0be897ffe78b731a2456673b4cbb73b2be
+Author: Dr.-Ing. Dieter Jurzitza <dieter.jurzitza@t-online.de>
+Date: Thu Feb 23 12:57:26 2017 -0500
+
+ glamor: Fix missing declaration in dash vertex shader
+
+ Fixes a GLSL compilation error:
+
+ Failed to compile VS: 0:13(43): error: `pos' undeclared
+ 0:13(14): error: operands to arithmetic operators must be numeric
+ 0:13(13): error: operands to arithmetic operators must be numeric
+
+ [1.19: Squash in Michel's typo fix from 0c1574d9]
+
+ Tested-by: Stefan Dirsch <sndirsch@suse.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit d8161aeb50891ae10c5656487ce8f982deed5f9f)
+ (cherry picked from commit 0c1574d9882a91b2c1a046bf4ac5a9b138a37965)
+
+commit 18fcb66688057f5676952e2535d4bb9942371199
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu Mar 2 10:19:26 2017 +0100
+
+ xwayland: Monitor client states to destroy callbacks
+
+ In XWayland, dri3_send_open_reply() is called from a sync callback, so
+ there is a possibility that the client might be gone when we get to the
+ callback eventually, which leads to a crash in _XSERVTransSendFd() from
+ WriteFdToClient() .
+
+ Client resources can survive the client itself, in which case we
+ may end up in our sync callback trying to access client's data after
+ it's been freed/reclaimed.
+
+ Add a ClientStateCallback handler to monitor the client state changes
+ and clear the sync callback set up by the glamor drm code if any.
+
+ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1416553
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100040
+ Tested-by: Mark B <mark.blakeney@bullet-systems.net>
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit 937527f9798d573ec82c2c508821899c229c018f)
+
+commit d402b86b4561eb2580421de91d977a35abe88190
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Mar 7 10:28:35 2017 +0100
+
+ xwayland: clear cursor frame callback
+
+ After an X cursor is unrealized, the seat's corresponding x_cursor is
+ cleared, but if a frame callback was pending at the time, it will
+ remain and thus prevent any further cursor update, leaving the window
+ with no cursor.
+
+ Make sure to destroy the frame callback, if any, when that occurs, so
+ that next time a cursor needs to be set, it won't be ignored for a frame
+ callback that will never be triggered.
+
+ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389327
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+ Reviewed-by: Rui Matos <tiagomatos@gmail.com>
+ (cherry picked from commit d4b7e0eaa4b2e97ce1dec653a2ae7d9621fe1431)
+
+commit db1326cd6625747e4036e6cdc75bc7a0e1b0426b
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Thu Jan 26 18:13:53 2017 +0800
+
+ present: disable page flip only when a slave crtc is active
+
+ This prevents the tearing of moving window in a composite WM
+ desktop when output slave is attached but none of its crtc is
+ really active.
+
+ [1.19: Also fix DMX_LIBS= in configure.ac so it still links - ajax]
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit bb9128fdc86decd6f6e3b0e145011a8c08b1d2b5)
+
+commit 1097bc9c184db4c722d5a8d2c5a4c0da9cdc70f5
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu Mar 9 11:25:34 2017 +0000
+
+ Revert "prime: Sync shared pixmap from root window instead of screen pixmap"
+
+ This reverts commit b5b292896f647c85f03f53b20b2f03c0e94de428.
+
+ This breaks the concept of the screen->pixmap_dirty_list as it no longer
+ tracks the relationship between the PixmapDirtyUpdate src and slave_dst,
+ for the supposed convenience of not tracking present flips.
+
+ Bugzilla: https://bugs.freedesktop.org/100086
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 0ec92f06d4b3bad2e62da24ee7fb64fc88a75820
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Mar 10 10:54:17 2017 -0500
+
+ Revert "present: Allow flipping with PRIME slave outputs"
+
+ This reverts commit 5c1dd4eba833ecf4ea789c8319b4e25ea1e1fab9.
+
+ Bugzilla: https://bugs.freedesktop.org/100086
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f23e65f96365706c69fa781b2c6cbf3203619c9f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 2 17:53:04 2017 -0500
+
+ xserver 1.19.2, no, really
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 96d4df934bb4397a251d7d1f2dc0e1296c2e9bb3
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 2 15:07:00 2017 -0500
+
+ xserver 1.19.2
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit f4ff7b6b559c3ebf7ec1156d170b3daa0618eec2
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 2 17:20:30 2017 -0500
+
+ os: Squash missing declaration warning for timingsafe_memcmp
+
+ timingsafe_memcmp.c:21:1: warning: no previous prototype for ‘timingsafe_memcmp’ [-Wmissing-prototypes]
+ timingsafe_memcmp(const void *b1, const void *b2, size_t len)
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 5c44169caed811e59a65ba346de1cadb46d266ec)
+
+commit 1aa40b96e2f099eabfeef66e77fff36dbd377aa0
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 2 15:43:15 2017 -0500
+
+ Revert "xserver 1.19.2"
+
+ Apparently I need to fight make distcheck some more, so let's not
+ pretend this is released yet.
+
+ This reverts commit 0b4112bc753a5bd5306f0c67e13e26e3f1c72211.
+
+commit 0b4112bc753a5bd5306f0c67e13e26e3f1c72211
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 2 15:07:00 2017 -0500
+
+ xserver 1.19.2
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit e4dd73b242522942d9a5f1c9cada92321710a682
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Mar 1 08:51:31 2017 +0100
+
+ xwayland: do not set checkRepeat on master kbd
+
+ keyboard_check_repeat() fetches the XWayland seat from the
+ dev->public.devicePrivate do do its thing.
+
+ If a key event is sent programmatically through Xtest, our device is the
+ virtual core keyboard and that has a dev->public.devicePrivate of NULL,
+ leading to a segfault in keyboard_check_repeat().
+
+ This is the case with "antimicro" which sends key events based on the
+ joystick buttons.
+
+ Don't set the checkRepeat handler on the VCK since it cannot possibly work
+ anyway and it has no effect on the actual checkRepeat intended functionality.
+
+ Bugzilla: https://bugzilla.redhat.com/1416244
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit fe5c340046c8cf755b92763a49b2dc475e856a76)
+
+commit c84f5c3dd19ae114da4eb3441b3e4e3a29f195df
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Feb 28 14:27:52 2017 +0100
+
+ xwayland: Make sure we have a focus window
+
+ During the InitInput() phase, the wayland events get dequeued so we
+ can possibly end up calling dispatch_pointer_motion_event().
+
+ If this occurs before xwl_seat->focus_window is set, it leads to a NULL
+ pointer derefence and a segfault.
+
+ Check for xwl_seat->focus_window in both pointer_handle_frame() and
+ relative_pointer_handle_relative_motion() prior to calling
+ dispatch_pointer_motion_event() like it's done in
+ pointer_handle_motion().
+
+ Bugzilla: https://bugzilla.redhat.com/1410804
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 8c9909a99292b2fb4a86de694bb0029f61e35662)
+
+commit 94c3454d9fdbcefb01042c5c9d88468d86dd4725
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Wed Mar 1 20:28:34 2017 +0100
+
+ Brown bag commit to fix 957e8d (arc4random_buf() support)
+
+ - typo in #ifdef check
+ - also need to add AC_CHECK_FUNCS([arc4random_buf])
+
+ Reported-by Eric Engestrom. Thanks
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+ (cherry picked from commit 386fbbe410a1168b724136e54cf3bd37fb64ad4e)
+
+commit b0298c02f0383760be899448fa666d0ea56f5d79
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Tue Feb 28 19:18:56 2017 +0100
+
+ auth: remove AuthToIDFunc and associated functions. Not used anymore.
+
+ And the current code for MitToId has a use-after-free() issue.
+
+ [Also remove the actual implementations - ajax]
+
+ Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit 2855f759b1e7bf7f5e57cac36c1f0d0e5ac1a683)
+
+commit ab15f65fe5d6d50e705c1064a6a5c1a0c2a8e045
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Tue Feb 28 19:18:43 2017 +0100
+
+ Use arc4random_buf(3) if available to generate cookies.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+ (cherry picked from commit 957e8db38f27932d353e86e9aa69cf16778b18f1)
+
+commit 3f61c7a09b220805ee6778f4bf2f429e3df8e37a
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Tue Feb 28 19:18:25 2017 +0100
+
+ Use timingsafe_memcmp() to compare MIT-MAGIC-COOKIES CVE-2017-2624
+
+ Provide the function definition for systems that don't have it.
+
+ Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ (cherry picked from commit d7ac755f0b618eb1259d93c8a16ec6e39a18627c)
+
+commit b5c98aa6779b97882246b03c5dea646bd1355991
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Feb 23 10:21:49 2017 +1000
+
+ os: log a bug whenever WriteToClient is called from the input thread
+
+ The input thread should generate events, not send them. Make it easier to
+ find the instances where it's doing so.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Tested-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
+ (cherry picked from commit 1b12249fd6d4d3b566043d556503f3f625b9b4ba)
+
+commit 04c72d3c30623e360fd0bd37ed559915b93467f4
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Feb 7 17:38:23 2017 +0900
+
+ damage: Validate source pictures bound to windows before unwrapping
+
+ The lower layers also do this, but no damage may be reported there,
+ since we unwrap before calling down.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99220
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ (cherry picked from commit 38696ea56854e055c31bd2730adfc7c39aa115b0)
+
+commit 5c1dd4eba833ecf4ea789c8319b4e25ea1e1fab9
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Feb 1 18:35:57 2017 +0900
+
+ present: Allow flipping with PRIME slave outputs
+
+ Works fine now.
+
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit 542d9f6807ac06b70f564ccab10af69fa21a1221)
+
+commit 10f8cf3572297764c6b50ac1f01b3ee195b1a453
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Feb 1 18:35:56 2017 +0900
+
+ prime: Sync shared pixmap from root window instead of screen pixmap
+
+ The screen pixmap doesn't receive updates while there's a Present flip
+ window.
+
+ [1.19: Squashed in a6566f9e to avoid intermediate regression - ajax]
+
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ (cherry picked from commit b5b292896f647c85f03f53b20b2f03c0e94de428)
+ (cherry picked from commit a6566f9e4dbf9ea9568a14e22cb5d004e10dbd4d)
+
+commit e2243e5b805df387cb3881b2298bffaac4f02942
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Jan 24 18:08:30 2017 +0100
+
+ glamor: Two pass won't work on memory pixmaps
+
+ When selecting "CA_TWO_PASS" in glamor_composite_clipped_region() when
+ the hardware does not support "GL_ARB_blend_func_extended", we call
+ glamor_composite_choose_shader() twice in a row, which in turn calls
+ glamor_pixmap_ensure_fbo().
+
+ On memory pixmaps, the first call will set the FBO and the second one
+ will fail an assertion in glamor_upload_picture_to_texture() because
+ the FBO is already set.
+
+ Bail out earlier when the mask pixmap is in memory and the hardware
+ capabilities would require to use two pass, so that the assertion is not
+ failed and the rendering is correct.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99346
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit 86463981361064dd0352ec215abf1696ce7fc5ea)
+
+commit ada5328290f444e3fc0e6a05557d5963dec626e5
+Author: Svitozar Cherepii <razotivs@gmail.com>
+Date: Fri Feb 3 01:49:04 2017 +0200
+
+ xwayland: Add hack for FWXGA resolution #99574
+
+ For some applications (like fullscreen games) it matters for XRandr
+ resolution to be correctly set and equal to root window resolution.
+
+ In XServer there is already hack for this, adapted it for XWayland.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99574
+
+ Signed-off-by: Svitozar Cherepii <razotivs@gmail.com>
+ Tested-by: Svitozar Cherepii <razotivs@gmail.com>
+ Acked-by: Olivier Fourdan <ofourdan@redhat.com>
+ (cherry picked from commit 1c78bec9ca3cd1975a38bf5ebdba7dea65b309ab)
+
+commit abf3bc68db579eb524c2eb5786daa5a00957a2f8
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Feb 7 15:31:22 2017 +0100
+
+ xwayland: CRTC should support all rotations
+
+ If the Wayland compositor sets a rotation on the output, Xwayland
+ translates the transformation as an xrandr rotation for the given
+ output.
+
+ However, if the rotation is not supported by the CRTC, this is not
+ a valid setup and xrandr queries will fail.
+
+ Pretend we support all rotations and reflections so that the
+ configuration remains a valid xrandr setup.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99663
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit afeace27d3818274b75d59375771dc964d2f56bb)
+
+commit fd74867b8b4a4d5da80d2ff9c3eb4ae5c36df4df
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Feb 8 09:23:20 2017 +0100
+
+ xwayland: Apply output rotation for screen size
+
+ Previously, we would swap the width/height of the Xwayland output based
+ on the output rotation, so that the overall screen size would match the
+ actual rotation of each output.
+
+ Problem is the RandR's ConstrainCursorHarder() handler will also apply
+ the output rotation, meaning that when the output is rotated, the
+ pointer will be constrained within the wrong dimension.
+
+ Moreover, XRandR assumes the original output width/height are unchanged
+ when the output is rotated, so by changing the Xwayland output width and
+ height based on rotation, Xwayland causes XRandr to report the wrong
+ output sizes (an output of size 1024x768 rotated left or right should
+ remain 1024x768, not 768x1024).
+
+ So to avoid this issue and keep things consistent between Wayland and
+ Xwayland outputs, leave the actual width/height unchanged but apply the
+ rotation when computing the screen size. This fixes both the output size
+ being wrong in "xrandr -q" and the pointer being constrained in the
+ wrong dimension with rotated with weston.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99663
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 058809c43ec578a407cf40d4c3e54a42503e3562)
+
+commit 9a9c6af22e0f0136b11d7c19ce06c48e720a9ca4
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri Jan 20 09:49:19 2017 +0000
+
+ xfree86: Take input_lock() for xf86ScreenCheckHWCursor
+
+ (cherry picked from commit 3eb964e25243056dd998f52d3b00171b71c89189)
+
+commit 2a6904306f9cebc30aa472956a3417ff02221d00
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jan 16 22:36:34 2017 +0000
+
+ xfree86: Take input lock for xf86TransparentCursor
+
+ (cherry picked from commit cfddd919cce4178baba07959e5e862d02e166522)
+
+commit da85ab9dd87e3646be8bc617bfd4c8a86ec0b662
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Jan 16 22:17:36 2017 +0000
+
+ xfree86: Take the input lock for xf86RecolorCursor
+
+ xf86RecolorCursor() may be called directly from XRecolorCursor as well
+ as from xf86ScreenSetCursor(). In the latter case, the input lock is
+ already held, but not for the former and so we need to add a wrapper
+ function that acquires the input lock before performing
+ xf86RecolorCursor()
+
+ References: https://bugs.freedesktop.org/show_bug.cgi?id=99358
+ (cherry picked from commit 7198a6d4e74f684cb383b3e0f70dd2bae405e6e7)
+
+commit ad2facda30f453d749492c51d29f2626aee6326a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 11 16:15:57 2017 -0500
+
+ xserver 1.19.1
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 82dcb68a8782d0cce6e6ce1a375cda05c91fe8c3
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jan 9 18:10:21 2017 -0800
+
+ AttendClient of grab-pervious client must queue to saved_ready_clients [v2]
+
+ A client which is attended while a grab is blocking execution of its
+ requests needs to be placed in the saved_ready_clients list so that it
+ will get scheduled once the grab terminates. Otherwise, if the client
+ never sends another request, there is no way for it to be placed in
+ the ready_clients list.
+
+ v2: Wrap comment above mark_client_saved_ready.
+ Remove test for OS_COMM_IGNORED which will always be true.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99333
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 785053d033e73d2deb0ded4b97eabfd881991978)
+
+commit 14516988e095ed748e738c14a87c3656006846f7
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Tue Jan 10 18:51:55 2017 +0800
+
+ randr: fix xserver crash when xrandr setprovideroutputsource
+
+ xrandr --setprovideroutputsource <screen> <gpu screen>
+ Xorg: ../../../xserver/dix/dispatch.c:4018: AttachOutputGPU:
+ Assertion `new->isGPU' failed.
+
+ GPUScreen is not allowed to be sink output.
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 555e0a42d138ac8d83af62638752a1bebad602d6)
+
+commit 3381e2c26b2ac40b1dd909439bf72559b80d0d86
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Tue Jan 10 18:51:54 2017 +0800
+
+ xfree86: fix wrong usage of xf86optionListMerge
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 1012510620de7dadd0ab18b19a8e11facd884601)
+
+commit 27a2772cf3a1bcd656efdf653a7504597911dbc4
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Nov 25 17:34:05 2016 +0900
+
+ present: Only call present_flip_notify if vblank->queued == FALSE
+
+ We are no longer using the present_flip_queue list only for presents
+ which have already been submitted to the driver for page flipping, but
+ also for those which we are queueing up to be flipped later, marked
+ with vblank->queued == TRUE. We were incorrectly calling
+ present_flip_notify for such entries, failing the assertion in
+ present_flip_notify (or presumably resulting in other undesirable
+ behaviour with assertions disabled).
+
+ Reproduction recipe: Run the JavaFX test case referenced by
+ https://bugs.freedesktop.org/show_bug.cgi?id=98831#c6 and alt-tab out
+ of it while it's fullscreen. May take a few attempts to hit the
+ assertion failure.
+
+ Fixes: bab0f450a719 ("present: Fix presentation of flips out of order")
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98854
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ (cherry picked from commit e473b2bc016adacfe3fa47fdf6a8ce9f8cddff62)
+
+commit 943e3cbeb0139d719589fc07c4f471195e4efe0a
+Author: Kai-Heng Feng <kai.heng.feng@canonical.com>
+Date: Thu Dec 15 13:56:38 2016 +0800
+
+ edid: Add quirk for ADA 1024x600 7" display.
+
+ Detailed mode reports 108 mm x 68 mm which is for smaller display.
+ Maximum image size reports 15 cm x 10 cm which aligns with its physical
+ size, use this size instead.
+
+ Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
+ Acked-by: Alex Deucher <alexander.deucher@amd.com>
+ (cherry picked from commit 9874f73e88678c9eacbcba05e52336fc63a32712)
+
+commit cb3057da2254f9b6434a9c40486c72865cd1ab5e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Dec 8 14:32:06 2016 +1000
+
+ os: return 0 from check_timers if we touched any of them
+
+ Fixes a regression introduced in 0b2f30834b1a9f. If a driver posts input
+ events during a timer function (wacom and synaptics do this during tap
+ timeouts), ProcessInputEvents() is not called for these events. There are no
+ new events on any fds, so the events just sit in the queue waiting for
+ something else to happen.
+
+ Fix this by simply returning 0 from check_timers if we ran at least one of
+ them or reset them all. This way the callers ospoll_wait will exit and
+ continue with normal processing.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit db03742cd33d6d54834bb138886a4f84bc452a85
+Author: Michal Srb <msrb@suse.com>
+Date: Mon Dec 12 17:45:22 2016 +0200
+
+ xinerama: Swap the response in RRXineramaWriteMonitor
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 862c1c43c10eda955db1440cc72ff0387e24a35f
+Author: Hans De Goede <hdegoede@redhat.com>
+Date: Tue Dec 20 13:00:43 2016 +0100
+
+ glamor: Trust eglGetPlatformDisplayEXT if it exists
+
+ If the libEGL we are using has eglGetPlatformDisplayEXT, yet it still
+ returns NULL, then this very likely means that it does not support the
+ type (e.g. EGL_PLATFORM_GBM_MESA) passed in, and then returning NULL is
+ the right thing to do.
+
+ This avoids falling back to an eglGetDisplay() implementation which does
+ not understands the passed in gbm handle, treats it as a pointer to
+ something else completely, followed by a crash sooner or later.
+
+ Specifically this fixes using the nvidia binary driver, with nvidia's
+ libEGL + the modesetting driver on a secondary GPU crashing inside
+ glamor_egl_init() sometimes.
+
+ [1.19: squash in typo fix from 29a4f3db - ajax]
+
+ Cc: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ (cherry picked from commit 05e19644250698aa126a60bc671e85425df784d1)
+
+commit 8790bd993ac2f8f8dd54a1946312e6b6dc929e00
+Author: Mihail Konev <k.mvc@ya.ru>
+Date: Thu Dec 29 12:37:18 2016 +0500
+
+ os,dix: Depend custom libs on libs, not objects
+
+ The custom os/os.O library reuses *.o files of os/libos.la.
+
+ The current rule assumes automake puts all the objects into per-target
+ am__*_la_OBJECTS variable. At least with AC_REPLACE_FUNCS, this no
+ longer holds (as wanted objects are put into LTLIBOBJS instead).
+
+ Depend on automake's result, the *.la library instead, to express demand
+ of any its dependencies being built.
+
+ Should be fixing randomly occuring "undefined reference to `strlcpy'"
+ errors when linking Xvfb and other DDX-es that could use os.O.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+ (cherry picked from commit 5b74e260e009d8bdf26433724495802b85cce7c3)
+
+commit 8cf47472bff1d5ca3de6ff83a80f0d2820c3fb93
+Author: Ben Crocker <bcrocker@redhat.com>
+Date: Tue Nov 15 16:34:38 2016 -0500
+
+ Fix a segfault that occurs if xorg.conf.d is absent:
+
+ In InitOutput, if xf86HandleConfigFile returns CONFIG_NOFILE
+ (which it does if no config file or directory is present), the
+ autoconfig flag is set, causing xf86AutoConfig to be called
+ later on.
+
+ xf86AutoConfig calls xf86OutputClassDriverList via the
+ call tree:
+
+ xf86AutoConfig =>
+ listPossibleVideoDrivers =>
+ xf86PlatformMatchDriver =>
+ xf86OutputClassDriverList
+
+ and xf86OutputClassDriverList attempts to traverse a linked list
+ that is a member of the XF86ConfigRec struct pointed to by the
+ global xf86configptr, which is NULL at this point because the
+ XF86ConfigRec struct is only allocated (by xf86readConfigFile)
+ AFTER the config file and directory have been successfully
+ opened; the CONFIG_NOFILE return from xf86HandleConfigFile
+ occurs BEFORE the call to xf86readConfigFile which allocates
+ the XF86ConfigRec struct.
+
+ Rx: In read.c (for symmetry with xf86freeConfig, which already
+ appears in this file), add a new function xf86allocateConfig
+ which tests the value of xf86configptr and, if it's NULL,
+ allocates the XF86ConfigRec struct and deposits the pointer
+ in xf86configptr. In xf86Parser.h, add a prototype for the
+ new xf86allocateConfig function.
+
+ Back in read.c, #include "xf86Config.h". In xf86readConfigFile,
+ change the open-code call to calloc to a call to the new
+ xf86allocateConfig function.
+
+ In xf86AutoConfig.c, add a call to the new xf86allocateConfig function
+ to the beginning of xf86AutoConfig to make sure the XF86ConfigRec struct
+ is allocated.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Ben Crocker <bcrocker@redhat.com>
+ (cherry picked from commit 8b335d9068fe4e1f1423a4d86c22b69ffcb819a5)
+
+commit 06a3e7ef3bf9a907f1fba84a3601870a5697f657
+Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+Date: Wed Dec 7 15:43:06 2016 +0200
+
+ test: fix distributing scripts
+
+ Fix the following error on 'make distcheck':
+
+ make[6]: *** No rule to make target 'scripts/xvfb-piglit.sh', needed by 'scripts/xvfb-piglit.sh.log'. Stop.
+ make[6]: Leaving directory '/home/pq/git/xserver/xorg-server-1.19.99.1/_build/sub/test'
+ Makefile:1367: recipe for target 'check-TESTS' failed
+
+ The setup to trigger this is:
+ $ ./configure --prefix=/home/pq/local --disable-docs
+ --disable-devel-docs --enable-xwayland --disable-xorg --disable-xvfb
+ --disable-xnest --disable-xquartz --disable-xwin --enable-debug
+
+ SCRIPT_TESTS is populated conditionally, but we should distribute the
+ scripts in any case.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+ (cherry picked from commit b365c5d16894a259dbf29db4ca2640d8ed768063)
+
+commit 543287e60af5e9d91b5fc7e4a42e51eafa63db21
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Dec 6 14:11:11 2016 -0500
+
+ composite: Fix repaint of borders (v2)
+
+ When going from border width zero to a non-zero border width, the
+ Composite extension is informed via the ConfigNotify callback. The
+ call-chain looks like this: compConfigNotify -> compReallocPixmap ->
+ compSetPixmap -> TraverseTree -> compSetPixmapVisitWindow. However, at
+ this time, pWindow->borderWidth was not yet updated. Thus, HasBorder()
+ is false and the window border will not be repainted.
+
+ To fix this, thread the new bw through to the window visitor, and
+ inspect that rather than HasBorder(). For the other callers of
+ compSetPixmap the border does not change size, so we can pass
+ pWin->borderWidth instead.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98499
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit f31875510d818ba517f082e124adb294db906e51)
+
+commit c24c9cc956038a61922f8b11ee68b8b0fc6b9f83
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Nov 22 14:53:20 2016 +0100
+
+ randr: rrCheckPixmapBounding: do not shrink the screen_pixmap
+
+ The purpose of rrCheckPixmapBounding is to make sure that the
+ screen_pixmap is *large* enough for the slave-output which crtc is
+ being configured.
+
+ However until now rrCheckPixmapBounding would also shrink the
+ screen_pixmap in certain scenarios leading to various problems.
+
+ For example: Take a laptop with its internalscreen on a slave-output and
+ currently disabled and an external monitor at 1920x1080+0+0.
+ Now lets say that we want to drive the external monitor at its native
+ resolution of 2560x1440 and have the internal screen mirror the top left
+ part of the external monitor, so we run:
+
+ $ xrandr --output eDP --mode 1920x1080 --pos 0x0 --output HDMI \
+ --mode 2560x1440 --pos 0x0
+
+ Here xrandr utility first calls RRSetScreenSize to 2560x1440, then it
+ calls RRSetCrtc 1920x1080+0+0 on the eDP, since this is a slave output,
+ rrCheckPixmapBounding gets called and resizes the screen_pixmap to
+ 1920x1080, undoing the RRSetScreenSize. Then RRSetCrtc 2560x1440+0+0
+ gets called on the HDMI, depending on crtc->transforms this will
+ either result in a BadValue error from ProcRRSetCrtcConfig; or
+ it will succeed, but the monitor ends up running at 2560x1440
+ while showing a 1920x1080 screen_pixmap + black borders on the right
+ and bottom. Neither of which is what we want.
+
+ This commit removes the troublesome shrinking behavior, fixing this.
+
+ Note:
+
+ 1) One could argue that this will leave us with a too large screen_pixmap
+ in some cases, but rrCheckPixmapBounding only gets called for slave
+ outputs, so xrandr clients already must manually shrink the screen_pixmap
+ after disabling crtcs in normal setups.
+
+ 2) An alternative approach would be to also call rrCheckPixmapBounding
+ on RRSetCrtc on normal (non-slave) outputs, but that would result in
+ 2 unnecessary resizes of the screen_pixmap in the above example, which
+ seems undesirable.
+
+ Cc: Nikhil Mahale <nmahale@nvidia.com>
+ Cc: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ (cherry picked from commit a46afee84d45fbff4e4dad9376afc95bbcc31d7c)
+
+commit 26132f57ee6fae9376955e7990ac2fbad5b49fac
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Nov 22 14:48:14 2016 +0100
+
+ randr: rrCheckPixmapBounding: Do not substract crtc non 0 x,y from screen size
+
+ The purpose of rrCheckPixmapBounding is to make sure that the
+ screen_pixmap is large enough for the slave-output which crtc is
+ being configured.
+
+ This should include crtc->x and crtc->y, otherwise the crtc might
+ still end up scanning out an area outside of the screen-pixmap.
+
+ For example: Take a laptop with an external monitor on a slave-output at
+ 1920x1080+0+0 and its internal-screen at 3840x2160+1920+0 and in
+ gnome-settings-daemon move the external monitor to be on the ri ght of
+ the internal screen rather then on the left. First g-s-d will do a
+ RRSetScreenSize to 5760*2160 (which is a nop), then it calls RRSetCrtc
+ to move the slave output to 1920x1080+3840+0, since this is a slave
+ output, rrCheckPixmapBounding gets called, since the 2 crtcs now overlap
+ the code before this commit would shrinks the screen_pixmap to 3180*2160.
+ Then g-s-d calls RRSetCrtc to move the internal screen to 3180*2160+0+0.
+
+ And we end up with the slave-output configured to scan-out an area
+ which completely falls outside of the screen-pixmap (and end up with
+ a black display on the external monitor).
+
+ This commit fixes this by not substracting the x1 and y1 coordinates
+ of the union-ed region when determining the new screen_pixmap size.
+
+ Cc: Nikhil Mahale <nmahale@nvidia.com>
+ Cc: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ (cherry picked from commit 3b624aa9a9df86dc7d48149e0f18ca223b4355f1)
+
+commit 6c51845e6b0f313a90e4375f2821f1da9cc53014
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Nov 30 09:42:43 2016 +0100
+
+ xwayland: Fix use after free of cursors
+
+ Sometimes, Xwayland will try to use a cursor that has just been freed,
+ leading to a crash when trying to access that cursor data either in
+ miPointerUpdateSprite() or AnimCurTimerNotify().
+
+ CheckMotion() updates the pointer's cursor based on which xwindow
+ XYToWindow() returns, and Xwayland implements its own xwl_xy_to_window()
+ to fake a crossing to the root window when the pointer has left the
+ Wayland surface but is still within the xwindow.
+
+ But after an xwindow is unrealized, the last xwindow used to match the
+ xwindows is cleared so two consecutive calls to xwl_xy_to_window() may
+ not return the same xwindow.
+
+ To avoid this issue, update the last_xwindow based on enter and leave
+ notifications instead of xwl_xy_to_window(), and check if the xwindow
+ found by the regular miXYToWindow() is a child of the known last
+ xwindow, so that multiple consecutive calls to xwl_xy_to_window()
+ return the same xwindow, being either the one found by miXYToWindow()
+ or the root window.
+
+ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1385258
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Tested-by: Vít Ondruch <vondruch@redhat.com>
+ Tested-by: Satish Balay <balay@fastmail.fm>
+ Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
+ (cherry picked from commit 59ad0e6a416d8e23f9d962af67a16ee28ec7867b)
+
+commit b711efb05714bf3d0a102c717a05cde4fefdae3f
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu Nov 3 09:59:30 2016 +0100
+
+ glamor: restore vfunc handlers on init failure
+
+ In glamor_init(), if the minimum requirements are not met, glamor may
+ fail after setting up its own CloseScreen() and DestroyPixmap()
+ routines, leading to a crash when either of the two routines is called
+ if glamor failed to complete its initialization, e.g:
+
+ (EE) Backtrace:
+ (EE) 0: Xwayland (OsSigHandler+0x29)
+ (EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0)
+ (EE) 2: Xwayland (glamor_sync_close+0x2a)
+ (EE) 3: Xwayland (glamor_close_screen+0x52)
+ (EE) 4: Xwayland (CursorCloseScreen+0x88)
+ (EE) 5: Xwayland (AnimCurCloseScreen+0xa4)
+ (EE) 6: Xwayland (present_close_screen+0x42)
+ (EE) 7: Xwayland (dix_main+0x4f9)
+ (EE) 8: /lib64/libc.so.6 (__libc_start_main+0xf1)
+ (EE) 9: Xwayland (_start+0x2a)
+
+ Restore the previous CloseScreen() and DestroyPixmap() vfunc handlers in
+ case of failure when checking for the minimum requirements, so that if
+ any of the requirement is not met we don't leave the CloseScreen() and
+ DestroyPixmap() from glamor handlers in place.
+
+ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1390018
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ (cherry picked from commit f43207c1c4a8487600cf3ea116c10437417c861b)
+
+commit 201ff45c2d7e6c7d73fd29d28871bb8b944074be
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Nov 11 15:28:50 2016 +1000
+
+ Xi: when creating a new master device, update barries for all clients
+
+ The previous code only worked when the barrier was created by the same client
+ as the one calling XIChangeDeviceHierarchy.
+
+ http://bugzilla.redhat.com/show_bug.cgi?id=1384432
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+ (cherry picked from commit d6a6e1d6abb110ff00ad31b94cd29d92ca7c71a5)
+
+commit 738c17b7ef4c70ad00c7bc01cf64edb770dda840
+Author: Rui Matos <tiagomatos@gmail.com>
+Date: Thu Nov 24 19:56:18 2016 +0100
+
+ xwayland: Don't send KeyRelease events on wl_keyboard::leave
+
+ Commits 816015648ffe660ddaa0f7d4d192e555b723c372 and
+ fee0827a9a695600765f3d04376fc9babe497401 made it so that
+ wl_keyboard::enter doesn't result in X clients getting KeyPress events
+ while still updating our internal xkb state to be in sync with the
+ host compositor.
+
+ wl_keyboard::leave needs to be handled in the same way as its
+ semantics from an X client POV should be the same as an X grab getting
+ triggered, i.e. X clients shouldn't get KeyRelease events for keys
+ that are still down at that point.
+
+ This patch uses LeaveNotify for these events on wl_keyboard::leave and
+ changes the current use of KeymapNotify to EnterNotify instead just to
+ keep some symmetry between both cases.
+
+ On ProcessDeviceEvent() we still need to deactivate X grabs if needed
+ for KeyReleases.
+
+ Signed-off-by: Rui Matos <tiagomatos@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit 5611585b87ce48428a66f98ece319a083f55d205)
+
+commit cd8f43e1b06aee8500548a94e3743cf153591683
+Author: Rhys Kidd <rhyskidd@gmail.com>
+Date: Fri Oct 28 22:44:30 2016 -0400
+
+ test: Fix stray Makefile reference to removed os test
+
+ Fixes the following warning:
+
+ test/Makefile.am:69: warning: variable 'os_LDADD' is defined but no program or
+ test/Makefile.am:69: library has 'os' as canonical name (possible typo)
+
+ Introduced upon the removal of test/os in:
+
+ commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99
+ Author: Keith Packard <keithp@keithp.com>
+ Date: Tue Dec 8 14:39:46 2015 -0800
+
+ Remove SIGIO support for input [v5]
+
+ This removes all of the SIGIO handling support used for input
+ throughout the X server, preparing the way for using threads for input
+ handling instead.
+
+ Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls
+ to stub functions input_lock/input_unlock so that we don't lose this
+ information.
+
+ xfree86 SIGIO support is reworked to use internal versions of
+ OsBlockSIGIO and OsReleaseSIGIO.
+
+ v2: Don't change locking order (Peter Hutterer)
+ v3: Comment weird && FALSE in xf86Helper.c
+ Leave errno save/restore in xf86ReadInput
+ Squash with stub adding patch (Peter Hutterer)
+ v4: Leave UseSIGIO config parameter so that
+ existing config files don't break (Peter Hutterer)
+ v5: Split a couple of independent patch bits out
+ of kinput.c (Peter Hutterer)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+ Signed-off-by: Rhys Kidd <rhyskidd@gmail.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ (cherry picked from commit cf8860786c3e301486cd2853bc82977ba75e6b17)
+
+commit d6da2086951693e047fdd22b0d21c539ea1bb1e1
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 12 13:08:17 2016 -0500
+
+ Revert "damage: Make damageRegionProcessPending take a damage not a drawable"
+
+ The commit message makes the assertion that the code below damage is not
+ allowed to change whether there's a damage monitor for the drawable.
+ That turns out not to be the case! exa's mixed code, at least, will
+ create and destroy a damage in PrepareAccess. The destroy path can then
+ be catastrophic, as damageRegionProcessPending will attempt to
+ RegionEmpty memory from the middle of a freed block.
+
+ I'd wanted that invariant for performance, but faster isn't worth
+ broken, so revert it. I think what exa's doing is reasonable, so the
+ better way to improve performance for the unmonitored case is to either
+ revisit dynamically wrapping into the GC, or inline damage into dix.
+
+ This reverts commit 4e124203f2260daaf54155f4a05fe469733e0b97.
+
+ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1389886
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ (cherry picked from commit 32e632e85894eddc3ace83f16f1e973b1be478fe)
+
+commit 7e5c9bdf73e4185ac4cf7f044da0793a5cc3e62c
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Nov 15 08:12:05 2016 -0800
+
+ Bump version to 1.19.0
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit ea8efb3a997e15d27d362762e6c85d59487f9864
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 2 13:25:33 2016 -0700
+
+ dix: Make sure client is not in output_pending chain after closed (RH 1382444)
+
+ I think it is possible that output could get queued to a client during
+ CloseDownClient. After it is removed from the pending queue, active
+ grabs are released, the client is awoken if sleeping and any work
+ queue entries related to the client are processed.
+
+ To fix this, move the call removing it from the output_pending chain
+ until after clientGone has been set and then check clientGone in
+ output_pending_mark.
+
+ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1382444
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 7513da40a656317ad3aa101651d29373de99c798
+Author: Timo Aaltonen <tjaalton@ubuntu.com>
+Date: Wed Nov 2 17:18:11 2016 +0200
+
+ dri2: Sync i965_pci_ids.h from mesa
+
+ Import changes from these mesa commits:
+ 85ea8deb26da420 i965: Removing PCI IDs that are no longer listed as Kabylake.
+ bdff2e554735ed9 i956: Add more Kabylake PCI IDs.
+ f1fa8b4a1ca73fa i965/bxt: Add 2x6 variant
+ d1ab544bb883d04 i965/chv: Display proper branding
+ 20e8ee36627f874 i965/skl: Update Skylake renderer strings
+ 644c8a515192d28 i965/skl: Add two missing device IDs
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Timo Aaltonen <tjaalton@ubuntu.com>
+
+commit 4cfee398726adf89db4b632ade7d6cab8b78282e
+Author: Ian Ray <ian.ray@ge.com>
+Date: Wed May 25 10:41:53 2016 +0300
+
+ xwayland-shm: block signals during fallocate
+
+ posix_fallocate() does an explicit rollback if it gets EINTR, and
+ this is a problem on slow systems because when the allocation size
+ is sufficiently large posix_fallocate() will always be interrupted
+ by the smart scheduler's SIGALRM.
+
+ Changes since v1 - big comment in the code to explain what is going on
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Ian Ray <ian.ray@ge.com>
+ Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+ Acked-by: Daniel Stone <daniels@collabora.com>
+
+commit 512e75a23b7f6339593c3ae6942f0c420a975fd3
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Oct 28 09:32:42 2016 -0700
+
+ Bump to 1.18.99.902 (1.19 RC2)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c85f81825e196e96337347e0ce3a538fb2e38f16
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Oct 28 09:28:32 2016 -0700
+
+ dix: Bump MAXHASHSIZE for the resource db [v2]
+
+ [This was originally a workaround for a client-side resource leak:
+
+ http://lists.freedesktop.org/archives/xorg-devel/2012-November/034555.html
+
+ Obviously that's a broken app, but the performance problem it
+ illustrates - that walking the linked list ends up burning all your CPU
+ time - is real enough. - ajax]
+
+ v2: Replace with a shorter code sequence which computes the same
+ results for all but numBits == 7
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 356db2340f5b473a7191c7969586ca5b0396c48f
+Merge: 9ed5b26354 03d99ef729
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Oct 28 09:05:54 2016 -0700
+
+ Merge remote-tracking branch 'jturney/master'
+
+commit 9ed5b263542e5245317927828f0515db6c0a54c8
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Oct 28 08:04:43 2016 -0700
+
+ os: Recompute whether any clients are ready after ProcessWorkQueue() (bug 98030)
+
+ If a work proc wakes up a sleeping client and it is ready to execute,
+ we need to re-compute the local 'are_ready' value before deciding
+ what timeout value to use in WaitForSomething.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98030
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 2c91f3235a4e1655e18cb014922529161051ffbb
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Oct 5 09:41:44 2016 -0700
+
+ ephyr: Leave window unmapped for -glamor-skip-present [v2]
+
+ If we're never painting anything in the window, we probably don't need
+ to map it.
+
+ v2: Drop ephyr_glamor_gles2 from hostx.c
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit cba5a10fd93310702cad9dbe1e6d48da99f5552f
+Author: Alex Goins <agoins@nvidia.com>
+Date: Wed Oct 26 11:03:49 2016 -0700
+
+ ramdac: Check sPriv != NULL in xf86CheckHWCursor()
+
+ xf86CheckHWCursor() would dereference sPriv without NULL checking it. If Option
+ "SWCursor" is specified, sPriv == NULL. In this case we should assume that HW
+ cursors are not supported.
+
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+ Reviewed-by: Andy Ritger <aritger@nvidia.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 03d99ef729178dd99268f185fb45320a29382091
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu Oct 6 22:13:07 2016 +0100
+
+ glx/dri2: Don't build DRI loader if DRI2 isn't enabled
+
+ This partially reverts 501d8e2b.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 5cb328338684d8e5b03913c47475bfcd7acffec4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Oct 26 12:21:16 2016 +0200
+
+ inputthread: On Linux leave the main thread's name as-is
+
+ On Linux, setting the main thread's name changes the program name
+ (/proc/self/comm). Setting it to MainThread breaks scripts that rely on
+ the command name, e.g. ps -C Xorg.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 007f8ee61a35ceda36b43e772a9a1074b8e27a06
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri Oct 21 10:11:45 2016 +0200
+
+ xwayland: Activate and enable touch devices
+
+ On some random condition, a touch event may trigger a crash in Xwayland
+ in GetTouchEvents().
+
+ The (simplified) backtrace goes as follow:
+
+ (gdb) bt
+ #0 GetTouchEvents() at getevents.c:1892
+ #1 QueueTouchEvents() at getevents.c:1866
+ #2 xwl_touch_send_event() at xwayland-input.c:652
+ #5 wl_closure_invoke() from libwayland-client.so.0
+ #6 dispatch_event() from libwayland-client.so.0
+ #7 wl_display_dispatch_queue_pending() from libwayland-client.so.0
+ #8 xwl_read_events() at xwayland.c:483
+ #9 ospoll_wait() at ospoll.c:412
+ #10 WaitForSomething() at WaitFor.c:222
+ #11 Dispatch() at dispatch.c:412
+ #12 dix_main() at main.c:287
+ #13 __libc_start_main() at libc-start.c:289
+ #14 _start ()
+
+ The crash occurs when trying to access the sprite associated with the
+ touch device, which appears to be NULL. Reason being the device itself
+ is more a keyboard device than a touch device.
+
+ Moreover, it appears the device is neither enabled nor activated
+ (inited=0, enabled=0) which doesn't seem right, but matches the code in
+ init_touch() from xwayland-input.c which would enable the device if it
+ was previously existing and otherwise would create the device but not
+ activate it.
+
+ Make sure we do activate and enable touch devices just like we do for
+ other input devices such as keyboard and pointer.
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit f68ba7b81ffe765380664fccc92f3e689c6c48c2
+Author: Rui Matos <tiagomatos@gmail.com>
+Date: Tue Oct 25 19:24:49 2016 +0200
+
+ xwayland: Transform pointer enter event coordinates
+
+ Pointer enter event coordinates are surface relative and we need them to
+ be screen relative for pScreen->SetCursorPosition().
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=758283
+
+ Signed-off-by: Rui Matos <tiagomatos@gmail.com>
+ Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
+ Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit f5c6d751d08c6de77c2ca49ba2a48f8023758cef
+Author: Nikhil Mahale <nmahale@nvidia.com>
+Date: Sat Oct 22 17:40:51 2016 +0530
+
+ modesetting: unifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+
+ Commit c7e8d4a6ee9542f56cd241cf7a960fb8223a6b22 had already unifdef
+ MODESETTING_OUTPUT_SLAVE_SUPPORT but commit
+ 9257b1252da9092ddc676fec9aabe2b33dfad272 didn't notice that.
+
+ Signed-off-by: Nikhil Mahale <nmahale@nvidia.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 4aaeeda4774397dd6d80aa240ca623ae795ec5dc
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Oct 18 16:10:19 2016 +0200
+
+ xfree86: Xorg.wrap: Do not require root rights for cards with 0 outputs
+
+ Prior to this commit the Xorg.wrap code to detect if root rights are
+ necessary checked for DRM_IOCTL_MODE_GETRESOURCES succeeding *and*
+ reporting more then 0 output connectors.
+
+ DRM_IOCTL_MODE_GETRESOURCES succeeding alone is enough to differentiate
+ between old drm only cards (which need ums and thus root) and kms capable
+ cards.
+
+ Some hybrid gfx laptops have 0 output connectors on one of their 2 GPUs,
+ resulting in Xorg needlessly running as root. This commits removes the
+ res.count_connectors > 0 check, fixing this.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
+
+commit 7d91063aca4e4d326c294e246bc2dc36cb05318e
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Mon Oct 17 18:48:44 2016 +0900
+
+ DRI2: Sync radeonsi_pci_ids.h from Mesa
+
+ Fixes DRI2 client driver name mapping for newer AMD GPUs with the
+ modesetting driver, allowing the DRI2 extension to initialize.
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit f6ff2e974c5de3071c899eba828789f1d4d8645a
+Author: Mihail Konev <k.mvc@ya.ru>
+Date: Sat Oct 15 04:13:43 2016 +0000
+
+ modesetting: fix glamor ifdef
+
+ Add a missing ifdef needed for --disable-glamor.
+
+ Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+ Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 8fee6a917b6468e1b116d922f86484498874fb5c
+Author: Mihail Konev <k.mvc@ya.ru>
+Date: Fri Oct 14 02:40:59 2016 +0000
+
+ xwin: make glx optional again
+
+ Commit 501d8e2b removed --enable-aiglx, but made xwin always be
+ --enable-glx.
+
+ Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+ Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit d13cb974426f7f1110b0bdb08c4ebb46ff8975f7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Oct 21 06:27:57 2016 +1000
+
+ ddx: add new call to purge input devices that weren't added
+
+ Special case for the systemd-logind case in xfree86: when we're vt-switched
+ away and a device is plugged in, we get a paused fd from logind. Since we
+ can't probe the device or do anything with it, we store that device in the
+ xfree86 and handle it later when we vt-switch back. The device is not added to
+ inputInfo.devices until that time.
+
+ When the device is removed while still vt-switched away, the the config system
+ never notifies the DDX. It only runs through inputInfo.devices and our device
+ was never added to that.
+
+ When a device is plugged in, removed, and plugged in again while vt-switched
+ away, we have two entries in the xfree86-specific list that refer to the same
+ device node, both pending for addition later. On VT switch back, the first one
+ (the already removed one) will be added successfully, the second one (the
+ still plugged-in one) fails. Since the fd is correct, the device works until
+ it is removed again. The removed devices' config_info (i.e. the syspath)
+ doesn't match the actual device we addded tough (the input number increases
+ with each plug), it doesn't get removed, the fd remains open and we lose track
+ of the fd count. Plugging the device in again leads to a dead device.
+
+ Fix this by adding a call to notify the DDX to purge any remainders of devices
+ with the given config_info, that's the only identifiable bit we have at this
+ point.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=97928
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 8fcf2fa78f09257933b17e7dc9a03a2034e3076f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 20 15:45:46 2016 +1000
+
+ xfree86: swap the list of paused devices to an xorg_list
+
+ No functional changes but it makes it easier to remove elements from the
+ middle of the list (future patch).
+
+ We don't have an init call into this file, so the list is manually
+ initialized.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 28d8855cd4e3be8831fb1c17bf1d205bd8465d1e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 20 15:25:51 2016 +1000
+
+ xfree86: use the right option traversal list to search for an option
+
+ They're identically laid-out structs but let's use the right type to search
+ for our desired value.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 7fc96fb02dade4a86f2fc038f3cf5f2d9c0cda00
+Author: Emil Velikov <emil.velikov@collabora.com>
+Date: Fri Oct 21 19:06:00 2016 +0100
+
+ glamor: don't look for non-existing EGL_KHR_platform_base
+
+ The extension does not exist in the registry, thus needs to know they're
+ using EGL 1.5 in order to determine the eglGetPlatformDisplay function
+ pointer is valid.
+
+ Thus brings us into some lovely circular dependency.
+
+ Since mesa won't be able (in the foreseeable future) to export the KHR
+ flavour of extension (another way one could assume that EGL 1.5 is
+ available) just drop all the heuristics and use the
+ EGL_EXT_platform_base extension.
+
+ In practise (checked with the Mali driver) any EGL 1.5 driver will
+ advertise support for EGL_EXT_platform_base.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 5dcb0666b82f5ab00f3d22e86f05ac14b0d5341e
+Author: Mihail Konev <k.mvc@ya.ru>
+Date: Sat Oct 15 17:59:05 2016 +0000
+
+ os/inputthread: Ensure pollfd refreshing
+
+ When putting a device node into a poll-request list, do not overwrite a
+ "please-remove" element with the same fd, so that a closed device file
+ is ospoll_remove'd prior to being ospoll_add'ed.
+
+ Before, the opposite order was possible, resulting in ospoll_add
+ considering the newly opened file being already polled, should it have a
+ fd for which the "please-remove" has not been procesed yet. In this
+ case, no further events would be seen from the device.
+
+ Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+ Regressed-in: 52d6a1e832a5e62289dd4f32824ae16a78dfd7e8
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97880
+ Patchwork: https://patchwork.freedesktop.org/patch/113763/
+ Hit-and-Reduced-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-and-Reduced-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 9cf0bd4d4507dca6234024605b14724713f2109e
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Oct 5 18:28:45 2016 +0900
+
+ xf86Cursor: Take the input lock in xf86Set/MoveCursor
+
+ Prevents the HW cursor from intermittently jumping around when the
+ cursor image is changed while the cursor is being moved. This is hardly
+ noticeable in normal operation but can be quite confusing when stepping
+ through these codepaths in a debugger.
+
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 011ce3297d924e78ef0254b0451561946bd8be8d
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Oct 5 18:01:29 2016 +0900
+
+ xf86Cursor: Use PRIME master xf86CursorScreenRec::HotX/Y for slaves
+
+ xf86CursorScreenRec::HotX/Y contain 0 for PRIME slave screens.
+
+ Fixes incorrect HW cursor position on PRIME slave screens.
+
+ Also hoist the hotspot translation out from xf86ScreenSet/MoveCursor to
+ xf86Set/MoveCursor, since the hotspot position is a property of the
+ cursor, not the screen.
+
+ v2:
+ * Squash patches 1 & 2 of the v1 series, since it's basically the same
+ problem
+ * Use the master screen's xf86CursorScreenRec::HotX/Y instead of
+ CursorRec::bits->x/yhot, since CursorRec::bits can be NULL (Hans de
+ Goede)
+
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit e3f53aa3a8dfc323c75837cd41e35b8e895d547e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Oct 6 14:42:34 2016 -0400
+
+ glx/dri2: Don't include drm headers
+
+ They're not needed, and they won't be present on win32.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Emil Velikov <emil.l.veikov@gmail.com>
+
+commit 97a8353ec1192d8d3bd2ebb99e5687cb91427e09
+Author: Peter Harris <pharris@opentext.com>
+Date: Thu Sep 29 11:17:48 2016 -0400
+
+ Fix id in error when resource does not exist
+
+ Always set client->errorValue before returning an error.
+
+ Test program:
+
+ int main(int argc, char *argv[]) {
+ int screen = 0;
+ xcb_connection_t *c = xcb_connect(NULL, &screen);
+ if (!c) {
+ printf("Cannot connect\n");
+ return 1;
+ }
+
+ xcb_void_cookie_t tok = xcb_free_gc_checked(c, BAD_VALUE);
+ xcb_g_context_error_t *err = (xcb_g_context_error_t *)xcb_request_check(c, tok);
+ if (!err) {
+ printf("Unexpected request success\n");
+ return 1;
+ }
+ if (err->bad_value != BAD_VALUE) {
+ printf("Error: Got 0x%X, expected 0x%X\n", err->bad_value, BAD_VALUE);
+ return 1;
+ }
+ printf("Success! Got expected bad value of 0x%X\n", BAD_VALUE);
+ return 0;
+ }
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Peter Harris <pharris@opentext.com>
+
+commit f4a41155479e68bf55740c1dfffafc78e4c02087
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Oct 5 12:34:34 2016 -0400
+
+ glamor: Use eglGetPlatformDisplay{,EXT} if we can
+
+ eglGetDisplay forces the implementation to guess which kind of display
+ it's been handed. glvnd does something different from Mesa, and in
+ general it's impossible for the library to get this right. Add a new
+ inline that gets the logic right, and works around a quirk in epoxy.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 95d3980c7c991b2cc8dcadac173635641ae15865
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Oct 5 17:29:36 2016 +0900
+
+ test: Use $XSERVER_BUILDDIR for Xvfb executable path
+
+ Fixes make check with out-of-tree builds.
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit cc69d4f110bd8a87b9e6c238ebebf8d85cbd93ec
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Thu Sep 29 18:35:04 2016 +0100
+
+ xfree86/dri: remove libdrm runtime checks
+
+ As of last commit all the places in our configure.ac require version
+ 2.3.1 (released back in 2007) or later. With the latter introducing the
+ 1.3.0 version, as returned by drmGetLibVersion.
+
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 962962e978e5cededc20e577a36f77eb24d14bda
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Thu Sep 29 18:35:03 2016 +0100
+
+ configure.ac: bump the required libdrm version to 2.3.1
+
+ It fixes a bug where the version reported by drmGetLibVersion() was
+ 'wrong'. See libdrm commit 79038751ffe("libdrm: add support for server
+ side functionality in libdrm") for details.
+
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 74a8b320fa5068cd86d8b8b8e73fa92caae9a8a6
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Thu Sep 29 18:35:02 2016 +0100
+
+ configure.ac: use $LIBDRM over libdrm when using pkg-config
+
+ The former contains the minimum required version which is required.
+ Strictly speaking Xephyr/Xwayland may require version greater than the
+ current 2.3.0, although I've personally haven't checked the specifics.
+
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 45e1220486139c483a69366323f8f590beffa19d
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Thu Sep 29 18:35:01 2016 +0100
+
+ configure.ac: default to DRI=yes on solaris platforms
+
+ Afaict there's little-to-no reason/way one would want xserver without
+ DRI support on Solaris platforms.
+
+ This will allow us to simplify/fix all the libdrm detection in the next
+ commit.
+
+ Cc: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 501d8e2beb337e072c93c9310fcd927a099b9c3b
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Thu Sep 29 18:41:19 2016 +0100
+
+ configure.ac: remove --enable-aiglx option
+
+ Presently the option guards both direct and accelerated indirect GLX. As
+ such when one toggles it off they end up without any acceleration.
+
+ Remove the option all together until we have the time to split/rework
+ things.
+
+ Cc: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 7ec350ddd42479595f0ea88f86085af941913617
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Thu Sep 29 18:41:18 2016 +0100
+
+ xfree86: remove aiglx cmd/xorg.conf option
+
+ The option is misleading and using it leads to disabling both direct and
+ accelerated indirect GLX. In such cases the xserver GLX attempts to
+ match DRISW (IGLX) configs with the DRI2/3 ones (direct GLX) leading to
+ all sorts of fun experience.
+
+ Remove the option until we get a clear split and control over direct vs
+ indirect GLX.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 04ef8558a731bf070abf1b40c7e6b54aad8f5f31
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Thu Sep 29 18:41:17 2016 +0100
+
+ glx: drisw is not accelerated IGLX, reflect that in log messages
+
+ The messages from glxdricommon.c (used by drisw) still have the A, but
+ at least we're don't have it locally.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 1c2fcb95484777ca9aa80b3f814ad64e81f825f1
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Oct 5 08:36:21 2016 +0200
+
+ glamor: Fix pixmap offset for bitplane in glamor_copy_fbo_cpu
+
+ Commit cba28d5 - "glamor: Handle bitplane in glamor_copy_fbo_cpu"
+ introduced a regression as the computed pixmap offset would not match
+ the actual coordinates and write data elsewhere in memory causing a
+ segfault in fbBltOne().
+
+ Translate the pixmap coordinates so that the data is read and written at
+ the correct location.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97974
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit a6e85e6330adcdcbcd939c0963daaecc96d41a2a
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:17:08 2016 +0800
+
+ xwayland: Add pointer warp emulator
+
+ Emulate pointer warps by locking the pointer and sending relative
+ motion events instead of absolute. X will keep track of the "fake"
+ pointer cursor position given the relative motion events, and the
+ client warping the cursor will warp the faked cursor position.
+
+ Various requirements need to be met for the pointer warp emulator to
+ enable:
+
+ The cursor must be invisible: since it would not be acceptable that a
+ fake cursor position would be different from the visual representation
+ of the cursor, emulation can only be done when there is no visual
+ representation done by the Wayland compositor. Thus, for the emulator
+ to enable, the cursor must be hidden, and would the cursor be displayed
+ while the emulator is active, the emulator would be destroyed.
+
+ The window that is warped within must be likely to have pointer focus.
+ For example, warping outside of the window region will be ignored.
+
+ The pointer warp emulator will disable itself once the fake cursor
+ position leaves the window region, or the cursor is made visible.
+
+ This makes various games depending on pointer warping (such as 3D
+ first-person shooters and stategy games using click-to-drag-map like
+ things) work.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+
+commit 467ab142fff926e1475440dd5f649a49f45808fa
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:17:07 2016 +0800
+
+ xwayland: Translate a pointer grab with confineTo to pointer confinement
+
+ Translate grabbing a pointer device with confineTo set to a window into
+ confining the Wayland pointer using the pointer constraints protocol.
+ This makes clients that depend on the pointer not going outside of the
+ window region, such as certain games and virtual machines viewers, to
+ function more properly.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ca7b593fbe54bc9a0b44037e62e4b4401cbd375e
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Thu Sep 29 10:42:13 2016 +0800
+
+ xwayland: Bind pointer constraints global
+
+ Will be used by the pointer warp emulator.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c14a8c6cc0fcd56c380d1220c2a8f04b74edee93
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:17:05 2016 +0800
+
+ xwayland: Put getting a xwl_window from a Window in a helper
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b4644ce8d3420447a8e5a2339238968da0a59de7
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:17:04 2016 +0800
+
+ xwayland: Set unaccelerated pointer motion delta if available
+
+ If there was an relative pointer motion within the same frame as an
+ absolute pointer motion, provide both the absolute coordinate and the
+ unaccelerated delta when setting the valuator mask.
+
+ If a frame contained only a relative motion, queue an absolute motion
+ with an unchanged position, but still pass the unaccelerated motion
+ event.
+
+ If the wl_seat advertised by the compositor is not new enough, assume
+ each relative and absolute pointer motion arrives within their own
+ separate frames.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit aa9634d03bc2434dfd25476529eccb14e46fcfdc
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:17:03 2016 +0800
+
+ xwayland: Dispatch pointer motion events on wl_pointer.frame if possible
+
+ Wait until wl_pointer.frame with dispatching the pointer motion event,
+ if wl_pointer.frame is supported by the compositor. This will later be
+ used to combine unaccelerated motion deltas with the absolute motion
+ delta.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 42e8902395cb27af5c28306abd577a92c467a62d
+Author: Krzysztof Sobiecki <sobkas@gmail.com>
+Date: Tue Sep 13 22:23:49 2016 +0800
+
+ xwayland: Add a new input device used for pointer warping/locking
+
+ Generating relative and absolute movement events from the same input
+ device is problematic, because an absolute pointer device doesn't
+ expect to see any relative motion events. To be able to generate
+ relative pointer motion events including unaccelerated deltas, create a
+ secondary pointer device 'xwayland-relative-pointer', and use that for
+ emitting relative motion events.
+
+ Signed-off-by: Krzysztof Sobiecki <sobkas@gmail.com>
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+
+commit 011ada724afdba8955f1d4844b306e61390eead8
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:17:01 2016 +0800
+
+ xwayland: Move pointer button initialization into helper
+
+ We'll later use this for initializing buttons for the relative pointer
+ since they need to be the same.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+
+commit a77d0715c6272cc1778a54dccd8cb68dc28cd761
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:17:00 2016 +0800
+
+ xwayland: Split up device class init/release into functions
+
+ Put device class initialization in init_[device_class](xwl_seat) and
+ releasing in release_[device class](xwl_seat). The purpose is to make
+ it easier to add more type of initialization here later, without making
+ the function too large.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9037ba736a0424feee2fb6ac20cf7687613dc452
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Thu Sep 29 10:40:01 2016 +0800
+
+ xwayland: Bind the relative pointer manager
+
+ Will be used for getting unaccelerated motion events and later for
+ relative motions used by a pointer warp emulator.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0fae3be0686cae746e03d6e4592f97278cc2275d
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:16:57 2016 +0800
+
+ dix: Add valuator_mask_set_absolute_unaccelerated
+
+ Add a valuator mask setter for setting absolute coordinate combined
+ with unaccelerated motion deltas. This will later be used by Xwayland
+ to combine a wl_pointer.motion() event with the unaccelerated delta of
+ a wp_relative_pointer.relative_motion() event.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit bbd4854f81ebba1119202c5f6ff4679c62afec1f
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Tue Sep 27 19:03:26 2016 +0200
+
+ xwayland: Apply touch abs axes transformation before posting events
+
+ The way we map the touch absolute device to screen coordinates can't
+ work across wl_output mode and geometry events. Instead, set up
+ a fixed coordinate space, and transform touch events according to
+ the screen coordinate space as they happen.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+
+commit ee526285882995289846648f3122c4295e3e8284
+Author: Carlos Garnacho <carlosg@gnome.org>
+Date: Wed Sep 28 12:35:36 2016 +0200
+
+ xwayland: Apply "last pointer window" check only to the pointer device
+
+ The checks in xwayland's XYToWindow handler pretty much assumes that the
+ sprite is managed by the wl_pointer, which is not entirely right, given
+ 1) The Virtual Core Pointer may be controlled from other interfaces, and
+ 2) there may be other SpriteRecs than the VCP's.
+
+ This makes XYToWindow calls return a sprite trace with just the root
+ window if any of those two assumptions are broken, eg. on touch events.
+
+ So turn the check upside down, first assume that the default XYToWindow
+ proc behavior is right, and later cut down the spriteTrace if the
+ current device happens to be the pointer and is out of focus. We work
+ our way to the device's lastSlave here so as not to break assumption #1
+ above.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
+ Acked-by: Olivier Fourdan <ofourdan@redhat.com>
+
+commit 2b6a068d21997ca812e665ed058e72eb4626c129
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Oct 3 15:37:03 2016 -0700
+
+ fb: XYPixmap format PutImage includes all planes in depth
+
+ Unlike GetImage, for which the provided planemask restricts the data
+ delivered, for PutImage in XYPixmap format, all of the planes in the
+ drawable depth are sent and those outside the plane mask are simply
+ ignored.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c9b8ce73927a43ed82b267d1c1985445f24827cc
+Author: Mark Yao <mark.yao@rock-chips.com>
+Date: Fri Sep 30 16:42:35 2016 +0800
+
+ glamor: spans: fixup wrong count on glDrawArrays
+
+ In commit 9e9fcf5 (glamor: Add a helper function for the common
+ GL_QUADS fallback pattern.), the glDrawArrays count change was
+ accidentally changed to nbox.
+
+ Fixes xlogo with MESA_GL_VERSION_OVERRIDE=2.1 and
+ MESA_GLSL_VERSION_OVERRIDE=120
+
+ Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 2aca2dadda4cc9c378049457885d33a4eede9768
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Sep 24 14:42:28 2016 -0700
+
+ glamor: Fix link failure on GLES2.
+
+ Current Mesa requires that the precision qualifier on uniforms matches
+ between stages, even if (as in this case) the uniform isn't used in
+ one of the stages.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 20fcdfcf39497fe44d2a3200338523effb8e2bc6
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Sep 24 14:30:27 2016 -0700
+
+ glamor: Remove #if 0-ed picture dumping code.
+
+ I don't think anybody has run this code since it was pulled into the
+ server.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 4b5326aeba539249fcded91bf7806a708eeca651
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Sep 24 14:04:14 2016 -0700
+
+ glamor: Remove many unused glamor util functions.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 117d614d1ba324bdb02c50a430c2e0d22a384f03
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Sep 24 22:26:17 2016 +0300
+
+ glamor: Require GL_OES_texture_border_clamp for GLES2.
+
+ The extension came out in 2000, and all Mesa-supported hardware that
+ can do glamor supports it. We were already relying on the ARB version
+ being present on desktop.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 7a5ddf8da5ed817aa2dd6f7af1b9197a5ceec60b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Sep 28 15:27:20 2016 -0400
+
+ test: Re-enable a couple of GetImage tests
+
+ Fixed in 6c6f09aac.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit c7a9161da5eb80ef0444601621b52314255b0ce5
+Author: Francois Tigeot <ftigeot@wolfpond.org>
+Date: Fri Sep 23 11:36:49 2016 +0200
+
+ Enable XTRANS_SEND_FDS on FreeBSD, DragonFly and OpenBSD
+
+ This code is based on local patches which had been sitting in
+ FreeBSD and OpenBSD ports.
+
+ Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
+ Signed-off-by: François Tigeot <ftigeot@wolfpond.org>
+
+commit 6c6f09aac7f1d1367a042087b7681c7fdf1d1e0f
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Sep 25 14:19:08 2016 +0300
+
+ xace: Don't censor window borders
+
+ GetImage is allowed to return window border contents, so don't remove
+ that from the returned image.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 380c2ca25ec4dd330f938e382ff4af60bc253785
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Fri Sep 23 14:11:52 2016 +0300
+
+ XF86VidMode: Fix free() on walked pointer
+
+ Based on: https://patchwork.freedesktop.org/patch/85636/
+
+ Rewritten to just not walk the pointer.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Emi Velikov <emil.l.velikov@gmail.com>
+
+commit 220d327ee00ec1278d50d4ba8cd20612e8b77c8f
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Fri Sep 23 14:06:52 2016 +0300
+
+ Xext: Fix a memory leak
+
+ Based on: https://patchwork.freedesktop.org/patch/85636/
+
+ Rewritten to also free the resources allocated by
+ panoramix_setup_ids().
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Emi Velikov <emil.l.velikov@gmail.com>
+
+commit 3abf791ab82cb3dc7eacd0317fe0262a71340753
+Author: Michael Thayer <michael.thayer@oracle.com>
+Date: Fri Sep 16 17:51:25 2016 +0200
+
+ modesetting: only fall back to drmModeSetCursor() on -EINVAL
+
+ This change effectively reverts commit 074cf58. We were falling back from
+ drmModeSetCursor2() to drmModeSetCursor() whenever the first failed. This
+ fall-back only makes sense on pre-mid-2013 kernels which implemented the
+ cursor_set hook but not cursor_set2, and in this case the call to
+ drmModeSetCursor2() will always return -EINVAL. Specifically, a return
+ value of -ENXIO usually means that neither are supported.
+
+ Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
+ [hdegoede@redhat.com: initialize ret to -EINVAL]
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 363f4273dd4aec3e26cc57ecb6c20f27e6c813d8
+Author: Daniel Martin <consume.noise@gmail.com>
+Date: Fri Dec 11 12:05:22 2015 +0100
+
+ modesetting: Consume all available udev events at once
+
+ We get multiple udev events for actions like docking a laptop into its
+ station or plugging a monitor to the station. By consuming as much
+ events as we can, we reduce the number of output re-evalutions.
+
+ I.e. having a Lenovo X250 in a ThinkPad Ultra Dock and plugging a
+ monitor to the station generates 5 udev events. Or having 2 monitors
+ attached to the station and docking the laptop generates 7 events.
+
+ It depends on the timing how many events can consumed at once.
+
+ Signed-off-by: Daniel Martin <consume.noise@gmail.com>
+ [hdegoede@redhat.com: Keep goto out so that we always call RRGetInfo()]
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit ea91db4b83312e791dcae935b8720f49a3861d72
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Thu Sep 8 21:24:58 2016 +0800
+
+ config: fix GPUDevice fail when AutoAddGPU off + BusID
+
+ This fix is for the following xorg.conf can work:
+
+ Section "ServerFlags"
+ Option "AutoAddGPU" "off"
+ EndSection
+
+ Section "Device"
+ Identifier "Amd"
+ Driver "ati"
+ BusID "PCI:1:0:0"
+ EndSection
+
+ Section "Device"
+ Identifier "Intel"
+ Driver "modesetting"
+ BusID "pci:0:2:0"
+ EndSection
+
+ Section "Screen"
+ Identifier "Screen0"
+ Device "Intel"
+ GPUDevice "Amd"
+ EndSection
+
+ Without AutoAddGPU off, modesetting DDX will also be loaded
+ for GPUDevice.
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit ca8d88e50310a0d440a127c22a0a383cc149f408
+Author: Laszlo Ersek <lersek@redhat.com>
+Date: Wed Sep 7 15:08:06 2016 +0200
+
+ xfree86: recognize primary BUS_PCI device in xf86IsPrimaryPlatform()
+
+ The new platform bus code and the old PCI bus code overlap. Platform bus
+ can handle any type of device, including PCI devices, whereas the PCI code
+ can only handle PCI devices. Some drivers only support the old style
+ PCI-probe methods, but the primary device detection code is server based,
+ not driver based; so we might end up with a primary device which only has
+ a PCI bus-capable driver, but was detected as primary by the platform
+ code, or the other way around.
+
+ (The above paragraph was shamelessly stolen from Hans de Goede, and
+ customized.)
+
+ The latter case applies to QEMU's virtio-gpu-pci device: it is detected as
+ a BUS_PCI primary device, but we actually probe it first (with the
+ modesetting driver) through xf86platformProbeDev(). The
+ xf86IsPrimaryPlatform() function doesn't recognize the device as primary
+ (it bails out as soon as it sees BUS_PCI); instead, we add the device as a
+ secondary graphics card under "autoAddGPU". In turn, the success of this
+ automatic probing-as-GPU prevents xf86CallDriverProbe() from proceeding to
+ the PCI probing.
+
+ The result is that the server exits with no primary devices detected.
+
+ Commit cf66471353ac ("xfree86: use udev to provide device enumeration for
+ kms devices (v10)") added "cross-bus" matching to xf86IsPrimaryPci(). Port
+ that now to xf86IsPrimaryPlatform(), so that we can probe virtio-gpu-pci
+ as a primary card in platform bus code.
+
+ Cc: Adam Jackson <ajax@redhat.com>
+ Cc: Dave Airlie <airlied@redhat.com>
+ Cc: Hans de Goede <hdegoede@redhat.com>
+ Cc: Keith Packard <keithp@keithp.com>
+ Cc: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
+ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
+ Tested-By: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 44968da376c880e096225f149f78673aa4c6e5e0
+Author: Kyle Guinn <elyk03@gmail.com>
+Date: Fri Sep 23 15:03:34 2016 +0300
+
+ xfree86: Fix null pointer dereference
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=93675
+ Signed-off-by: Kyle Guinn <elyk03@gmail.com>
+ [hdegoede@redhat.com: Simplify by adding 2 if conds together with &&]
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 127e0569ca8dbf774df8f83d4c59bbbbf2e25a20
+Author: David CARLIER <devnexen@gmail.com>
+Date: Fri Sep 23 14:17:12 2016 +0300
+
+ xfree86: small memory leaks fixes
+
+ A couple of memory leaks fixes and avoiding bit shifting on an
+ unitialized value.
+
+ [hdegoede@redhat.com: Split out some non free fixes in separate patches]
+ [hdegoede@redhat.com: Don't touch ancient (and weird) os/rpcauth.c code]
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit d51cce7992508f366758fa13dd93be24df0947ed
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jul 5 13:07:09 2016 -0400
+
+ xephyr: Don't crash if the server advertises zero xv adaptors
+
+ Useless as an XVideo implementation with zero adaptors might be, it's
+ apparently a thing in the wild. Catch this case and bail out of xv init
+ if it happens.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 445271ec00f25405fa5ed0e149dd4a9d9f6098d4
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Fri Jul 1 17:36:02 2016 +0200
+
+ glx: Always enable EXT_texture_from_pixmap for DRI swrast glx
+
+ Prior to commit f95645c6f700 ("glx: Don't enable EXT_texture_from_pixmap
+ unconditionally") DRI glx would always advertise EXT_texture_from_pixmap.
+
+ That commit moved the setting of the extension in the extension bits from
+ __glXInitExtensionEnableBits to its callers so that
+ __glXInitExtensionEnableBits can be used more generally, but at the same
+ time made the setting of EXT_texture_from_pixmap conditionally on
+ __DRI_TEX_BUFFER being present.
+
+ This has result in an unintended behavior change which breaks e.g.
+ compositors running on llvmpipe. This commit makes the DRI swrast glx code
+ advertise EXT_texture_from_pixmap unconditionally again fixing this.
+
+ Fixes: f95645c6f700 ("glx: Don't enable EXT_texture_from_pixmap unconditionally")
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ ---
+ Changes in v2:
+ -Only add unconditional advertising of GLX_EXT_texture_from_pixmap
+ to glxdriswrast.c, do not also add it to glxdri2.c
+
+commit 02ff0a5d7e32ce8460d6d0669f532d65ad212fcd
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Sat Sep 17 11:33:13 2016 +0200
+
+ xf86RandR12: Fix XF86VidModeSetGamma triggering a BadImplementation error
+
+ Commit b4e46c0444bb ("xfree86: Hook up colormaps and RandR 1.2 gamma code")
+ dropped the providing of a pScrn->ChangeGamma callback from the xf86RandR12
+ code. Leaving pScrn->ChangeGamma NULL in most cases.
+
+ This triggers the BadImplementation error in xf86ChangeGamma() :
+
+ if (pScrn->ChangeGamma)
+ return (*pScrn->ChangeGamma) (pScrn, gamma);
+
+ return BadImplementation;
+
+ Which causes X-apps using XF86VidModeSetGamma to crash with a
+ X protocol error.
+
+ This commit fixes this by re-introducing the xf86RandR12ChangeGamma
+ helper removed by the commit and adjusting it to work with the new
+ combined palette / gamma code.
+
+ Fixes: b4e46c0444bb ("xfree86: Hook up colormaps and RandR 1.2 gamma code")
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit a58dd678bf952560e5422845e186d80a189953fe
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Sat Sep 17 11:42:09 2016 +0200
+
+ xf86RandR12: Move calculating of shift inside init_one_component
+
+ This is a preparation patch to allow easier usage of init_one_component
+ outside of xf86RandR12CrtcInitGamma.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 299cbb92670fdb83c24c3ef6327eb9d66b8be92a
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Thu Sep 15 14:35:52 2016 +0200
+
+ modesetting: Fix reverse prime update lagging on secondary GPU outputs
+
+ When using secondary GPU outputs the primary GPU's blockhandler
+ will copy changes from its framebuffer to a pixmap shared with the
+ secondary GPU.
+
+ In reverse prime setups the secondary GPU's blockhandler will do another
+ copy from the shared pixmap to its own framebuffer.
+
+ Before this commit, if the primary GPU's blockhandler would run after
+ the secondary GPU's blockhandler and no events were pending, then the
+ secondary GPU's blockhandler would not run until some events came in
+ (WaitForSomething() would block in the poll call), resulting in the
+ secondary GPU output sometimes showing stale contents (e.g. a just closed
+ window) for easily up to 10 seconds.
+
+ This commit fixes this by setting the timeout passed into the
+ blockhandler to 0 if any shared pixmaps were updated by the primary GPU,
+ forcing an immediate re-run of all blockhandlers.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit e8695100b17b758359fc4897dbe995231ed224fc
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Thu Sep 15 14:28:35 2016 +0200
+
+ modesetting: Fix reverse prime partial update issues on secondary GPU outputs
+
+ When using reverse prime we do 2 copies, 1 from the primary GPU's
+ framebuffer to a shared pixmap and 1 from the shared pixmap to the
+ secondary GPU's framebuffer.
+
+ This means that on the primary GPU side the copy MUST be finished,
+ before we start the second copy (before the secondary GPU's driver
+ starts processing the damage on the shared pixmap).
+
+ This fixes secondary outputs sometimes showning (some) old fb contents,
+ because of the 2 copies racing with each other, for an example of
+ what this looks like see:
+
+ https://fedorapeople.org/~jwrdegoede/IMG_20160915_130555.jpg
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 862a3dab287b5186a958d0131d70779468348e3e
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu Sep 22 09:38:50 2016 +0200
+
+ xwayland: Clear up x_cursor on UnrealizeCursor()
+
+ In Xwayland's xwl_unrealize_cursor(), the x_cursor is cleared up only
+ when a device value is provided to the UnrealizeCursor() routine, but
+ if the device is NULL as called from FreeCursor(), the corresponding
+ x_cursor for the xwl_seat is left untouched.
+
+ This might cause a segfault when trying to access the unrealized
+ cursor's devPrivates in xwl_seat_set_cursor().
+
+ A possible occurrence of this is the client changing the cursor, the
+ Xserver calling FreeCursor() which does UnrealizeCursor() and then
+ the Wayland server sending a pointer enter event, which invokes
+ xwl_seat_set_cursor() while the seat's x_cursor has just been
+ unrealized.
+
+ To avoid this, walk through all the xwl_seats and clear up all x_cursor
+ matching the cursor being unrealized.
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit b79eaf1184f6514ede9dcd9baaa24a40ef724a15
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu Sep 15 15:59:07 2016 +0200
+
+ xwayland: handle EAGAIN on Wayland fd
+
+ wl_display_flush() can fail with EAGAIN and Xwayland would make this a
+ fatal error.
+
+ When this happens, it means that Xwayland has flooded the Wayland file
+ descriptor, either because the Wayland compositor cannot cope or more
+ likely because of a deadlock situation where the Wayland compositor is
+ blocking, waiting for an X reply while Xwayland tries to write data to
+ the Wayland file descriptor.
+
+ The general consensus to avoid the deadlock is for the Wayland
+ compositor to never issue blocking X11 roundtrips, but in practice
+ blocking rountrips can occur in various places, including Xlib calls
+ themselves so this is not always achievable without major surgery in the
+ Wayland compositor/Window manager.
+
+ What this patch does is to avoid dispatching to the Wayland file
+ descriptor until it becomes available for writing again, while at the
+ same time continue processing X11 requests to release the deadlock.
+
+ This is not perfect, as there is still the possibility of another X
+ client hammering the connection and we'll still fail writing to the
+ Wayland connection eventually, but this improves things enough to avoid
+ a 100% repeatable crash with vlc and gtkperf.
+
+ Also, it is worth considering that window managers and Wayland
+ compositors such as mutter already have a higher priority than other
+ regular X clients thanks to XSyncSetPriority(), mitigating the risk.
+
+ Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1278159
+ Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=763400
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit 36e1a058c5826398ceea9dba6c166ae40c75646e
+Author: Rui Matos <tiagomatos@gmail.com>
+Date: Fri Feb 5 14:44:29 2016 +0100
+
+ xwayland: Close the shm fd as early as possible
+
+ Keeping the shm fd open beyond pixmap creation means we can easily
+ reach the open file descriptor limit if an X client asks us to create
+ that many pixmaps. Instead, let's get the wl_buffer immediatly so that
+ we can destroy the shm pool and close the fd before being asked to
+ create more.
+ Tested-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
+
+commit fd4a6dc06fcf8671d616af52025e19200c79e404
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Sep 27 17:15:12 2016 -0400
+
+ glamor: Fall back to software for CopyPlane if we need to
+
+ glUniform4ui is available starting in GL{,ES} 3.0. Technically it's
+ also in EXT_gpu_shader4, but that's not worth supporting. There was also
+ a MESA_shading_language_130 spec proposed at one point; if that ever
+ gets finished, we can update epoxy to know about it and fix up the
+ feature check.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit c49e820f796c27cbd2907709576a3fb672acd453
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:22 2016 -0700
+
+ test: Run xts against Xephyr -glamor when present
+
+ v2: Drop x8r8g8b8 skip, now that it's fixed.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 5392ea5525082ceeb3aad50d9168baee2abc860e
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:21 2016 -0700
+
+ test: Switch our testing X server to being spawned with simple-xinit
+
+ Once I introduced a second X server being tested, I found that startx
+ hit races in choosing a display.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 283840c295c69aa3729f3f0aa2bf3ef83b1c220f
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:20 2016 -0700
+
+ test: Update piglit HTML even when tests all pass
+
+ I was confused by the behavior I'd written before. keithp and
+ mattst88 responded with shock that I would have made it so surprising,
+ as well.
+
+ v2: Point to index.html instead of problems.html, which won't exist if
+ we had no problems.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 022fea767cd29d256fb99159df89cc25d339e787
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:19 2016 -0700
+
+ test: Fix parsing of piglit results
+
+ The "dmesg-fail" line was matching our "fail" regex, so if you didn't
+ have those we would ignore fails.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 7fe5b9c02cf90b81532cb6dee3ec75c90c72c27c
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:18 2016 -0700
+
+ test: Make the piglit-running script callable with an arbitrary server
+
+ v2: Check that SERVER_COMMAND is set.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 7ac130a0664b43b6ba5324548c8f7ab8230f7199
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:17 2016 -0700
+
+ test: Add a little xinit-like program for starting servers for testing
+
+ The normal xinit is racy because it doesn't use -displayfd. This
+ implements the bare minimum for testing purposes, using -displayfd to
+ sequence starting the client, and avoids adding yet another dependency
+ to the server.
+
+ v2: Fix asprintf error checks.
+ v3: Add error checking for fork(), clarify calloc() arg.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 8d5e0c07b965d545c925c34be95d41c29135a63a
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:16 2016 -0700
+
+ test: Handle srcdir != builddir in Xvfb testing
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit add49792608171feef8090f7520cfa02d2daae9c
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Sep 25 13:30:15 2016 -0700
+
+ ephyr: Add a mode for skipping redisplay in glamor
+
+ This speeds up headless testing of Xephyr -glamor with softpipe from
+ "a test per minute or so" to "a test every few seconds".
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 453f813bb4afd39eb5b6b3c4a822894e04b6b11b
+Author: Eric Anholt <eric@anholt.net>
+Date: Sat Sep 24 14:37:28 2016 +0300
+
+ glamor: Properly handle mask formats without alpha.
+
+ Even if the pixmap's storage has alpha, it may have been uploaded with
+ garbage in the alpha channel, so we need to force the shader to set
+ alpha to 1. This was broken way back in
+ 355334fcd99e4dce62e2be1e27290c9a74ea944f.
+
+ Fixes rendercheck -t composite -f x8r8g8b8.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 905c877f094eb6cfe905d64e34fdd01a72dd8103
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Sep 20 12:24:38 2016 +0100
+
+ glamor: Require that pixmap depths match for Render copies.
+
+ The copy optimization in d37329cba42fa8e72fe4be8a7be18e512268b5bd
+ replicated a bug from last time we did a copy optimization: CopyArea
+ is only defined for matching depths. This is only a problem at 15 vs
+ 16 depth right now (24 vs 32 would also have matching Render formats,
+ but they should work) but be strict in case we store other depths
+ differently in the future.
+
+ Fixes rendercheck -t blend -o src -f x4r4g4b4,x3r4g4b4
+
+ v2: Drop excessive src->depth == dst->depth check that snuck in.
+ v3: Switch back to src->depth == dst->depth
+ v4: Touch up commit message (s/bpp/depth).
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit b87a07567421af05622197eec91a71e4fca4f79e
+Author: Eric Anholt <eric@anholt.net>
+Date: Tue Sep 20 12:14:36 2016 +0100
+
+ glamor: Fix some awful formatting of some fallback debug code.
+
+ This was clearly x-indent.sh damage.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit ba199cb90157cefab01183f2e2c909895df73321
+Author: Mark Kettenis <kettenis@openbsd.org>
+Date: Tue Nov 17 22:31:21 2015 +0100
+
+ glamor: Make glamor_sync_init work with --disable-xshmfence
+
+ Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 8bb4b11298c285d2cd1eb28e65729933ec386829
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Fri Sep 23 16:56:06 2016 +0300
+
+ glamor: Make glamor_name_from_pixmap work without DRI3
+
+ This function is used by the modesetting driver to implement DRI2 and
+ shouldn't fail on systems that don't support DRI3.
+
+ v2: Drop stale commit message wording, fix compiler warning (by anholt)
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 128d40b2dd0a26a075a67854455d4208afaa01ca
+Author: Eric Engestrom <eric@engestrom.ch>
+Date: Sat Apr 2 19:53:18 2016 +0100
+
+ glamor: fix spelling mistakes
+
+ v2: Fix "orignal" too (review feedback by ajax, change by anholt)_
+
+ Signed-off-by: Eric Engestrom <eric@engestrom.ch>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit ade315386cee9a65a3885c65e96256880ac6f00a
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 23 09:52:21 2016 +0300
+
+ Require xproto 7.0.31
+
+ xproto 7.0.30 had a typo which caused compiles to fail on anything
+ other than clang
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f72ff1f7ac784f3911fe2f8d746f62f7709f0edc
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon Sep 19 09:34:50 2016 -0700
+
+ XQuartz: Silence an expected TSan warning
+
+ This code is safe. If the data race fails, the result is that we take the
+ lock and recheck.
+
+ ==================
+ WARNING: ThreadSanitizer: data race (pid=31401)
+ Read of size 1 at 0x00010f5d2500 by thread T11:
+ #0 wait_for_mieq_init darwinEvents.c:102 (X11.bin+0x00010003155a)
+ #1 -[X11Application(Private) sendX11NSEvent:] X11Application.m:1330 (X11.bin+0x00010001d652)
+ #2 __28-[X11Application sendEvent:]_block_invoke X11Application.m:476 (X11.bin+0x00010001887f)
+ #3 __tsan::invoke_and_release_block(void*) <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x00000005d97b)
+ #4 _dispatch_client_callout <null>:33 (libdispatch.dylib+0x0000000020ef)
+
+ Previous write of size 1 at 0x00010f5d2500 by thread T8:
+ [failed to restore the stack]
+
+ Location is global 'mieqInitialized' at 0x00010f5d2500 (X11.bin+0x000100599500)
+
+ Thread T11 (tid=4367138, running) created by thread T-1
+ [failed to restore the stack]
+
+ Thread T8 (tid=4367130, running) created by main thread at:
+ #0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
+ #1 create_thread quartzStartup.c:78 (X11.bin+0x000100039d2d)
+ #2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039b96)
+ #3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cd54)
+ #4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5b2)
+ #5 server_main quartzStartup.c:136 (X11.bin+0x000100039fbb)
+ #6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e25)
+ #7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e09)
+ #8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056a4)
+ #9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #10 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ SUMMARY: ThreadSanitizer: data race darwinEvents.c:102 in wait_for_mieq_init
+ ==================
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 7d6ebf3f4e4d517bb846d15a5deb131da19a267c
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon Sep 19 00:21:44 2016 -0700
+
+ XQuartz: Adopt input_lock() and input_unlock()
+
+ This allows us to remove darwinEvents_lock() and darwinEvents_unlock()
+ and remove the serverRunning hack from dix
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 8bc4727f475321a8adcbbd859f3f8dd9eeb64aa4
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Sep 18 23:17:19 2016 -0700
+
+ XQuartz: pbproxy shouldn't need to wait for server initialization.
+
+ Just block on the socket like every other client does.
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 81493d30981d7deb38f57bca2a35487add5ea509
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Sep 18 23:13:20 2016 -0700
+
+ XQuartz: Remove X11ApplicationFatalError
+
+ AppKit handles crashes on app launch with their own dialog now, so we shouldn't need to do this ourselves.
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 9153ec8464336c280f2a6e79ffa443104bbeb98c
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Sep 18 22:45:16 2016 -0700
+
+ XQuartz: Don't respond to SIGALRM on the AppKit thread
+
+ ==================
+ WARNING: ThreadSanitizer: data race (pid=69627)
+ Write of size 8 at 0x00010dae73f8 by main thread (mutexes: write M262):
+ #0 SmartScheduleTimer utils.c:1245 (X11.bin+0x0001004b21f9)
+ #1 __tsan::CallUserSignalHandler(__tsan::ThreadState*, bool, bool, bool, int, my_siginfo_t*, void*) <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000279f6)
+ #2 __CFRunLoopRun <null>:77 (CoreFoundation+0x000000087e17)
+ #3 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
+ #4 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
+ #5 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
+ #6 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
+ #7 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
+ #8 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #9 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ Previous read of size 8 at 0x00010dae73f8 by thread T7:
+ [failed to restore the stack]
+
+ Location is global 'SmartScheduleTime' at 0x00010dae73f8 (X11.bin+0x0001005b03f8)
+
+ Mutex M262 (0x7d300000bd10) created at:
+ #0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
+ #1 __CFRunLoopCreate <null>:77 (CoreFoundation+0x000000054e63)
+ #2 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
+ #3 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
+ #4 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
+ #5 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
+ #6 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
+ #7 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #8 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ Thread T7 (tid=4051693, running) created by main thread at:
+ #0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
+ #1 create_thread quartzStartup.c:78 (X11.bin+0x0001000398dd)
+ #2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039813)
+ #3 X11ApplicationMain X11Application.m:1286 (X11.bin+0x00010001c804)
+ #4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
+ #5 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
+ #6 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
+ #7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
+ #8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
+ #9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #10 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ SUMMARY: ThreadSanitizer: data race utils.c:1245 in SmartScheduleTimer
+ ==================
+ ==================
+ WARNING: ThreadSanitizer: signal handler spoils errno (pid=69627)
+ #0 SmartScheduleTimer utils.c:1244 (X11.bin+0x0001004b21a0)
+ #1 __CFRunLoopRun <null>:77 (CoreFoundation+0x000000087e17)
+ #2 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a062)
+ #3 server_main quartzStartup.c:127 (X11.bin+0x000100039b6b)
+ #4 do_start_x11_server bundle-main.c:436 (X11.bin+0x0001000022c5)
+ #5 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x0001000042a9)
+ #6 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100004b44)
+ #7 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #8 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ SUMMARY: ThreadSanitizer: signal handler spoils errno utils.c:1244 in SmartScheduleTimer
+ ==================
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 2740dc1937e8ab32b4930f4086c302e6602a7bad
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon Sep 19 01:25:13 2016 -0700
+
+ dix: Silence TSan warnings when checking for pending input
+
+ V2: Moves InputCheckPending() into dix.h
+
+ Bumps required version of xproto to 7.0.30
+
+ ==================
+ WARNING: ThreadSanitizer: data race (pid=4943)
+ Read of size 4 at 0x00010c4e3854 by thread T8:
+ #0 WaitForSomething WaitFor.c:237 (X11.bin+0x00010049216c)
+ #1 Dispatch dispatch.c:413 (X11.bin+0x000100352ed9)
+ #2 dix_main main.c:287 (X11.bin+0x00010036e894)
+ #3 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
+
+ Previous write of size 4 at 0x00010c4e3854 by thread T12 (mutexes: write M856, write M1976):
+ #0 mieqEnqueue mieq.c:263 (X11.bin+0x000100448d14)
+ #1 DarwinSendDDXEvent darwinEvents.c:641 (X11.bin+0x000100033613)
+ #2 DarwinProcessFDAdditionQueue_thread darwinEvents.c:338 (X11.bin+0x000100032039)
+
+ Location is global 'miEventQueue' at 0x00010c4e3850 (X11.bin+0x0001005ab854)
+
+ Mutex M856 (0x00010c4c8c80) created at:
+ #0 pthread_mutex_lock <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000321fe)
+ #1 DarwinListenOnOpenFD darwinEvents.c:300 (X11.bin+0x000100031607)
+ #2 socket_handoff bundle-main.c:288 (X11.bin+0x000100002b40)
+ #3 __do_request_fd_handoff_socket_block_invoke bundle-main.c:379 (X11.bin+0x0001000029ba)
+ #4 __tsan::invoke_and_release_block(void*) <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x00000005d97b)
+ #5 _dispatch_client_callout <null>:33 (libdispatch.dylib+0x0000000020ef)
+
+ Mutex M1976 (0x00010c4e3d68) created at:
+ #0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
+ #1 input_lock inputthread.c:103 (X11.bin+0x00010049fd10)
+ #2 TimerSet WaitFor.c:343 (X11.bin+0x0001004926c2)
+ #3 RootlessQueueRedisplay rootlessScreen.c:594 (X11.bin+0x000100065d7f)
+ #4 RootlessInstallColormap rootlessScreen.c:514 (X11.bin+0x000100069f1a)
+ #5 miSpriteInstallColormap misprite.c:562 (X11.bin+0x000100467095)
+ #6 miCreateDefColormap micmap.c:270 (X11.bin+0x000100440399)
+ #7 DarwinScreenInit darwin.c:285 (X11.bin+0x0001000303bb)
+ #8 AddScreen dispatch.c:3908 (X11.bin+0x00010036c417)
+ #9 InitOutput darwin.c:671 (X11.bin+0x00010002fdeb)
+ #10 dix_main main.c:197 (X11.bin+0x00010036e228)
+ #11 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
+
+ Thread T8 (tid=4198779, running) created by main thread at:
+ #0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
+ #1 create_thread quartzStartup.c:78 (X11.bin+0x000100039dad)
+ #2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039c16)
+ #3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cde4)
+ #4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a642)
+ #5 server_main quartzStartup.c:136 (X11.bin+0x00010003a03b)
+ #6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002eb5)
+ #7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e99)
+ #8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x000100005734)
+ #9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #10 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ Thread T12 (tid=4198797, running) created by thread T8 at:
+ #0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
+ #1 create_thread darwinEvents.c:121 (X11.bin+0x000100031ecf)
+ #2 DarwinEQInit darwinEvents.c:365 (X11.bin+0x000100031860)
+ #3 InitInput darwin.c:571 (X11.bin+0x00010002ea09)
+ #4 dix_main main.c:261 (X11.bin+0x00010036e7ce)
+ #5 server_thread quartzStartup.c:66 (X11.bin+0x000100039e63)
+
+ SUMMARY: ThreadSanitizer: data race WaitFor.c:237 in WaitForSomething
+ ==================
+ ==================
+ WARNING: ThreadSanitizer: data race (pid=22841)
+ Write of size 4 at 0x000105bbd864 by main thread (mutexes: write M1945):
+ #0 mieqEnqueue mieq.c:263 (X11.bin+0x000100448cf4)
+ #1 DarwinSendDDXEvent darwinEvents.c:642 (X11.bin+0x000100033693)
+ #2 -[X11Controller set_window_menu:] X11Controller.m:275 (X11.bin+0x0001000222fd)
+ #3 -[X11Application set_window_menu:] X11Application.m:486 (X11.bin+0x000100018b44)
+ #4 -[X11Application handleMachMessage:] X11Application.m:177 (X11.bin+0x000100016678)
+ #5 __NSFireMachPort <null>:69 (Foundation+0x00000009b62b)
+ #6 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5f2)
+ #7 server_main quartzStartup.c:136 (X11.bin+0x000100039ffb)
+ #8 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e65)
+ #9 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e49)
+ #10 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056e4)
+ #11 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #12 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ Previous read of size 4 at 0x000105bbd864 by thread T7:
+ #0 Dispatch dispatch.c:434 (X11.bin+0x000100352fc8)
+ #1 dix_main main.c:287 (X11.bin+0x00010036e874)
+ #2 server_thread quartzStartup.c:66 (X11.bin+0x000100039e23)
+
+ Location is global 'miEventQueue' at 0x000105bbd860 (X11.bin+0x0001005ab864)
+
+ Mutex M1945 (0x000105bbdd78) created at:
+ #0 pthread_mutex_init <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x0000000253c3)
+ #1 input_lock inputthread.c:103 (X11.bin+0x00010049fd10)
+ #2 TimerSet WaitFor.c:348 (X11.bin+0x0001004926c2)
+ #3 RootlessQueueRedisplay rootlessScreen.c:594 (X11.bin+0x000100065d3f)
+ #4 RootlessInstallColormap rootlessScreen.c:514 (X11.bin+0x000100069eda)
+ #5 miSpriteInstallColormap misprite.c:562 (X11.bin+0x000100467075)
+ #6 miCreateDefColormap micmap.c:270 (X11.bin+0x000100440379)
+ #7 DarwinScreenInit darwin.c:285 (X11.bin+0x00010003036b)
+ #8 AddScreen dispatch.c:3914 (X11.bin+0x00010036c3f7)
+ #9 InitOutput darwin.c:671 (X11.bin+0x00010002fd9b)
+ #10 dix_main main.c:197 (X11.bin+0x00010036e208)
+ #11 server_thread quartzStartup.c:66 (X11.bin+0x000100039e23)
+
+ Thread T7 (tid=4257217, running) created by main thread at:
+ #0 pthread_create <null>:144 (libclang_rt.tsan_osx_dynamic.dylib+0x000000024490)
+ #1 create_thread quartzStartup.c:78 (X11.bin+0x000100039d6d)
+ #2 QuartzInitServer quartzStartup.c:95 (X11.bin+0x000100039bd6)
+ #3 X11ApplicationMain X11Application.m:1238 (X11.bin+0x00010001cd94)
+ #4 X11ControllerMain X11Controller.m:984 (X11.bin+0x00010002a5f2)
+ #5 server_main quartzStartup.c:136 (X11.bin+0x000100039ffb)
+ #6 do_start_x11_server bundle-main.c:436 (X11.bin+0x000100002e65)
+ #7 _Xstart_x11_server mach_startupServer.c:189 (X11.bin+0x000100004e49)
+ #8 mach_startup_server mach_startupServer.c:399 (X11.bin+0x0001000056e4)
+ #9 mach_msg_server mach_msg.c:563 (libsystem_kernel.dylib+0x000000012186)
+ #10 start <null>:29 (libdyld.dylib+0x000000005254)
+
+ SUMMARY: ThreadSanitizer: data race mieq.c:263 in mieqEnqueue
+ ==================
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 7ff8a74945c0cb525a2d197e28426fd098a407cf
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Sep 22 02:53:46 2016 +0300
+
+ os: Clear saved poll events in listen so that edge triggering works
+
+ When a client is marked as write blocked, clear any old 'write ready'
+ bit in the osfds structure so that a new indication of write ready
+ (which is marked as edge trigggered) will trigger the callback.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Tested-by: Matthieu Herrb <matthieu@herrb.eu>
+
+commit 1d365f1ffe0362732b64e565db6ae8af718758f2
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Sep 22 02:53:45 2016 +0300
+
+ os: Ready clients with pending output aren't flushed, so set NewOutputPending
+
+ When a client with pending output is ready (has request data pending),
+ FlushAllOutput will skip it to get all of the requests processed
+ before sending any queued output. That means FlushAllOutput is going
+ to return with some output pending to a client which isn't known to be
+ write blocked. And that means NewOutputPending needs to be set so that
+ FlushAllOutput will get called again to actually go flush this client.
+
+ It might be interesting to try just flushing the client to send any
+ queued data along the way. This patch just restores the server
+ behavior to what it was before the ospoll changes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Tested-by: Matthieu Herrb <matthieu@herrb.eu>
+
+commit d0c5d205a919fc1d2eb599356090b58b1bf0176d
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Mon Sep 19 01:13:02 2016 -0700
+
+ dix: Make InitCoreDevices() failures more verbose.
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5794bdd52821463acf691c4230741f6b4289669b
+Author: Mihail Konev <k.mvc@ya.ru>
+Date: Wed Sep 14 11:47:15 2016 +0100
+
+ xkb: fix turbo-repeat of RedirectKey-ed keysyms
+
+ RedirectKey() action had been broken by commit 2e6190.
+ A dropped check caused over-intense autorepeat of keysyms enriched
+ with the action.
+
+ Previous to this commit, the check wrapped the entire switch() block,
+ which was dropped with the move to a separate function.
+
+ Restore the checking.
+
+ Signed-off-by: Mihail Konev <k.mvc@ya.ru>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fc1c358b955258ce675e49490de7c3b8ddee2b76
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Sep 19 09:02:57 2016 -0700
+
+ Bump to 1.18.99.901 (1.19 RC1)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5998da7855750dd947288349a0b14e65db1e3c8c
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:16:56 2016 +0800
+
+ dix: Incroduce CursorConfinedTo vfunc in Screen
+
+ This function will be called when a pointer is grabbed non-root window
+ set as the 'confineTo'. This will enable the ddx to handle the
+ confinement their own way.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit daf48a3aba7d5c42d7156f0d0e2b1d8aae423303
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue Sep 13 15:16:55 2016 +0800
+
+ dix: Introduce CursorWarpedTo vfunc in Screen
+
+ This new vfunc will be called, if set, after a client has issued a
+ WarpPointer request. This is necessary for implementing pointer warp
+ emulation in Xwayland.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3ef51c5c74297937002668b0c507fa88550db67e
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 16 10:03:49 2016 -0700
+
+ Bump version to 1.18.99.2
+
+ Prepare for 1.19 RC1
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 86038dfd42d6f6da9646ef2f87b2ab8ccba98e02
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 16 10:56:15 2016 -0700
+
+ os: Add 'ospoll.h' to Makefile.am
+
+ Distribute this source file.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 56972d007dcde93693cb9e39931978b744942e5b
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 16 10:55:27 2016 -0700
+
+ include: Add 'xserver_poll.h' to Makefile.am
+
+ Make sure this file is included in the tarball.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 61b159f5a79130a9661064d3f0143e5d6107985a
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 16 10:54:37 2016 -0700
+
+ hw/xwin: Add 'dri' to DIST_SUBDIRS
+
+ This creates the needed Makefile.in files during 'make dist' or 'make
+ distcheck'
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 93f474e49b24abc673cb9cf5ea16fac296dce312
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Sep 16 10:43:09 2016 -0700
+
+ Remove 'dixfontstubs.h' from include EXTRA_DIST
+
+ This file was removed when moving to the new libXfont API, but
+ accidentally left in EXTRA_DIST.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 5b9f3ea2501a886fb74e5248e82a95e76443f1e8
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Thu Jan 14 18:09:44 2016 +0900
+
+ xfree86/modes: Set RandR primary output from CreateScreenResources
+
+ Fixes XRRGetOutputPrimary and xrandr not reporting a primary output after
+ startup. This was especially confusing when an output was explicitly
+ marked as primary using Option "Primary" in Section "Monitor".
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bd8ecd9be1568b59258b6d2f78530ede345b7c7a
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Sep 16 09:51:31 2016 -0700
+
+ Add SyncSharedPixmap ScreenRec hook
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 7f6fa4e449f5a7215bbf60ce8c874e163a7453a9
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Mon Sep 5 18:05:42 2016 +0800
+
+ modesetting: fix compile error when --disable-glamor
+
+ Move ms_flush_drm_events out of GLAMOR ifdef.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97586
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d81f9ce12aa4ac54b9c2b8c74c2f827c1f3e739a
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Sep 11 03:07:44 2016 -0700
+
+ dix/dispatch: Fix SmartScheduleClient interval adjustment to use best rather than pClient
+
+ pClient does not contain a live value after the transition to lists
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=97765
+
+ Application Specific Information:
+ X.Org X Server 1.18.99.1 Build Date: 20160910
+ =================================================================
+ ==16921==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000108ce3834 at pc 0x000108880766 bp 0x7000045f76c0 sp 0x7000045f76b8
+ READ of size 4 at 0x000108ce3834 thread T6
+ #0 0x108880765 in SmartScheduleClient dispatch.c:365
+ #1 0x10887ecc5 in Dispatch dispatch.c:422
+ #2 0x1088c05f1 in dix_main main.c:301
+ #3 0x1082aabba in server_thread quartzStartup.c:66
+ #4 0x7fffc5f16aaa in _pthread_body (libsystem_pthread.dylib+0x3aaa)
+ #5 0x7fffc5f169f6 in _pthread_start (libsystem_pthread.dylib+0x39f6)
+ #6 0x7fffc5f161fc in thread_start (libsystem_pthread.dylib+0x31fc)
+
+ Regressed-in: 8f1edf4bd3a1f050ce9eeb5eac45dd1a8f7a6d5e
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 265c4e66533243b60d92cffc7769ecadb0292c8d
+Merge: 3caf671ed2 f5f4d32ac7
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Sep 15 21:32:46 2016 -0700
+
+ Merge remote-tracking branch 'jturney/master'
+
+commit 3caf671ed2a8a79856409a109355fc0f393d7aed
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Sep 14 22:40:32 2016 -0700
+
+ config/dbus: Initialize dbus fd to -1 so teardown doesn't use fd 0
+
+ The dbus teardown code is called when the server fatal errors even if
+ that is before dbus has ever been initialized. By statically
+ initializing the value of bus_info.fd, we avoid calling RemoveNotifyFd
+ on stdin.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f5f4d32ac7c250cfbfb94883ce7d7e46151e89f0
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu Jul 24 12:29:41 2014 +0100
+
+ Add Windows-DRI extension
+
+ If windowsdriproto headers are available, build a Windows-DRI extension,
+ which supports requests to enable local clients to directly render GL to a
+ Windows drawable:
+
+ - a query to check if WGL is being used on a screen
+ - a query to map a fbconfigID to a native pixelformatindex
+ - a query to map a drawable to a native handle
+
+ Windows-DRI can only be useful if we are using WGL, so make an note if WGL
+ is active on a screen.
+
+ Make validGlxDrawable() public
+
+ Adjust glxWinSetPixelFormat() so it doesn't require a context, just a
+ screen and config.
+
+ That enables factoring out the deferred drawable creation code as
+ glxWinDeferredCreateDrawable()
+
+ Enhance glxWinDeferredCreateDrawable(), so that pixmaps are placed into a
+ file mapping, so they exist in memory which can be shared with the direct
+ rendering process.
+
+ Currently, this file mapping is accessed by a name generated from the XID.
+ This will not be unique across multiple server instances. It would perhaps
+ be better, although more complicated, to use an anonymous file mapping, and
+ then duplicate the handle for the direct rendering process.
+
+ Use glxWinDeferredCreateDrawable() to ensure the native handle exists for
+ the Windows-DRI query to map a drawable to native handle.
+
+ v2:
+ Various printf format warning fixes
+
+ v3:
+ Fix format warnings on x86
+ Move some uninteresting windows-dri output to debug log level
+
+ v4:
+ check for windowsdriproto when --enable-windowsdri
+ use windowsdriproto_CFLAGS
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 52d6a1e832a5e62289dd4f32824ae16a78dfd7e8
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Sep 8 11:02:30 2016 -0600
+
+ Hold input lock for deviceProc
+
+ This ensures that the deviceProc is never called while the input
+ thread is processing data from the device.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit dfc91f0f630f9e0500fc28b18e3f2851024d719f
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Sep 8 11:02:31 2016 -0600
+
+ Hold input lock while calling input device SetProperty callback
+
+ This keeps the input driver SetProperty function from being called
+ while input events are being processed.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c4799f186b31e579721f5874c897f3f46db6ad0a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Sep 10 21:14:19 2016 -0700
+
+ os: Use pthread_setname_np to set thread names if available
+
+ Autoconf logic borrowed from glib
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 75c1d04650f63464263c159d2e95364482be724f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Sep 10 21:08:01 2016 -0700
+
+ os: OsSigHandler should not show rtld errors for unrelated signals
+
+ If RTLD_DI_SETSIGNAL is set to let us turn runtime linker/loader errors
+ into catchable signals, then we should only show the errors when catching
+ that signal, instead of tossing out red herrings to distract people with
+ unrelated crashes long after their last failed symbol lookup (especially
+ when using drivers built to support multiple API's by checking which
+ symbols are available before calling them).
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit 065eb6612492bacf4d7caaad90e35dafc2cbf7ea
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Sep 11 19:56:52 2016 -0700
+
+ os/inputthread: Fix setting of cloexec on file descriptors
+
+ O_CLOEXEC is not a file bit. It is not setable with F_SETFL. One must
+ use it when calling open(2). To set it cloexec on an existing fd,
+ F_SETFD and FD_CLOEXEC must be used.
+
+ This also fixes a build failure regression on configurations that don't
+ have O_CLOEXEC defined.
+
+ cf: http://pubs.opengroup.org/onlinepubs/9699919799/functions/fcntl.html
+ Regressed-in: 30ac7567980a1eb79d084a63e0e74e1d9a3af673
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit a5769de0f5399053e9864b753fa9755220d65ae0
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun Sep 11 19:47:47 2016 -0700
+
+ Xext/shm: Fix usage of F_GETFD to match standard
+
+ flags = fcntl(fd, F_GETFD) is compliant.
+
+ fcntl(fd, F_GETFD, &flags) is non-compliant (Linux extension?)
+
+ cf: http://pubs.opengroup.org/onlinepubs/9699919799/functions/fcntl.html
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 7def2fea30060d47780dc1eedc91fada5ae1934f
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat Sep 10 23:37:46 2016 -0700
+
+ Xquartz: Update for removal of AddEnabledDevice and RemoveEnabledDevice
+
+ Regressed-in: be5a513fee6cbf29ef7570e57eb0436d70fbd88c
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 4f4ecd0f41cf1c710d3ef1626b747847e6184f4c
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat Sep 10 22:16:11 2016 -0700
+
+ XQuartz: Cleanup CPPFLAGS that are no longer necessary on darwin
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 33d595255d4206df0d136014de33100817cbe344
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun May 29 14:01:38 2016 -0700
+
+ XQuartz: Fix the issue where the h key could be come "stuck" after hiding XQuartz with cmd-h
+
+ The issue was that we set a flag to ignore the k key's up event when sent
+ the cmd-h down event, but because the cmd-h keycode hides XQuartz, we
+ became !_x_active by the time the event is delivered which caused us to
+ go down a differnet codepath rather than getting a chance to ignore it.
+ We then incorrectly ignored the next h up key.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=92648
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit d8e05c04758cbcd7b5c11362cb28ce017d50098b
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Aug 24 15:00:13 2016 +0200
+
+ modesetting: Fall back to primary crtc for vblank for drawables on slave outputs
+
+ This fixes glxgears running at 1 fps when fully covering a slave-output
+ and the modesetting driver is used for the master gpu.
+
+ Reported-by: Peter Wu <peter@lekensteyn.nl>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 7ade8ba10e1e767bb510343c86573bc5d4804b92
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Aug 24 14:55:27 2016 +0200
+
+ modesetting: ms_covering_crtc: Allow calling on non modesetting Screens
+
+ 99% of the code in ms_covering_crtc is video-driver agnostic. Add a
+ screen_is_ms parameter when when FALSE skips the one ms specific check,
+ this will allow calling ms_covering_crtc on slave GPUs.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 238248d67e6a422f31e8864c0b15d693a658cdac
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Mon Aug 15 12:02:54 2016 +0200
+
+ modesetting: Implement DRI2InfoRec version 9 callbacks
+
+ Implement the CreateBuffer2 / DestroyBuffer2 / CopyRegion2 DRI2InfoRec
+ version 9 callbacks, this is necessary for being an offload source
+ provider with DRI2.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 03a7c50202f61030830ff639fccf52091e02156c
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Mon Aug 15 10:44:57 2016 +0200
+
+ modesetting: ms_dri2_create_buffer: check screen of existing front buffers
+
+ If a frontbuffer drawable already has a pixmap, make sure it was created
+ on the right screen.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 35c4e96ed1d372dd161480be8cddcd2d4549e449
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Mon Sep 12 12:47:59 2016 +0200
+
+ randr: Fix crtc_bounds when using rotation combined with reflection
+
+ Before this commit crtc_bounds() did not take reflection into account,
+ when using reflection with 0 / 180 degree rotation this was not an
+ issue because of the default in the switch-case doing the right thing.
+
+ But when using 90 / 270 degree rotation we would also end up in the
+ default which is wrong in this case. This would lead to the cursor
+ being constrained to a height x height area of the monitor.
+
+ This commit masks out the reflection bits for the switch-case,
+ making crtc_bounds return the correct bounds and fixing the
+ problematic cursor constraining.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 7b634067c13045671685a9f00bfbac626ed68f94
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Jul 15 10:15:51 2015 +1000
+
+ xf86Cursor: Add hw cursor support for prime
+
+ Currently with PRIME if we detect a secondary GPU,
+ we switch to using SW cursors, this isn't optimal,
+ esp for the intel/nvidia combinations, we have
+ no choice for the USB offload devices.
+
+ This patch checks on each slave screen if hw
+ cursors are enabled, and also calls set cursor
+ and move cursor on all screens.
+
+ Cc: Aaron Plattner <aplattner@nvidia.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit df88008f92f85ef96d9fe48ac509d027570424eb
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Sep 6 11:48:31 2016 +0200
+
+ xf86Cursor: Deal with rotation on GPU screens using a hw-cursor
+
+ When a slave-output is rotated the transformation is done on the blit
+ from master to slave GPU, so crtc->transform_in_use is not set, but we
+ still need to adjust the mouse position for things to work.
+
+ This commit modifies xf86_crtc_transform_cursor_position to not rely
+ on crtc->f_framebuffer_to_crtc, so that it can be used with GPU screens
+ too and always calls it for crtcs with any form of rotation.
+
+ Note not using crtc->f_framebuffer_to_crtc means that crtc->transform
+ will not be taken into account, that is ok, because when we've a transform
+ active hw-cursors are not used and xf86_crtc_transform_cursor_position
+ will never get called.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit f82fd47016628e8bcdcba3aab506a919fe8c49d8
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Sep 6 11:50:50 2016 +0200
+
+ xf86Cursor: Fix xf86_crtc_rotate_coord using width/height wrongly
+
+ xf86_crtc_rotate_coord should be the exact inverse operation of
+ xf86_crtc_rotate_coord_back, but when calculating x / y for 90 / 270
+ degrees rotation it was using height to calculate x / width to calculate y,
+ instead of the otherway around.
+
+ This was likely not noticed before since xf86_crtc_rotate_coord
+ until now was only used with cursor_info->MaxWidth and
+ cursor_info->MaxHeight, which are usally the same.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit b0b04cb266a62675dd7cde97111ebe7c1552db9a
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Sep 6 13:14:35 2016 +0200
+
+ xf86Cursor: Fix xf86CurrentCursor to work on slave GPU Screens
+
+ The CurrentCursor is always attached to the master GPU.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 71fecc84e9ceb11ff61c912bdaa3fc959ec36bef
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Sep 6 13:02:32 2016 +0200
+
+ xf86Cursor: Add xf86CheckHWCursor() helper function
+
+ This is a preparation patch for adding prime hw-cursor support.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 2eefb53f58854ef9d34859583207ec37d3c3047a
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Sep 6 13:15:36 2016 +0200
+
+ randr: Add RRHasScanoutPixmap helper function
+
+ This is a preparation patch for adding prime hw-cursor support.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit a52530a655438f03919d47f6edd11287efff47bb
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Sep 6 12:50:14 2016 +0200
+
+ dix: Add dixPrivatesCreated helper function
+
+ This is a preparation patch for adding prime hw-cursor support.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 3fe4107643ba029dd48e3d12ec9bc97d07112300
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Thu Sep 8 09:30:31 2016 +0200
+
+ glamor: Fix crash when master gpu is using glamor and another gpu is hotplugged
+
+ When a GPU gets hotplugged while X is already running, glamor_egl_init()
+ gets called and changes the current egl context, without updating
+ lastGLContext, potentially causing the next glamor call on another GPU to
+ run in the wrong context.
+
+ This causes glamor to e.g. crash in the next glamor_create_pixmap() call
+ (called through the master's screen->CreatePixmap), note this is not the
+ only troublesome entry point I've seen other backtraces when using a
+ compositing window manager.
+
+ Set lastGLContext to NULL to force the next glamor_make_current() call
+ to set the right context.
+
+ Note that we cannot use glamor_make_current() here to replace the
+ eglMakeCurrent() call and update lastGLContext for us because
+ glamor_make_current takes a glamor_priv struct as argument and that
+ has not been created yet when glamor_egl_init() gets called.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 1075af8a6c26009c04db30a6d6d1f10070568ab1
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Mon Aug 15 11:10:15 2016 +0200
+
+ modesetting: Remove some dead code
+
+ The "if (pixmap) ..." block this commit removes is inside an
+ "if (pixmap == NULL) ..." block, so it will never execute.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit dfa295b29c20b174f80ab823eef41e5211a6a921
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Aug 24 14:13:19 2016 +0200
+
+ modesetting: ms_covering_crtc: Remove unused arguments, make static
+
+ Remove unused arguments from ms_covering_crtc, make it static as it is
+ only used in vblank.c.
+
+ While at it also change its first argument from a ScrnInfoPtr to a
+ ScreenPtr, this makes the next patch in this patch-set cleaner.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit cb7b145a25452de8b549e8c8e9ec3bcc752e55dc
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Aug 17 12:03:41 2016 +0200
+
+ modesetting: Fix msSharePixmapBacking returning a non-linear bo
+
+ glamor_fd_from_pixmap() may return a tiled bo, which is not suitable
+ for sharing with another GPU as tiling usually is GPU specific.
+
+ Switch to glamor_shareable_fd_from_pixmap(), which always returns a
+ linear bo. This fixes mis-rendering when running the mode setting
+ driver on the master gpu in a dual-gpu setup and running an opengl
+ app with DRI_PRIME=1.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit a74d553cb97d545148bd2f81b7bd021cca94e076
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Aug 23 12:18:56 2016 +0200
+
+ glamor: Add glamor_shareable_fd_from_pixmap()
+
+ Add glamor_shareable_fd_from_pixmap function to get dma-buf fds suitable
+ for sharing across GPUs (not using GPU specific tiling).
+
+ This is necessary for the modesetting driver to correctly implement
+ the DRI2 SharePixmapBacking callback.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 527c6baa294d17c5eca1d87ac941844872e90dac
+Author: Ran Benita <ran234@gmail.com>
+Date: Wed Aug 29 12:33:34 2012 +0300
+
+ xkb: fix check for appending '|' character when applying rules
+
+ There are two ways to separate multiple files in XKB include statements:
+ '+' will cause the later file to override the first in case of conflict,
+ while '|' will cause it augment it (this is done by xkbcomp). '!' is
+ unrelated here.
+ Currently, if someone tries to use '|' in a rule instead of '+', it
+ won't have any effect. Since '|' is practically never used, this wasn't
+ noticed.
+
+ Signed-off-by: Ran Benita <ran234@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 392da389d7b0e9dd970741dcd5321a4e0fd3aef5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 30 14:04:04 2016 -0400
+
+ glx: Fix computation of GLX_X_RENDERABLE fbconfig attribute
+
+ >From the GLX spec:
+
+ "GLX_X_RENDERABLE is a boolean indicating whether X can be used to
+ render into a drawable created with the GLXFBConfig. This attribute
+ is True if the GLXFBConfig supports GLX windows and/or pixmaps."
+
+ Every backend was setting this to true unconditionally, and then the
+ core ignored that value and sent true unconditionally on its own. This
+ is broken for ARB_fbconfig_float and EXT_fbconfig_packed_float, which
+ only apply to pbuffers, which are not renderable from non-GLX APIs.
+
+ Instead compute GLX_X_RENDERABLE from the supported drawable types. The
+ dri backends were getting _that_ wrong too, so fix that as well.
+
+ This is not a functional change, as there are no mesa drivers that claim
+ to support __DRI_ATTRIB_{UNSIGNED_,}FLOAT_BIT yet.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 589f42e9830e66a7e26475fc9a8b91034b5aad86
+Author: Rui Matos <tiagomatos@gmail.com>
+Date: Sun Jun 26 19:48:23 2016 +0200
+
+ xwayland: Process queued events before making wayland mods effective
+
+ Since xwayland's initial commit we have had a check to not process
+ wayland modifier events while one of our surfaces has keyboard focus
+ since the normal xkb event processing keeps our internal modifier
+ state up to date and if we use the modifiers we get from the
+ compositor we mess up that state.
+
+ This was slightly changed in commit
+ 10e9116b3f709bec6d6a50446c1341441a0564e4 to allow the xkb group to be
+ set from the wayland event while we have focus in case the compositor
+ triggers a group switch.
+
+ There's a better solution to the original problem though. Processing
+ queued events before overriding the xkb state with the compositor's
+ allows those events to be sent properly modified to X clients while
+ any further events will be modified with the wayland modifiers as
+ intended.
+
+ This allows us to fully take in the wayland modifiers, including
+ depressed ones, which fixes an issue where we wouldn't be aware of
+ already pressed modifiers on enter.
+
+ Signed-off-by: Rui Matos <tiagomatos@gmail.com>
+ Tested-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit deae9c7e846e244e5d62b2dcfb6663fde0e12cbb
+Author: Eric Anholt <eric@anholt.net>
+Date: Wed Aug 31 17:00:00 2016 -0700
+
+ test: Run some XTS5 integration tests against Xvfb if possible.
+
+ By default the tests will be skipped. However, if you set XTEST_DIR
+ to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo
+ (no build necessary), make check will run piglit's xts-render tests
+ against Xvfb.
+
+ We could run more of XTS5, but I haven't spent the time identifying
+ what additional subset would be worth running, since much of it is
+ only really testing the client libraries. We want to make sure that
+ we keep the runtime down, and this subset of the test suite took 92
+ seconds according to piglit.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f06aef31c0b2ab62d915a469a399d82a1a73ac28
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Mon Aug 22 18:14:18 2016 +0800
+
+ modesetting: add DRI2 page flip support
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 4a839da6274b76424ee7cbc2deba2693e97e8186
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Mon Aug 22 18:14:17 2016 +0800
+
+ modesetting: move common page flip handle to pageflip.c
+
+ The common page flip handle framework can be shared with DRI2
+ page flip.
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 4f1eb7864b61d0c992c5eff3339085e887792048
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Mon Aug 22 18:14:16 2016 +0800
+
+ modesetting: move ms_do_pageflip to pageflip.c
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit a586bf9ccf60b2cc66953555e82eeb6a8e0b4ca9
+Author: Qiang Yu <Qiang.Yu@amd.com>
+Date: Mon Aug 22 18:14:15 2016 +0800
+
+ modesetting: make ms_do_pageflip generic for share with DRI2
+
+ Signed-off-by: Qiang Yu <Qiang.Yu@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 7d33ab0f8c7958b205076f71e4b47c24aace77fd
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 28 15:54:44 2016 -0400
+
+ dri2: Don't make reference to noClientException
+
+ noClientException is now never filled in with a meaningful value, it's
+ always -1. The sole caller of this function disregards the error value
+ in any case.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit dff435568b40286df2bf7a66e870f9ae5f4eb9bd
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 28 15:54:43 2016 -0400
+
+ dri3: Don't do return client->noClientException
+
+ Hasn't been necessary since:
+
+ commit 92ed75ac59e2d3af149cddb962efd05fc8487750
+ Author: Jamey Sharp <jamey@minilop.net>
+ Date: Mon May 10 20:22:05 2010 -0700
+
+ Eliminate boilerplate around client->noClientException.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 65493c0b73f6ee65b2a8fcaa4a15b0c453ff72b1
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 28 15:54:42 2016 -0400
+
+ sync: Don't do return client->noClientException
+
+ Hasn't been necessary since:
+
+ commit 92ed75ac59e2d3af149cddb962efd05fc8487750
+ Author: Jamey Sharp <jamey@minilop.net>
+ Date: Mon May 10 20:22:05 2010 -0700
+
+ Eliminate boilerplate around client->noClientException.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit bc3eed379ee5b4176db848708799fb2d5db16531
+Author: Hans De Goede <hdegoede@redhat.com>
+Date: Wed Aug 31 15:37:20 2016 +0200
+
+ modesetting: Hide cursor when initializing crtc
+
+ When Xorg gets started directly from a wayland-gdm the crtc still has the
+ wayland hw cursor set. Combine this with Xorg immediately falling back to
+ a sw cursor because a slave-output has a monitor attached at startup; and
+ we end up with the wayland hardware cursor overlay fixed in its last
+ position + the Xorg sw cursor resulting in 2 cursors.
+
+ This commit fixes this by hiding any left-over cursors when initializing
+ the crtc.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
+
+commit 6c984ac9a737304ab5e26de90c76a79d970b6e33
+Author: Hans De Goede <hdegoede@redhat.com>
+Date: Wed Aug 31 16:11:11 2016 +0200
+
+ modesetting: Do not use function local static variables
+
+ The modesetting driver may be driving 2 screens (slave and master
+ gpu), which may have different behavior wrt hardware cursor support.
+
+ So stop using static variables and instead store the hw-cursor support
+ related data in a per screen struct. While at it actually make it per
+ crtc data as in theory different crtc's could have different hw-cursor
+ support.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit d8c288ec371a853bcd023217f34893a0efae65ea
+Author: Michael Thayer <michael.thayer@oracle.com>
+Date: Wed Aug 24 08:48:13 2016 +1000
+
+ xi2: fix FocusIn grabs
+
+ Fix a couple of copy-and-paste errors preventing FocusIn grabs from working.
+ Perhaps the extension version should be bumped though to distinguish between
+ working and non-working extension versions.
+
+ Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 25e4f9ee68b99c2810efdb6cd8c56affa45e1fea
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Aug 23 13:43:42 2016 +1000
+
+ xfree86: print the module name together with the load failure message
+
+ We're happily printing the error to stdout but not which module caused it...
+ That's in the Xorg.log but that's at least one click away.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit be334f42a198a25e817e6dab43dd0e30aa1cd4f8
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Thu Aug 18 09:40:34 2016 +0900
+
+ glamor: Declare "pos" in the composite glyph GLSL 1.20 vertex shader
+
+ Fixes shader compile failure:
+
+ Failed to compile VS: 0:13(43): error: `pos' undeclared
+ 0:13(14): error: operands to arithmetic operators must be numeric
+ 0:13(13): error: operands to arithmetic operators must be numeric
+
+ Program source:
+ #define ATLAS_DIM_INV 0.000976562500000000
+ attribute vec2 primitive;
+ attribute vec2 source;
+ varying vec2 glyph_pos;
+ uniform vec2 fill_offset;
+ uniform vec2 fill_size_inv;
+ varying vec2 fill_pos;
+ uniform vec4 v_matrix;
+ void main() {
+ gl_Position.xy = primitive.xy * v_matrix.xz + v_matrix.yw;
+ gl_Position.zw = vec2(0.0,1.0);
+ glyph_pos = source.xy * ATLAS_DIM_INV;
+ fill_pos = (fill_offset + primitive.xy + pos) * fill_size_inv;
+ }
+ (EE) Fatal server error:
+ (EE) GLSL compile failure
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97300
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit cba28d572ac799391beacd89d57e69d0d7ed70e7
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Jul 12 12:25:13 2016 +0900
+
+ glamor: Handle bitplane in glamor_copy_fbo_cpu
+
+ This can significantly speed up at least some CopyPlane cases, e.g.
+ indirectly for stippled fills.
+
+ v2:
+ * Make temporary pixmap the same size as the destination pixmap
+ (instead of the destination drawable size), and fix coordinate
+ parameters passed to fbCopyXtoX and glamor_upload_boxes. Fixes
+ incorrect rendering with x11perf -copyplane* and crashes with the
+ xscreensaver phosphor hack.
+ v3:
+ * Make the change a bit more compact and hopefully more readable by
+ re-using the existing src_* locals in the bitplane case as well.
+
+ Reported-by: Keith Raghubar <keith.raghubar@amd.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Acked-by: Eric Anholt <eric@anholt.net>
+
+commit 6e5bec261c3f7af069b57618d6c82b070dc4579d
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu Jun 23 15:31:30 2016 +0200
+
+ wayland: Emulate crossing for native window
+
+ Emitting a LeaveNotify event every time the pointer leaves an X11 window
+ may confuse focus follow mouse mode in window managers such as
+ mutter/gnome-shell.
+
+ Keep the previously found X window and compare against the new one, and
+ if they match then it means the pointer has left an Xwayland window for
+ a native Wayland surface, only in this case fake the crossing to the
+ root window.
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 48c5c23a1b250c7f9d7a1747c76e4669ebf752cf
+Author: Hans De Goede <hdegoede@redhat.com>
+Date: Mon Aug 8 14:53:59 2016 +0200
+
+ Fix Xorg -configure not working anymore
+
+ Xorg -configure relies on the bus implementation, e.g.
+ xf86pciBus.c to call xf86AddBusDeviceToConfigure(). The new
+ xf86platformBus code does not have support for this.
+
+ Almost all drivers support both the xf86platformBus and xf86pciBus
+ nowadays, and the generic xf86Bus xf86CallDriverProbe() function
+ prefers the new xf86platformBus probe method when available.
+
+ Since the platformBus paths do not call xf86AddBusDeviceToConfigure()
+ this results in Xorg -configure failing with the following error:
+ "No devices to configure. Configuration failed.".
+
+ Adding support for the xf86Configure code to xf86platformBus.c
+ is non trivial and since we advise users to normally run without
+ any Xorg.conf at all not worth the trouble.
+
+ However some users still want to use Xorg -configure to generate a
+ template config file, this commit implements a minimal fix to make
+ things work again for PCI devices by skipping the platform
+ probe method when xf86DoConfigure is set.
+
+ This has been tested on a system with integrated intel graphics,
+ with both the intel and modesetting drivers and restores Xorg -configure
+ functionality on both cases.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 6acd0d098add5a14f23d326ac6ee8cebab14b86a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Aug 17 10:32:28 2016 -0400
+
+ test: Remember to swap the window argument to XIQueryPointer
+
+ Before 5c69cb60 this wouldn't matter, because ProcXIQueryPointer
+ manually emitted its own error before (bogusly) returning Success to the
+ main loop. Since these tests only look at the return value of the
+ dispatch function we'd think things succeeded even when we'd generated
+ an error.
+
+ With that fixed, the test code's failure to swap the window id would
+ make dixLookupWindow (rightly) throw BadWindow.
+
+ Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 5c69cb604a144bdced7d066eaca574aa44e8cb36
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 20 12:57:12 2016 -0400
+
+ xinput: Let top-level dispatch generate the error
+
+ ... instead of calling SendErrorToClient ourselves.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit 2f981c06a5b9b9eab5e8a9b1d0a18281c0d1033f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 20 12:57:11 2016 -0400
+
+ xv: Remove some dumb calls SendErrorToClient
+
+ We already generate errors from the top level when non-Success is
+ returned from a dispatch function, so really we were emitting errors
+ twice.
Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit 0bfa6bf9def43fd14bc79a302b912454e82999b1
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 20 12:57:10 2016 -0400
+
+ xwayland: Fix relinking when dix changes
+
+ Without this a change in eg Xext/ wouldn't relink Xwayland, making you
+ wonder why your changes didn't have any effect.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit bf2ca502b9cd07044cba56499d5c092deb9d73f5
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Aug 15 22:25:56 2016 -0700
+
+ config: Hold input lock across udev socket handling
+
+ This avoids having the server running inside libudev from two threads
+ at once, which it appears to not like.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit de5291c04b05772e6da599a475baa1b19dcae07a
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Mon Aug 8 17:25:35 2016 +0200
+
+ present: Free the fake_present OsTimerPtr
+
+ Plug a leak in present_fake_queue_vblank() where the OsTimer would not
+ be freed.
+
+ 492,608 (482,816 direct, 9,792 indirect) bytes in 15,088 blocks
+ are definitely lost in loss record 3,954 of 3,954
+ at 0x4C2ABDE: malloc (in vgpreload_memcheck-amd64-linux.so)
+ by 0x586B19: TimerSet (WaitFor.c:433)
+ by 0x4F1AA9: present_fake_queue_vblank (present_fake.c:108)
+ by 0x4F15E0: present_pixmap (present.c:954)
+ by 0x4F23B4: proc_present_pixmap (present_request.c:138)
+ by 0x552BCE: Dispatch (dispatch.c:430)
+ by 0x556C22: dix_main (main.c:300)
+ by 0x6F0D290: (below main) (in /usr/lib/libc-2.24.so)
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97065
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit d21b53673b9de052004e761fd1299d2e788b44b8
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Aug 3 10:19:20 2016 +0900
+
+ present: Call set_abort_flip / restore_screen_pixmap in clear_window_flip
+
+ We were asserting that these were called before from other places, but
+ that isn't always the case, e.g. during server shutdown.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96951
+ Reported-and-Tested-by: Tod Jackson <tod.jackson@gmail.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit adefbaee499b9679c6cac21f52ec6545af2b36b5)
-commit aebfc6ad9be5bd33b7e0a813d424c81d6214ab07
+commit 9f04fa3babaaabe0ed5bf4aa2563755bc6c45723
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Aug 3 10:19:19 2016 +0900
+
+ present: Make present_restore_screen_pixmap handle screen->root == NULL
+
+ Easier than dealing with it in all paths that can end up here during
+ server shutdown.
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 4cbf1fb1f978ecd975770cebbb330dc10f712b77
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Mon Aug 8 17:57:57 2016 +0200
+
+ xwayland: Avoid double free of RRCrtc and RROutput
+
+ At shutdown, the Xserver will free all its resources which includes the
+ RRCrtc and RROutput created.
+
+ Xwayland would do the same in its xwl_output_destroy() called from
+ xwl_close_screen(), leading to a double free of existing RRCrtc
+ RROutput:
+
+ Invalid read of size 4
+ at 0x4CDA10: RRCrtcDestroy (rrcrtc.c:689)
+ by 0x426E75: xwl_output_destroy (xwayland-output.c:301)
+ by 0x424144: xwl_close_screen (xwayland.c:117)
+ by 0x460E17: CursorCloseScreen (cursor.c:187)
+ by 0x4EB5A3: AnimCurCloseScreen (animcur.c:106)
+ by 0x4EF431: present_close_screen (present_screen.c:64)
+ by 0x556D40: dix_main (main.c:354)
+ by 0x6F0D290: (below main) (in /usr/lib/libc-2.24.so)
+ Address 0xbb1fc30 is 0 bytes inside a block of size 728 free'd
+ at 0x4C2BDB0: free (in
+ /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ by 0x4CCE5F: RRCrtcDestroyResource (rrcrtc.c:719)
+ by 0x577541: doFreeResource (resource.c:895)
+ by 0x5787B5: FreeClientResources (resource.c:1161)
+ by 0x578862: FreeAllResources (resource.c:1176)
+ by 0x556C54: dix_main (main.c:323)
+ by 0x6F0D290: (below main) (in /usr/lib/libc-2.24.so)
+ Block was alloc'd at
+ at 0x4C2CA6A: calloc (in
+ /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
+ by 0x4CC6DB: RRCrtcCreate (rrcrtc.c:76)
+ by 0x426D1C: xwl_output_create (xwayland-output.c:264)
+ by 0x4232EC: registry_global (xwayland.c:431)
+ by 0x76CB1C7: ffi_call_unix64 (in /usr/lib/libffi.so.6.0.4)
+ by 0x76CAC29: ffi_call (in /usr/lib/libffi.so.6.0.4)
+ by 0x556CEFD: wl_closure_invoke (connection.c:935)
+ by 0x5569CBF: dispatch_event.isra.4 (wayland-client.c:1310)
+ by 0x556AF13: dispatch_queue (wayland-client.c:1456)
+ by 0x556AF13: wl_display_dispatch_queue_pending
+ (wayland-client.c:1698)
+ by 0x556B33A: wl_display_roundtrip_queue (wayland-client.c:1121)
+ by 0x42371C: xwl_screen_init (xwayland.c:631)
+ by 0x552F60: AddScreen (dispatch.c:3864)
+
+ And:
+
+ Invalid read of size 4
+ at 0x522890: RROutputDestroy (rroutput.c:348)
+ by 0x42684E: xwl_output_destroy (xwayland-output.c:302)
+ by 0x423CF4: xwl_close_screen (xwayland.c:118)
+ by 0x4B6377: CursorCloseScreen (cursor.c:187)
+ by 0x539503: AnimCurCloseScreen (animcur.c:106)
+ by 0x53D081: present_close_screen (present_screen.c:64)
+ by 0x43DBF0: dix_main (main.c:354)
+ by 0x7068730: (below main) (libc-start.c:289)
+ Address 0xc403190 is 0 bytes inside a block of size 154 free'd
+ at 0x4C2CD5A: free (vg_replace_malloc.c:530)
+ by 0x521DF3: RROutputDestroyResource (rroutput.c:389)
+ by 0x45DA61: doFreeResource (resource.c:895)
+ by 0x45ECFD: FreeClientResources (resource.c:1161)
+ by 0x45EDC2: FreeAllResources (resource.c:1176)
+ by 0x43DB04: dix_main (main.c:323)
+ by 0x7068730: (below main) (libc-start.c:289)
+ Block was alloc'd at
+ at 0x4C2BBAD: malloc (vg_replace_malloc.c:299)
+ by 0x52206B: RROutputCreate (rroutput.c:84)
+ by 0x426763: xwl_output_create (xwayland-output.c:270)
+ by 0x422EDC: registry_global (xwayland.c:432)
+ by 0x740FC57: ffi_call_unix64 (unix64.S:76)
+ by 0x740F6B9: ffi_call (ffi64.c:525)
+ by 0x5495A9D: wl_closure_invoke (connection.c:949)
+ by 0x549283F: dispatch_event.isra.4 (wayland-client.c:1274)
+ by 0x5493A13: dispatch_queue (wayland-client.c:1420)
+ by 0x5493A13: wl_display_dispatch_queue_pending
+ (wayland-client.c:1662)
+ by 0x5493D2E: wl_display_roundtrip_queue (wayland-client.c:1085)
+ by 0x4232EC: xwl_screen_init (xwayland.c:632)
+ by 0x439F50: AddScreen (dispatch.c:3864)
+
+ Split xwl_output_destroy() into xwl_output_destroy() which frees the
+ wl_output and the xwl_output structure, and xwl_output_remove() which
+ does the RRCrtcDestroy() and RROutputDestroy() and call the latter only
+ when an output is effectively removed.
+
+ An additional benefit, on top of avoiding a double free, is to avoid
+ updating the screen size at shutdown.
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit b380f3ac51f40ffefcde7d3db5c4c149f274246d
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Aug 2 17:53:01 2016 +0900
+
+ dix: Pass ClientPtr to FlushCallback
+
+ This change has two effects:
+
+ 1. Only calls FlushCallbacks when we're actually flushing data to a
+ client. The unnecessary FlushCallback calls could cause significant
+ performance degradation with compositing, which is significantly
+ reduced even without any driver changes.
+
+ 2. By passing the ClientPtr to FlushCallbacks, drivers can completely
+ eliminate unnecessary flushing of GPU commands by keeping track of
+ whether we're flushing any XDamageNotify events to the client for
+ which the corresponding rendering commands haven't been flushed to
+ the GPU yet.
+
+ Reviewed-by: Adam Jackson <ajax@redha.com>
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 92b3cd32066aa5befa67a408cc079cd2ce4c077e
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Tue Aug 2 10:34:07 2016 -0700
+
+ xace: Fix XaceCensorImage to actually censor the right part of the image
+
+ The caller passes arguments into XaceCensorImage that are in
+ window-relative coordinates. However, the pBuf that it uses to construct
+ a temporary pixmap has its origin at (x, y) relative to the window in
+ question. The code to convert the censor region into boxes adjusts for
+ the Y coordinate, but leaves the X coordinate alone. The result is that
+ if x is not zero, it censors the wrong part of the image.
+
+ Fix this by just translating censorRegion into pixmap-relative
+ coordinates and using the resulting boxes as-is.
+
+ Reported-by: Fabien Lelaquais <Fabien.Lelaquais@roguewave.com>
+ Link: https://lists.x.org/archives/xorg/2016-August/058165.html
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit 4d586118c113f3c0a6e95ed2d3fc7f9d03a4e362
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Aug 2 11:24:41 2016 +0200
+
+ xwayland: Plug memleak in frame callbacks
+
+ The frame callback set up via wl_surface_frame() needs to be freed with
+ wl_callback_destroy() or we'll leak memory.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97065
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit 611b3b1d40f58035582480a3d7cfa77cb288cbc6
+Author: Matthieu Herrb <matthieu@herrb.eu>
+Date: Sun Jul 31 12:13:03 2016 +0200
+
+ Autoconfig: Fix the loop adding dectected drivers to the list of screens
+
+ This loop was written in a buggy style, causing a NULL driver ptr to be
+ passed to copyScreen(). copyScreen() only uses that to generate an
+ identifier string, so this is mostly harmless on systems that accept
+ NULL for asprintf() "%s" format. (the generated identifiers are off
+ by one wrt the driver names and the last one contains NULL.
+
+ For systems that don't accept NULL for '%s' this would cause a
+ segmentation fault when this code is used (no xorg.conf, but partial
+ config in xorg.conf.d for instance).
+
+ Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 88820f1c7b66cbc98d3f19efca24c9f52410d9f9
+Author: Emily Deng <Emily.Deng@amd.com>
+Date: Mon Jul 25 16:12:53 2016 +0800
+
+ xfree86: vgaarb: Initialize local variable rsrc_decodes
+
+ In function xf86VGAarbiterScrnInit when the "pEnt->bus.type" is
+ BUS_PLATFORM, the "pScrn->vgaDev" won't be set, so the "pScrn->vgaDev" is
+ equal to zero.
+
+ The variable "rsrc_decodes" in function "xf86VGAarbiterAllowDRI" is not
+ initialized. So it will occur error when "pScrn->vgaDev == 0", and
+ "vga_count > 1". For this case, as "pScrn->vgaDev == 0", the function
+ "pci_device_vgaarb_get_info" will only set the value of "vga_count",
+ but won't set the value of "rsrc_decodes", so it will has two different
+ return values for function "xf86VGAarbiterAllowDRI" in different
+ platforms. One platform will return TRUE, as the "rsrc_decodes" 's
+ default value is 0, but another platform will return FALSE, as the
+ "rsrc_decodes" 's default value is "32767", this will cause disable
+ direct rendering.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96937
+
+ Signed-off-by: Emily Deng <Emily.Deng@amd.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit fa2bc06407665ee074f5914d0f83d4114b20fc8e
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 12 17:40:55 2016 -0700
+
+ dix: Avoid writing uninitialized bytes in deliverPropertyNotifyEvent
+
+ Make sure the whole event is initialized, instead of leaving the pad
+ bytes unset.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 67fc5d68f967d19236221b2c0c2e0fe45acf560f
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Aug 13 09:02:15 2016 -0700
+
+ os: Abandon loop after poll call when array of fds has changed
+
+ If a file descriptor is added or removed from an ospoll callback, then
+ the arrays containing file descriptor information will have all of
+ their indices changed, so the loop state is no longer consistent. Just
+ bail out and let the caller come back around to try again.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7d6fffb6013cfc718d884cc549d7a8fef37240cf
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Aug 12 15:23:55 2016 -0700
+
+ os: Delay freeing of epoll_wait return pointers until epoll is idle.
+
+ Instead of freeing the struct ospollfd elements when the fd is
+ removed by the user, delay that until epoll is idle so that we are
+ sure no epoll_event structures could contain the stale pointer. This
+ handles cases where an fd is removed from the ospoll callback
+ interface, and also in case the OS keeps stale pointers around after
+ the call to epoll_ctl with EPOLL_CTL_DEL.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 69b782aa75bc06f11b8f9b532d5213f252c4c6c4
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jul 29 17:45:45 2016 -0700
+
+ xfree86: Set pScrn->pScreen before driver ScreenInit is called
+
+ Any code called from the driver ScreenInit may want to refer to
+ pScrn->pScreen. As the function passed to AddScreen is the first place
+ the DDX sees a new screen, the generic code needs to make sure that
+ value is set before passing control to the video driver's
+ initialization code.
+
+ This was found by running a driver which didn't bother to set this
+ value when the initial colormap was installed; xf86RandR12LoadPalette
+ tried to use pScrn->pScreen and crashed.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97124
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 387d6b5df3e11de5cb88db8a559128fcb62e4e5a
+Merge: d2558f063a 8bb9d460fb
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Aug 13 09:12:19 2016 -0700
+
+ Merge remote-tracking branch 'daenzer/for-master'
+
+commit d2558f063a034a827247b66b4c5adbffe79dc0e7
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 11 17:28:38 2016 -0700
+
+ Build glamor when Xorg or Xephyr are built.
+
+ Requires gbm when building Xorg so that xf86-video-modesetting will
+ work.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 2b9f8ae98602d2abda7c363900f39a5bd3768a4c
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 11 21:32:59 2016 -0700
+
+ mi: Remove spurious call to OsReleaseSignals from mieqGrowQueue
+
+ This call wasn't converted to 'input_unlock()' when the SIGIO code was
+ removed from the server, and so when the queue growing was reworked to
+ be done from the input thread, it got left sitting here. As the caller
+ now manages the lock, we don't need to switch this to input_unlock at
+ this point.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f399919e13c994452f7219163b2a4b1fa015242e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 12 13:59:56 2016 +1000
+
+ xfree86: lock input during PreInit
+
+ This is a problem for the libinput driver that uses the same context across
+ multiple devices. The driver may be halfway through setting up an input device
+ (and the only way to do so is to add it to libinput) when the input thread
+ comes in an reads events. This then causes mayhem when data is dereferenced
+ that hasn't been set up yet.
+
+ In my case the cause was the call to libinput_path_remove_device() inside
+ preinit racing with evdev_dispatch_device() handling of ENODEV. The sequence
+ was:
+ - thread 2 gets an event and calls evdev_dispatch_device()
+ - thread 1 calls libinput_path_remove_device() which sets the device->source
+ to NULL
+ - thread 2 reads from the fd, gets ENODEV and now removes the device->source,
+ dereferencing the null-pointer
+
+ This is the one I could reproduce the most, but there are other potential
+ pitfalls that affect any driver that uses the same fd for multiple devices.
+ Avoid all this and wrap PreInit into the lock.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit dd4e21cb3a6e692e834ec34bec42944202b3e085
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Aug 12 12:06:18 2016 +1000
+
+ xfree86: fix unbalanced input_lock/unlock in xf86NewInputDevice()
+
+ If a device couldn't be enabled we left the lock hanging.
+
+ This patch also removes the leftover OsReleaseSignals() call, now unnecessary.
+ Note that input_unlock() is later than previously OsReleaseSignals().
+ RemoveDevice() manipulates the input device and its file descriptors, it's
+ safer to put the input_unlock() call after RemoveDevice() to avoid events
+ coming in while the device is being removed.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit bf31d6f43e5ce04891a96b226a975379e2e2ba71
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 11 12:34:54 2016 -0700
+
+ os: Allow re-registering fd with InputThreadRegisterDev
+
+ Calling InputThreadRegisterDev twice with the same fd should replace
+ the existing function and args instead of creating a new entry with
+ the same fd.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 2df2815d6ae0c2ffb9e0a084d61ee3585f5116df
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Aug 9 17:35:58 2016 +1000
+
+ os: append, rather than prepend, any new input thread fds
+
+ xf86AddEnabledDevice() prepends the new fd to the list,
+ xf86RemoveEnabledDevice() then searches for a matching fd and removes that
+ entry. If this is done for the same fd (and since we lose all information but
+ the actual fd) we usually unregister virtual devices in reverse order, causing
+ a dereference of already released memory.
+
+ Case in point:
+ - the wacom driver calls xf86AddEnabledDevice() once for the physical device,
+ then multiple times for the virtual subdevices
+ - when the physical device is unplugged, the driver calls
+ xf86RemoveEnabledDevice() for the physical device
+ - all we have is the fd, so we end up removing the last virtual device from
+ the fd set
+ - xf86DeleteInput() frees the physical device's pInfo
+ - the fd goes crazy with ENODEV, but a read_input() now passes the already
+ freed pInfo for the physical device
+ - boom
+
+ Fix this by appending to the fd list to provide bug-for-bug compatibility with
+ the old SIGIO code. This needs to be fixed in the driver, but meanwhile not
+ crashing the server provides for better user experience.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit a446ff84de2dd29439521f6e87d75bde3bbf002c
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Jul 29 17:38:21 2016 +0900
+
+ xfree86/modes: Handle no palette case better in xf86RandR12CrtcSetGamma
+
+ Just use the RandR gamma ramp directly.
+
+ Fixes random on-monitor colours with drivers which don't call
+ xf86HandleColormaps, e.g. modesetting.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97154
+
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit d3d4ff0ed4d4679b7983b1a3ea267ff945f7643c
+Author: Kenneth Graunke <kenneth@whitecape.org>
+Date: Thu Jul 28 07:28:51 2016 -0700
+
+ modesetting: Delete dead drmmode_bo_for_pixmap function.
+
+ Embarassingly, it looks like I introduced this dead function in
+ commit 13c7d53df8dac45ea2a685826cd45a39bcb51657 a year ago.
+ Nothing ever used it, not even then.
+
+ Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 8bb9d460fbc82ee5d6f87e1d11cfa52f4f3072ee
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Jul 29 17:38:21 2016 +0900
+
+ xfree86/modes: Handle no palette case better in xf86RandR12CrtcSetGamma
+
+ Just use the RandR gamma ramp directly.
+
+ Fixes random on-monitor colours with drivers which don't call
+ xf86HandleColormaps, e.g. modesetting.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97154
+
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit c833c0866f2f8f829185667efe3d6dfa5979a9e8
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Jul 29 18:41:06 2016 +0900
+
+ present: Handle event mask updates as specified v2
+
+ From the Present extension specification:
+
+ An event context is associated with a specific window; using
+ an existing event context with a different window generates
+ a Match error.
+
+ If eventContext specifies an existing event context, then if
+ eventMask is empty, PresentSelectInput deletes the specified
+ context, otherwise the specified event context is changed to
+ select a different set of events.
+
+ If eventContext is an unused XID, then if eventMask is empty
+ no operation is performed. Otherwise, a new event context is
+ created selecting the specified events.
+
+ Without this change, there's no way for a client to explicitly change
+ or destroy an existing event mask entry. Trying to do so as specified
+ above would just result in a protocol error.
+
+ v2: (Keith Packard)
+ * Use dixLookupResourceByType instead of walking window_priv->events
+ * Return BadMatch if the existing event context is associated with a
+ different window or client
+ * Call LEGAL_NEW_RESOURCE again when creating a new event context
+ * Drop invalid "leak fix"
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
+
+commit 0924ac014d7caadab0b15ba69cd0a09cfe8a01da
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Jul 26 17:28:33 2016 +0900
+
+ present: Only call restore_screen_pixmap once from set_abort_flip
+
+ present_restore_screen_pixmap's work doesn't need to be done several
+ times for the same pending flip.
+
+ Fixes a crash if the X server quits while a flip is pending, in which
+ case present_set_abort_flip may be called several times, including when
+ screen->root is already cleared to NULL.
+
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit b4e46c0444bb09f4af59d9d13acc939a0fbbc6d6
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Sat Nov 28 16:50:47 2015 +0900
+
+ xfree86: Hook up colormaps and RandR 1.2 gamma code v6
+
+ Instead of breaking the former when the driver supports the latter,
+ hook them up so that the hardware LUTs reflect the combination of the
+ current colourmap and gamma states. I.e. combine the colourmap, the
+ global gamma value/ramp and the RandR 1.2 per-CRTC gamma ramps into one
+ combined LUT per CRTC.
+
+ Fixes e.g. gamma sliders not working in games.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27222
+
+ v2:
+ * Initialize palette_size and palette struct members, fixes crash on
+ server startup.
+ v3:
+ * Free randrp->palette in xf86RandR12CloseScreen, fixes memory leak.
+ v4:
+ * Call CMapUnwrapScreen if xf86RandR12InitGamma fails (Emil Velikov).
+ * Still allow xf86HandleColormaps to be called with a NULL loadPalette
+ parameter in the xf86_crtc_supports_gamma case.
+ v5:
+ * Clean up inner loops in xf86RandR12CrtcComputeGamma (Keith Packard)
+ * Move palette update out of per-CRTC loop in xf86RandR12LoadPalette
+ (Keith Packard)
+ v6:
+ * Handle reallocarray failure in xf86RandR12LoadPalette (Keith Packard)
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 17213b74fd7fc4c4e2fe7a3781e7422dd482a0ab
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Jun 21 16:44:20 2016 +0900
+
+ xfree86/modes: Remove xf86RandR12CrtcGetGamma
+
+ This would normally return the same values the core RandR code passed to
+ xf86RandR12CrtcSetGamma before, which is rather pointless. The only
+ possible exception would be if a driver tried initializing
+ crtc->gamma_red/green/blue to reflect the hardware LUT state on startup,
+ but that can't work correctly if whatever set the LUT before the server
+ started was running at a different depth.
+
+ Even the pointless round-trip case will no longer work with the
+ following change.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 62f44052573b475a7b4c24f8e2da9bd6a8f1bd70
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Jun 21 15:41:45 2016 +0900
+
+ xfree86/modes: Move gamma initialization to xf86RandR12Init12 v2
+
+ RRCrtcGammaSetSize cannot be used yet in xf86InitialConfiguration,
+ because randr_crtc isn't allocated yet at that point, but a following
+ change will require RRCrtcGammaSetSize to be called from
+ xf86RandR12CrtcInitGamma.
+
+ v2:
+ * Bail from xf86RandR12CrtcInitGamma if !crtc->funcs->gamma_set (Keith
+ Packard)
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 0b2f30834b1a9f4a03542e25c5f54ae800df57e2
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 17:47:29 2016 -0700
+
+ os: Clean up WaitFor.c
+
+ Do all timer stuff before blocking, avoiding a bunch of duplicate code
+ and merge common code in WaitForSomething.
+
+ The WaitForSomething changes need a bit of explanation to show that
+ the new code is effectively equivalent to the old. Eliding error
+ checking and trivial bits we've got:
+
+ Before:
+
+ if (ready clients)
+ timeout = 0
+ else
+ compute timeout
+ i = poll
+ if (i <= 0) {
+ if (ready clients)
+ return TRUE;
+ if (input)
+ return FALSE;
+ if (any ready timers) {
+ run timers
+ return FALSE;
+ }
+ } else {
+ if (input)
+ return FALSE;
+ if (any ready timers) {
+ run timers
+ return FALSE;
+ }
+ if (ready clients)
+ return TRUE;
+ }
+
+ After:
+
+ if (ready clients)
+ timeout = 0;
+ else
+ compute timeout
+ run_timers
+ poll
+
+ if (input)
+ return FALSE;
+
+ if (ready clients)
+ return TRUE;
+
+ The old code would return TRUE if there were ready clients and input
+ pending. Dispatch would then schedule that ready client, but before
+ processing any requests, it would notice that there was input pending
+ and go process it. The new code just checks for input first, which is
+ effectively the same.
+
+ If the poll timed out and there weren't clients ready, then timers
+ would get run.
+
+ If the poll didn't time out, then timers would get run, even if there
+ were clients now ready. Now, if the timeout interval was zero, that
+ means that the timers must have been ready *before* poll was
+ invoked. In this case, we should simply run the timers before calling
+ poll -- no sense calling poll just to discard any data that it
+ generates.
+
+ If the timeout interval was non-zero, and poll didn't timeout, then
+ either there aren't any timers to run, or we got a surprise and hit a
+ timer exactly as a client became ready to run. This is the one case
+ where the new code is different from the old; the new code delays the
+ timer call until the next time WaitForSomething is called.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 2ab8b1dcd37900e5e2f11007d7c0cd0545209482
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 19:48:25 2016 -0700
+
+ os: Use xorg_list for struct _OsTimerRec
+
+ No sense having an open-coded linked list here, plus the doubly linked
+ list is more efficient
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 50779c494d4682103b96db440021e56e44311b6b
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 12:45:53 2016 -0700
+
+ os: Remove CheckConnections
+
+ poll provides per-fd notification of failure, so we don't need
+ CheckConnections anymore.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f0275b1e5a4787da1f4d5507165315a000c22b33
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 26 00:19:55 2016 -0700
+
+ os: Leave stdin and stdout open
+
+ There's no reason to close these now that we don't care what file
+ descriptors we use.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 8217c29d2d8b29bd66bc54fee3fe5cb3385a05c7
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 25 23:43:49 2016 -0700
+
+ Allow 1024 and 2048 for LimitClients
+
+ There's no reason not to offer ridiculous numbers of clients; only a
+ few static data structures are arrays of this length.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit e0edb963fe09582f23a4b55da4f8840173e7a1ee
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 24 21:04:14 2016 -0700
+
+ os: eliminate fd value limits for clients
+
+ With no code depending on the range of file descriptors, checking
+ for that can be eliminated.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 30bc0732f959bbc63f318c06d48de080d495da32
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 24 21:12:33 2016 -0700
+
+ os: Use ospoll for input thread [v2]
+
+ Replace use of select(2) to avoid fd limits. Note that
+ InputThreadFillPipe used select as well, but none of the files passed
+ were non-blocking, so there was no need for that code at all.
+
+ v2: Keep ospoll API usage single threaded to avoid re-entrancy issues
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f993091e7db81b0420e23c485378cba112278839
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 26 10:40:44 2016 -0700
+
+ os: Switch server to poll(2) [v3]
+
+ Eliminates all of the fd_set mangling in the server main thread
+
+ v2: Listen for POLLOUT while writes are blocked.
+
+ v3: Only mark client not ready on EAGAIN return from read
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 8f1edf4bd3a1f050ce9eeb5eac45dd1a8f7a6d5e
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 19 13:59:54 2016 -0700
+
+ dix: Use list for ready clients
+
+ This converts the dispatch loop into using a list of ready clients
+ instead of an array. This changes the WaitForSomething API so that it
+ notifies DIX when a client becomes ready to read, instead of returning
+ the set of ready clients.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit d6eff3c31e8289881a3aa9b858e5710d0f741db0
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 26 10:20:45 2016 -0700
+
+ os: Add ospoll interface [v2]
+
+ This provides a wrapper around poll or epoll providing a
+ callback-based interface for monitoring activity on a large set of
+ file descriptors.
+
+ v2: use xserver_poll API instead of poll. Don't use WSAPoll as
+ that is broken.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit d403aca70a07e1401cb93738f1af5961582a2e47
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Jul 18 15:58:42 2016 -0700
+
+ Switch poll() users to xserver_poll()
+
+ This uses the wrapper in case we need to emulate poll with select
+ as we do on Windows.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 711c36558f50943c8342f25ad210281134887a3d
+Author: Brian M. Clapper <bmc@clapper.org>
+Date: Mon Jul 11 18:30:05 2016 -0400
+
+ os: Add poll emulation for mingw [v2]
+
+ v2: rename as 'xserver_poll' to avoid potential library name
+ collisions. Provide 'xserver_poll.h' which uses the system
+ poll where available and falls back to this emulation otherwise.
+ Autodetects when this is required, building the emulation only
+ then
+
+ Source: https://github.com/bmc/poll
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2a79be9e4dd1b6ba00b69ff40bc5257ec84d34da
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Jul 19 13:35:37 2016 +0100
+
+ hw/xwin: Update BlockHandler function signature
+
+ Update for removal of fdset from Block/Wakeup handler API in 9d15912a
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 60a91031d13e4d29c383087120e318f6b528b6e5
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Jul 19 13:35:36 2016 +0100
+
+ hw/xwin: Update for removal of AddEnabledDevice
+
+ Update for removal of AddEnabledDevice in be5a513f. Use SetNotifyFd instead.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 7f2d690725292e7b5a44c813c9456da426256873
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Jun 27 10:17:14 2016 +1000
+
+ xfree86: if ATTR_KEYBOARD is set, match for keyboards
+
+ ATTR_KEY maps to ID_INPUT_KEY which is set for any device with keys.
+ ID_INPUT_KEYBOARD and thus ATTR_KEYBOARD is set for devices that are actual
+ keyboards (and have a set of expected keys).
+
+ Hand-written match rules may only apply ID_INPUT_KEYBOARD, so make sure we
+ match on that too.
+
+ Arguably we should've been matching on ATTR_KEYBOARD only all along but
+ changing that likely introduces regressions.
+
+ Reported-by: Marty Plummer <netz.kernel@gmail.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4b311d23e84356bd0e9e736aeed7448dd6382118
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jul 18 12:46:51 2016 -0400
+
+ modesetting: resubmit dirty rects on EINVAL (v2)
+
+ This error code can mean we're submitting more rects at once than the
+ driver can handle. If that happens, resubmit one at a time.
+
+ v2: Make the rect submit loop more error-proof (Walter Harms)
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Michael Thayer <michael.thayer@oracle.com>
+
+commit 8d3a368d8980e37e7e8c57065dc901ce809887c6
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jun 1 22:47:29 2016 -0700
+
+ os: InputThreadFillPipe doesn't need select or poll
+
+ The file descriptors passed to InputThreadFillPipe are always
+ blocking, so there's no need to use Select (or poll).
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit ef7ddbe242ed4c461f816663fb88646e41f1c21b
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Jun 1 22:35:09 2016 -0700
+
+ os: Move ETEST macro from io.c to osdep.h
+
+ This lets other code share this functionality
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 0d294462a5af08ada654c588fad921ed7a22749b
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 15:06:36 2016 -0700
+
+ os: Add X_NOTIFY_ERROR value
+
+ This provides a way to report errors on file descriptors that is
+ better defined than "any bits which are not READ or WRITE".
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit e6636b438322a9a2f2270ad9d60bf3dfc72be0b3
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 26 10:30:56 2016 -0700
+
+ os: Compute timeout in milliseconds instead of struct timeval
+
+ The timeout resolution offered in the AdjustWaitForDelay call is
+ only milliseconds, so passing around the timeout as a pointer to a
+ struct timeval is not helpful. Doing everything in milliseconds up to
+ the point of the select call simplifies the code without affecting
+ functionality at all.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit a414db021575accff64abad6f1047245e81c7476
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 19 15:08:05 2016 -0700
+
+ dix: Intermediate GrabServer state 'GrabKickout' not needed
+
+ The intermediate grabState, "GrabKickout", was used to trigger
+ dispatch into going back to WaitForSomething after doing a GrabServer
+ so that the set of ready clients would be recomputed to match what the
+ server should be processing. As we only process one client per
+ WaitForSomething call, we will always hit WaitForSomething after
+ finishing the current client, and so don't need any special case here.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 7762a602c1dfdd8cfcf2b8c2281cf4d683d05216
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 19 15:05:55 2016 -0700
+
+ dix/os: Merge priority computation into SmartScheduleClient
+
+ Instead of having scheduling done in two places (one in
+ WaitForSomething, and the other in SmartScheduleClient), just stick
+ all of the scheduling in SmartScheduleClient.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 4af00242ef1e39499b932d12423fdf449296090a
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon May 30 01:49:46 2016 -0700
+
+ Bump ABI versions to reflect block/wakeup handler API changes
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit be5a513fee6cbf29ef7570e57eb0436d70fbd88c
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Dec 7 15:12:14 2015 -0800
+
+ Remove AddEnabledDevice and AddGeneralSocket APIs
+
+ All uses of these interfaces should instead be using the NotifyFd API
+ instead.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 9d15912aa475b733bbb20efc367a67dacad63bf1
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Sep 1 18:51:14 2015 -0700
+
+ Remove fd_set from Block/Wakeup handler API
+
+ This removes the last uses of fd_set from the server interfaces
+ outside of the OS layer itself.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit fb0802113b4c57819cba15d64baf79bf4148607e
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Sep 1 11:20:04 2015 -0700
+
+ Remove readmask from screen block/wakeup handler
+
+ With no users of the interface needing the readmask anymore, we can
+ remove it from the argument passed to these functions.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 410bc047480a9f98df678dc850bc6b99c3cfb5bf
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Dec 7 15:03:10 2015 -0800
+
+ dmx: Eliminate use of AddEnabledDevice [v2]
+
+ Use SetNotifyFd instead, with the hope that someday someone will come
+ fix this to be more efficient -- right now, the wakeup handler is
+ doing the event reading, instead of the notify callback.
+
+ v2: no need to patch dmxsigio.c as it has been removed.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6299ef3d749d6f978d3d38d42f711ac56bf382eb
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 27 11:49:35 2015 -0700
+
+ modesetting: Use passed-in fd for drm event monitoring NotifyFd callback
+
+ This is a cleanup, proposed by Adam Jackson, but wasn't merged with
+ the original NotifyFD changes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 6bf7b49f6711c7ed1837283dc04f93f4c1b77ecc
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Aug 27 11:47:26 2015 -0700
+
+ hw/kdrive: Use passed-in fd for kdrive/linux APM monitoring [v2]
+
+ This is a cleanup, proposed by Adam Jackson, but wasn't merged with
+ the original NotifyFD changes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 55c2e1a3aa587c58a74066724e11e30b3df267b8
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Dec 7 15:11:33 2015 -0800
+
+ xnest: Use SetNotifyFd to receive events
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 24e65bf0db57bf4ac70386c0a0e8275b73edd2fb
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Dec 3 01:02:02 2015 -0600
+
+ hw/xfree86: Use NotifyFd for other input fd wakeups
+
+ Remove code in xf86Wakeup for dealing with other input and switch to
+ using the new NotifyFd interface.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit c3fea428aed919826130ef8ebdb2cceb445a845b
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 24 20:51:31 2016 -0700
+
+ os: Use NotifyFd for ErrorConnMax
+
+ Instead of open-coding a single FD wait, use NotifyFd to wait for the
+ FD to become readable before returning the error message.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 559aac2d71250e3137aaa582e2a59a918ddf21b7
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 24 21:59:38 2016 -0700
+
+ dmx: Switch from select(2) to poll(2) for input
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit aa6717ce213e79735c72afc5ec9cc1f9c0297e09
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 24 21:36:18 2016 -0700
+
+ xfree86: Switch from select(2) to poll(2)
+
+ xf86WaitForInput and the xf86 SIGIO handling code.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 81135991a583b3b30a90e82ddc1d5c86d57bf00b
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 24 21:19:13 2016 -0700
+
+ kdrive: switch from select(2) to poll(2)
+
+ This avoids fd limits
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Sep 1 18:50:55 2015 -0700
+
+ dix: Switch to the libXfont2 API (v2)
+
+ This new libXfont API eliminates exposing internal X server symbols to
+ the font library, replacing those with a struct full of the entire API
+ needed to use that library.
+
+ v2: Use libXfont2 instead of libXfont_2
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 950ffb8d6fd1480f305e38c571bda44f247f1de2
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Nov 6 12:27:42 2015 -0800
+
+ glamor: Remove the FBO cache.
+
+ It is a modest performance improvement (2.7% on Intel), with the
+ significant downside that it keeps extra pixmap contents laying around
+ for 1000 BlockHandlers without the ability for the system to purge
+ them when under memory pressure, and tiled renderers don't know that
+ we could avoid reading their current contents when beginning to render
+ again. We could use the FB invalidate functions, but they aren't
+ always available, aren't hooked up well in Mesa, and would eat into
+ the performance gains of having the cache.
+
+ [ajax: rebased to master]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit e8e36755abb17872d669b88d33ca9adc511029a0
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jul 1 12:34:20 2016 +0900
@@ -60,9 +6341,8 @@ Date: Fri Jul 1 12:34:20 2016 +0900
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96742
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit e8e36755abb17872d669b88d33ca9adc511029a0)
-commit 7a08d8d82007367a90197f9e9d549dbf0bc9ca2e
+commit 32a9504c69183485b0b796fa3966cd1e39992365
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 12 10:04:18 2016 -0400
@@ -82,9 +6362,8 @@ Date: Tue Jul 12 10:04:18 2016 -0400
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 32a9504c69183485b0b796fa3966cd1e39992365)
-commit 8ff830d1ea4c3572b8fb770009c73c40007e132a
+commit 4926845a57fa8b53e18ea7d3434bf5539e9b7782
Author: Andrew Eikum <aeikum@codeweavers.com>
Date: Wed Jul 6 14:13:09 2016 -0500
@@ -96,9 +6375,30 @@ Date: Wed Jul 6 14:13:09 2016 -0500
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
- (cherry picked from commit 4926845a57fa8b53e18ea7d3434bf5539e9b7782)
-commit d4cbb1155a79a3dc1dc74cc155dbcfc303273856
+commit 9fcb554e9bfdf3eed2c2250d89150e3e7b907f01
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Jul 8 15:17:05 2016 -0400
+
+ xwayland: Only force monotonic clock once
+
+ Otherwise on regeneration we get:
+
+ (EE) BUG: triggered 'if (clockid)'
+ (EE) BUG: utils.c:440 in ForceClockId()
+ (EE)
+ (EE) Backtrace:
+ (EE) 0: ./hw/xwayland/Xwayland (ForceClockId+0x5c) [0x47713c]
+ (EE) 1: ./hw/xwayland/Xwayland (OsInit+0x25) [0x4763d5]
+ (EE) 2: ./hw/xwayland/Xwayland (dix_main+0x11c) [0x43e60c]
+ (EE) 3: /lib64/libc.so.6 (__libc_start_main+0xf1) [0x7f627b2f9731]
+ (EE) 4: ./hw/xwayland/Xwayland (_start+0x29) [0x4238e9]
+ (EE) 5: ? (?+0x29) [0x29]
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
+
+commit cf6730c503f8090a5d1b80918fe253fc2c5bc090
Author: Rui Matos <tiagomatos@gmail.com>
Date: Wed Jul 13 19:19:09 2016 +0200
@@ -111,9 +6411,8 @@ Date: Wed Jul 13 19:19:09 2016 +0200
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
- (cherry picked from commit cf6730c503f8090a5d1b80918fe253fc2c5bc090)
-commit 65c5eab6000f108762b7ef6b63869525222ff99d
+commit 401a8d6e1379133863e3271374dc21850d0d3cab
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jun 28 17:22:47 2016 +0900
@@ -132,9 +6431,8 @@ Date: Tue Jun 28 17:22:47 2016 +0900
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92309
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
- (cherry picked from commit 401a8d6e1379133863e3271374dc21850d0d3cab)
-commit c0b02ce45f48450d2896a424dc1eb9a2827ed4c5
+commit 033888e7766d226a179357d970223428c19c4b53
Author: Hans De Goede <hdegoede@redhat.com>
Date: Thu Jul 7 10:55:04 2016 +0200
@@ -152,24 +6450,156 @@ Date: Thu Jul 7 10:55:04 2016 +0200
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Chad Versace <chad.versace@intel.com>
- (cherry picked from commit 033888e7766d226a179357d970223428c19c4b53)
-commit b377a806693ec86df1743d7ddd5a931c88050ebb
+commit ce24f3aa5815e03c2d501d1504f6c0162b219801
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jul 7 14:50:03 2016 -0700
+
+ modesetting: NULL assignment for drmmode_set_target_scanout_target_cpu
+
+ Commit 80e64dae: "modesetting: Implement PRIME syncing as a sink" originally was
+ supposed to have this line, but it was dropped as part of the merge process.
+
+ Foregoing the NULL assignment causes a ton of problems with dereferencing
+ uninitialized memory.
+
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit df8e86931eb19c196ed2afc85d89525ef8cb711b
+Author: agoins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:48 2016 -0700
+
+ randr: Add ability to turn PRIME sync off
+
+ Adds an output parameter to disable PRIME synchronization.
+
+ Output parameter is created when the user calls 'xrandr
+ --setprovideroutputsource <sink> <source>' to prevent polluting output
+ parameters of non-PRIME configurations.
+
+ Defaults to on, so if the user wants PRIME synchronization they don't need
+ to do anything.
+
+ If the user wishes to disable PRIME synchronization when they first set up
+ PRIME, they can run 'xrandr --output <output> --set "PRIME Synchronization"
+ 0' after running 'xrandr --setprovideroutputsource <sink> <source>', but
+ before 'xrandr --auto'.
+
+ If the user wishes to enable or disable PRIME synchronization after PRIME has
+ already been set up, they can run 'xrandr --output <output> --set "PRIME
+ Synchronization" <0 or 1>' at any time, xrandr will trigger a modeset, which
+ will tear down and setup PRIME in the configuration they requested on CRTCs
+ associated with that output.
+
+ randrstr.h:
+ Add central definition of the output property name.
+
+ rrcrtc.c:
+ Add function rrGetPixmapSharingSyncProp() to query the status of the
+ output property.
+
+ Add function rrSetPixmapSharingSyncProp() to set the output property.
+
+ Add 'sync' parameter to rrSetupPixmapSharing(), which when false will
+ use single buffering even if the required ABI functions are supported.
+ Changes rrSetupPixmapSharing() to only report an error if falling back
+ to single buffering when the user requested synchronization.
+
+ Change RRCrtcSet() to use rrPixmapSharingSyncProp() to query the status
+ of the output property and feed it into rrSetupPixmapSharing() using
+ the 'sync' parameter.
+
+ rrprovider.c:
+ Add RR(Init/Fini)PrimeSyncProps(), functions to create and destroy the
+ PRIME synchronization output property.
+
+ Add a call to RRInitPrimeSyncProps() in
+ ProcRRSetProviderOutputSource(), such that the output property is
+ created when the user requests PRIME.
+
+ Add a call to RRFiniPrimeSyncProps() in RRProviderDestroy().
+
+ v1: Initial commit
+ v2: Unchanged
+ v3: Add /* TODO */ for handling different sources with different outputs
+ Make rrSetupPixmapSharing() set the output property to 0 if it has to fall
+ back, to avoid user confusion.
+ Make rr(Get)PixmapSharingSyncProp() check the current value if there isn't a
+ pending value
+ v4: Unchanged
+ v5: Unchanged
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit 60ad701a6a8cb9f1eacb72acfe2cb8d3b7a865dc
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Tue Jun 14 11:58:01 2016 +0200
+
+ modesetting: Load on GPU-s with 0 outputs
+
+ In newer laptops with switchable graphics, the GPU may have 0 outputs,
+ in this case the modesetting driver should still load if the GPU is
+ SourceOffload capable, so that it can be used as an offload source provider.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
+
+commit 94a1c77259ce39ba59ad87615df39b570ffab435
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Thu Jun 16 15:21:03 2016 +0200
+
+ modesetting: Fix swapping of provider sink / source capabilities
+
+ When a card has import capability it can be an offload _sink_, not
+ a source and vice versa for export capability.
+
+ This commit fixes the modesetting driver to properly set these
+ capabilities, this went unnoticed sofar because most gpus have both
+ import and export capability.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
+
+commit fcbafdfd79fd03205bc324e23b6d4e4d4f7180e1
Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Jul 18 12:46:51 2016 -0400
+Date: Wed Jul 22 12:14:08 2015 -0400
- modesetting: resubmit dirty rects on EINVAL (v2)
+ modesetting: Implement a double-buffered shadow mode
- This error code can mean we're submitting more rects at once than the
- driver can handle. If that happens, resubmit one at a time.
+ Server GPUs often have a VNC feature attached to allow remote console.
+ The controller implementing this feature is usually not very powerful,
+ and we can easily swamp it with work. This is made somewhat worse by
+ damage over-reporting the size of the dirty region, and a whole lot
+ worse by applications (or shells) that update the screen with identical
+ pixel content as was already there.
- v2: Make the rect submit loop more error-proof (Walter Harms)
+ Fix this by double-buffering the shadow fb, using memcmp to identify
+ dirty tiles on each update pass. Since both shadows are in host memory
+ the memcmp is cheap, and worth it given the win in network bandwidth.
+ The tile size is somewhat arbitrarily chosen to be one cacheline wide at
+ 32bpp on Intel Core.
+
+ By default we enable this behaviour for (a subset of) known server GPUs;
+ the heuristic could use work.
Signed-off-by: Adam Jackson <ajax@redhat.com>
- Reviewed-by: Michael Thayer <michael.thayer@oracle.com>
- (cherry picked from commit 4b311d23e84356bd0e9e736aeed7448dd6382118)
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 75e660e379d921a53eb7c3bc9c2e412fa58aec02
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jul 22 12:14:07 2015 -0400
+
+ modesetting: Drop some non-functional triple-buffering variables
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-commit f091528457cc62fa9bd6cd24aeebacffb7296419
+commit 21217d02168d1883b2d1f64399aec494f96a8b9d
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jul 22 12:14:06 2015 -0400
@@ -189,31 +6619,8 @@ Date: Wed Jul 22 12:14:06 2015 -0400
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
[hdegoede@redhat.com: rebase, also use kbpp for rotate shadow fb]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-
- (cherry picked from commit 21217d02168d1883b2d1f64399aec494f96a8b9d)
-commit d8eccab378dd8fe5a36dd31ff91561da47ec9ecf
-Author: Hans de Goede <hdegoede@redhat.com>
-Date: Wed Jun 1 15:14:32 2016 +0200
-
- modesetting: Only add main fb if necessary
-
- If we're doing reverse-prime; or doing rotation the main fb is not used,
- and there is no reason to add it in this case.
-
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 4313122dea0df9affc280ee698e929489061ccc6)
-
-commit 23a7010f3438e053f66c9fb0c4a13456fe33bf72
-Author: Adam Jackson <ajax@redhat.com>
-Date: Tue Jul 19 13:08:31 2016 -0400
-
- Revert "modesetting: Load on GPU-s with 0 outputs"
-
- This reverts commit 713a21cc702561931ed5e84c3a5c3d7e7c580725.
-
-commit effd785aa8a97c9a044d86bde7ad63645cbca176
+commit af916477c65a083ec496ac3f088d766b410e8b6e
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Feb 16 17:00:55 2015 +0100
@@ -251,9 +6658,8 @@ Date: Mon Feb 16 17:00:55 2015 +0100
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit af916477c65a083ec496ac3f088d766b410e8b6e)
-commit 61094504a774ac763cb457d1f4bf2a1476e03f56
+commit 14c21ea1c9496638b1feb8e6145c440fb4f1d14b
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Feb 16 17:00:54 2015 +0100
@@ -272,10 +6678,8 @@ Date: Mon Feb 16 17:00:54 2015 +0100
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
[hdegoede@redhat.com: Add extra comment suggested by Kenneth]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-
- (cherry picked from commit 14c21ea1c9496638b1feb8e6145c440fb4f1d14b)
-commit 15f8aaa786ac89509843f22dcb5f446effba1024
+commit 074cf58769b38550a3f35d5ecb73333330cb2aed
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Feb 16 17:00:53 2015 +0100
@@ -290,9 +6694,39 @@ Date: Mon Feb 16 17:00:53 2015 +0100
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 074cf58769b38550a3f35d5ecb73333330cb2aed)
-commit ee0fd6b2c68d88ef3511fe1796dd50601785ead0
+commit 3762edded8e6e973f71419937e16bea262a266b8
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jun 29 14:07:32 2016 -0400
+
+ configure: Tell AC_REPLACE_FUNCS where to find replacements
+
+ Fixes weird link errors of the form:
+
+ CCLD Xvfb
+ ../../Xext/.libs/libXext.a(xvmc.o): In function `xf86XvMCRegisterDRInfo':
+ /home/ajax/git/xserver/Xext/xvmc.c:828: undefined reference to `strlcpy'
+ /home/ajax/git/xserver/Xext/xvmc.c:829: undefined reference to `strlcpy'
+ ../../os/os.O: In function `siHostnameAddrMatch':
+ /home/ajax/git/xserver/os/access.c:1821: undefined reference to `strlcpy'
+ ../../os/os.O: In function `AuthAudit':
+ /home/ajax/git/xserver/os/connection.c:555: undefined reference to `strlcpy'
+ /home/ajax/git/xserver/os/connection.c:574: undefined reference to `strlcpy'
+ ../../os/os.O:/home/ajax/git/xserver/os/log.c:972: more undefined references to `strlcpy' follow
+ collect2: error: ld returned 1 exit status
+ Makefile:688: recipe for target 'Xvfb' failed
+ make[3]: *** [Xvfb] Error 1
+ Makefile:749: recipe for target 'all-recursive' failed
+ make[2]: *** [all-recursive] Error 1
+ Makefile:608: recipe for target 'all-recursive' failed
+ make[1]: *** [all-recursive] Error 1
+ Makefile:776: recipe for target 'all-recursive' failed
+ make: *** [all-recursive] Error 1
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d135100d6b17e54262a12aeaebe0fe2fe48da3bb
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jun 28 11:42:41 2016 +1000
@@ -310,9 +6744,934 @@ Date: Tue Jun 28 11:42:41 2016 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Daniel Stone <daniels@collabora.com>
- (cherry picked from commit d135100d6b17e54262a12aeaebe0fe2fe48da3bb)
-commit 54ba95861e5ae54051d3963e5e7ced7d69a6de7b
+commit b83dede9cb930cf55249ad8e935f3c4d4328e2d9
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:56 2016 -0700
+
+ modesetting: Implement PRIME syncing as a source
+
+ Implements (Start/Stop)FlippingPixmapTracking, PresentSharedPixmap, and
+ RequestSharedPixmapNotifyDamage, the source functions for PRIME
+ synchronization and double buffering. Allows modesetting driver to be used
+ as a source with PRIME synchronization.
+
+ v1: N/A
+ v2: N/A
+ v3: N/A
+ v4: Initial commit
+ v5: Move disabling of reverse PRIME on sink to sink commit
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit 44cb9578c0e5e10568826bc3ecbed97d358bba3c
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:55 2016 -0700
+
+ modesetting: Disable Reverse PRIME for i915
+
+ Reverse PRIME seems to be designed with discrete graphics as a sink in
+ mind, designed to do an extra copy from sysmem to vidmem to prevent a
+ discrete chip from needing to scan out from sysmem.
+
+ The criteria it used to detect this case is if we are a GPU screen and
+ Glamor accelerated. It's possible for i915 to fulfill these conditions,
+ despite the fact that the additional copy doesn't make sense for i915.
+
+ Normally, you could just set AccelMethod = none as an option for the device
+ and call it a day. However, when running with modesetting as both the sink
+ and the source, Glamor must be enabled.
+
+ Ideally, you would be able to set AccelMethod individually for devices
+ using the same driver, but there seems to be a bug in X option parsing that
+ makes all devices on a driver inherit the options from the first detected
+ device. Thus, glamor needs to be enabled for all or for none until that bug
+ (if it's even a bug) is fixed.
+
+ Nonetheless, it probably doesn't make sense to do the extra copy on i915
+ even if Glamor is enabled for the device, so this is more user friendly by
+ not requiring users to disable acceleration for i915.
+
+ v1: N/A
+ v2: N/A
+ v3: N/A
+ v4: Initial commit
+ v5: Unchanged
+ v6: Rebase onto ToT
+ v7: NULL check and free drmVersionPtr
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit f6fef2a171366156c4c6807de7fe086f04f41b7b
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:54 2016 -0700
+
+ modesetting: Blacklist USB transport devices from PRIME sync
+
+ UDL (USB 2.0 DisplayLink DRM driver) and other drivers for USB transport devices
+ have strange semantics when it comes to vblank events, due to their inability to
+ get the actual vblank info.
+
+ When doing a page flip, UDL instantly raises a vblank event without waiting for
+ vblank. It also has no support for DRM_IOCTL_WAIT_VBLANK, and has some strange
+ behavior with how it handles damage when page flipping.
+
+ It's possible to get something semi-working by hacking around these issues,
+ but even then there isn't much value-add vs single buffered PRIME, and it
+ reduces maintainability and adds additional risks to the modesetting driver
+ when running with more well-behaved DRM drivers.
+
+ Work needs to be done on UDL in order to properly support synchronized
+ PRIME. For now, just blacklist it, causing RandR to fall back to
+ unsynchronized PRIME.
+
+ This patch originally blacklisted UDL by name, but it was pointed out that there
+ are other USB transport device drivers with similar limitations, so it was
+ expanded to blacklist all USB transport devices.
+
+ v1: N/A
+ v2: N/A
+ v3: Initial commit
+ v4: Move check to driver.c for consistency/visibility
+ v5: Refactor to accomodate earlier changes
+ v6: Rebase onto ToT
+ v7: Expand to blacklist all USB transport devices, not just UDL
+
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 500853086dd5fbfe6d2b3e30923fdc4d8c262cf0
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:53 2016 -0700
+
+ modesetting: Suspend and resume flipping with DPMS
+
+ DPMS would prevent page flip / vblank events from being raised, freezing
+ the screen until PRIME flipping was reinitialized. To handle DPMS cleanly,
+ suspend PRIME page flipping when DPMS mode is not on, and resume it when
+ DPMS mode is on.
+
+ v1: Initial commit
+ v2: Moved flipping_active check from previous commit to here
+ v3: Unchanged
+ v4: Unchanged
+ v5: Move flipping_active check to sink support commit
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit 80e64dae8af1eb3bb225b00fd800c6924883cf46
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:52 2016 -0700
+
+ modesetting: Implement PRIME syncing as a sink
+
+ Implements (Enable/Disable)SharedPixmapFlipping and
+ SharedPixmapNotifyDamage, the sink functions for PRIME synchronization and
+ double buffering. Allows modesetting driver to be used as a sink with PRIME
+ synchronization.
+
+ Changes dispatch_slave_dirty to flush damage from both scanout pixmaps.
+
+ Changes drmmode_set_scanout_pixmap*() functions to
+ drmmode_set_target_scanout_pixmap*() that take an additional parameter
+ PixmapPtr *target. Then, treat *target as it did prime_pixmap. This allows
+ me to use it to explicitly set both prime_pixmap and prime_pixmap_back
+ individually. drmmode_set_scanout_pixmap() without the extra parameter
+ remains to cover the single-buffered case, but only works if we aren't
+ already double buffered.
+
+ driver.c:
+ Add plumbing for rr(Enable/Disable)SharedPixmapFlipping and
+ SharedPixmapNotifyDamage.
+
+ Change dispatch_dirty_crtc to dispatch_dirty_pixmap, which functions the
+ same but flushes damage associated with a ppriv instead of the crtc, and
+ chanage dispatch_slave_dirty to use it on both scanout pixmaps if
+ applicable.
+
+ drmmode_display.h:
+ Add flip_seq field to msPixmapPrivRec to keep track of the event handler
+ associated with a given pixmap, if any.
+
+ Add wait_for_damage field to msPixmapPrivRec to keep track if we have
+ requested a damage notification from the source.
+
+ Add enable_flipping field to drmmode_crtc_private_rec to keep track if
+ flipping is enabled or disabled.
+
+ Add prime_pixmap_back to drmmode_crtc_private_rec to keep track of back
+ buffer internally.
+
+ Add declarations for drmmode_SetupPageFlipFence(),
+ drmmode_EnableSharedPixmapFlipping(),
+ drmmode_DisableSharedPixmapFlipping, drmmode_SharedPixmapFlip(), and
+ drmmode_SharedPixmapPresentOnVBlank().
+
+ Move slave damage from crtc to ppriv.
+
+ drmmode_display.c:
+ Change drmmode_set_scanout_pixmap*() functions to
+ drmmode_set_target_scanout_pixmap*() that take an additional parameter
+ PixmapPtr *target for explicitly setting different scanout pixmaps.
+
+ Add definitions for functions drmmode_SharedPixmapFlip(),
+ drmmode_SharedPixmapPresentOnVBlank(),
+ drmmode_SharedPixmapPresent(),
+ drmmode_SharedPixmapVBlankEventHandler(),
+ drmmode_SharedPixmapVBlankEventAbort(),
+ drmmode_EnableSharedPixmapFlipping(), and
+ drmmode_DisableSharedPixmapFlipping,
+ drmmode_InitSharedPixmapFlipping(), and
+ drmmode_FiniSharedPixmapFlipping, along with struct
+ vblank_event_args.
+
+ The control flow is as follows:
+ pScrPriv->rrEnableSharedPixmapFlipping() makes its way to
+ drmmode_EnableSharedPixmapFlipping(), which sets enable_flipping to
+ TRUE and sets both scanout pixmaps prime_pixmap and
+ prime_pixmap_back.
+
+ When setting a mode, if prime_pixmap is defined, modesetting
+ driver will call drmmode_InitSharedPixmapFlipping(), which if
+ flipping is enabled will call drmmode_SharedPixmapPresent() on
+ scanout_pixmap_back.
+
+ drmmode_SharedPixmapPresent() requests that for the source to
+ present on the given buffer using master->PresentSharedPixmap(). If
+ it succeeds, it will then attempt to flip to that buffer using
+ drmmode_SharedPixmapFlip(). Flipping shouldn't fail, but if it
+ does, it will raise a warning and try drmmode_SharedPixmapPresent()
+ again on the next vblank using
+ drmmode_SharedPixmapPresentOnVBlank().
+
+ master->PresentSharedPixmap() could fail, in most cases because
+ there is no outstanding damage on the mscreenpix tracked by the
+ shared pixmap. In this case, drmmode_SharedPixmapPresent() will
+ attempt to use master->RequestSharedPixmapNotifyDamage() to request
+ for the source driver to call slave->SharedPixmapNotifyDamage() in
+ response to damage on mscreenpix. This will ultimately call
+ into drmmode_SharedPixmapPresentOnVBlank() to retry
+ drmmode_SharedPixmapPresent() on the next vblank after
+ accumulating damage.
+
+ drmmode_SharedPixmapFlip() sets up page flip event handler by
+ packing struct vblank_event_args with the necessary parameters, and
+ registering drmmode_SharedPixmapVBlankEventHandler() and
+ drmmode_SharedPixmapVBlankEventAbort() with the modesetting DRM
+ event handler queue. Then, it uses the drmModePageFlip() to flip on
+ the next vblank and raise an event.
+
+ drmmode_SharedPixmapPresentOnVBlank() operates similarly to
+ drmmode_SharedPixmapFlip(), but uses drmWaitVBlank() instead of
+ drmModePageFlip() to raise the event without flipping.
+
+ On the next vblank, DRM will raise an event that will ultimately be
+ handled by drmmode_SharedPixmapVBlankEventHandler(). If we flipped,
+ it will update prime_pixmap and prime_pixmap_back to reflect that
+ frontTarget is now being displayed, and use
+ drmmode_SharedPixmapPresent(backTarget) to start the process again
+ on the now-hidden shared pixmap. If we didn't flip, it will just
+ use drmmode_SharedPixmapPresent(frontTarget) to start the process
+ again on the still-hidden shared pixmap.
+
+ Note that presentation generally happens asynchronously, so with
+ these changes alone tearing is reduced, but we can't always
+ guarantee that the present will finish before the flip. These
+ changes are meant to be paired with changes to the sink DRM driver
+ that makes flips wait on fences attached to dmabuf backed buffers.
+ The source driver is responsible for attaching the fences and
+ signaling them when presentation is finished.
+
+ Note that because presentation is requested in response to a
+ vblank, PRIME sources will now conform to the sink's refresh rate.
+
+ At teardown, pScrPriv->rrDisableSharedPixmapFlipping() will be
+ called, making its way to drmmode_FiniSharedPixmapFlipping().
+ There, the event handlers for prime_pixmap and prime_pixmap_back
+ are aborted, freeing the left over parameter structure. Then,
+ prime_pixmap and prime_pixmap back are unset as scanout pixmaps.
+
+ Register and tear down slave damage per-scanout pixmap instead of
+ per-crtc.
+
+ v1: Initial commit
+ v2: Renamed PresentTrackedFlippingPixmap to PresentSharedPixmap
+ Renamed flipSeq to flip_seq
+ Warn if flip failed
+ Use SharedPixmapNotifyDamage to retry on next vblank after damage
+ v3: Refactor to accomodate moving (rr)StartFlippingPixmapTracking and
+ (rr)(Enable/Disable)SharedPixmapFlipping to rrScrPrivRec from ScreenRec
+ Do damage tracking on both scanout pixmaps
+ v4: Tweaks to commit message
+ v5: Revise for internal storage of prime pixmap ptrs
+ Move disabling for reverse PRIME from source commit to here
+ Use drmmode_set_target_scanout_pixmap*() to set scanout pixmaps
+ internally to EnableSharedPixmapFlipping().
+ Don't support flipping if ms->drmmode.pageflip == FALSE.
+ Move flipping_active check to this commit
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit 378c85a8848679eaa3c2881f3ba8b686e59df25e
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:51 2016 -0700
+
+ modesetting: Always load ms->drmmode.pageflip
+
+ ms->drmmode.pageflip was only loaded from options if ms->drmmode.glamor was
+ defined, otherwise it would always assume FALSE.
+
+ PRIME Synchronization requires ms->drmmode.pageflip even if we aren't using
+ glamor, so load it unconditionally.
+
+ v1: N/A
+ v2: N/A
+ v3: N/A
+ v4: N/A
+ v5: Initial commit
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit b773a9c8126222e5fed2904d012fbf917a9f22fd
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:50 2016 -0700
+
+ modesetting: Always tear down scanout pixmap
+
+ drmmode_set_scanout_pixmap_(cpu/gpu) would only do teardown if ppix ==
+ NULL. This meant that if there were consecutive calls to
+ SetScanoutPixmap(ppix != NULL) without calls to SetScanoutPixmap(ppix ==
+ NULL) in between, earlier calls would be leaked. RRReplaceScanoutPixmap()
+ does this today.
+
+ Instead, when setting a scanout pixmap, always do teardown of the existing
+ scanout pixmap before setting up the new one. Then, if there is no new one
+ to set up, stop there.
+
+ This maintains the previous behavior in all cases except those with
+ multiple consecutive calls to SetScanoutPixmap(ppix != NULL).
+
+ v1: N/A
+ v2: N/A
+ v3: N/A
+ v4: N/A
+ v5: Initial commit
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit f4c37eeee7953df1fe0e3196eda452acf0078e61
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:49 2016 -0700
+
+ modesetting: Internal storage of scanout pixmaps
+
+ modesetting relied on randr_crtc->scanout_pixmap being consistent with
+ calls to SetScanoutPixmap, which is very fragile and makes a lot of
+ assumptions about the caller's behavior.
+
+ For example, RRReplaceScanoutPixmap(), when dropping off with !size_fits,
+ will set randr_crtc->scanout_pixmap = NULL and then call SetScanoutPixmap.
+ Without this patch, drmmode_set_scanout_pixmap_(cpu/gpu) will think that
+ there is no scanout pixmap to tear down, because it's already been set to
+ NULL.
+
+ By keeping track of the scanout pixmap in its internal state, modesetting
+ can avoid these types of bugs and reduce constraints on calling
+ conventions.
+
+ v1: N/A
+ v2: N/A
+ v3: N/A
+ v4: N/A
+ v5: Initial commit
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit 1bdbc7e764ed7bf7c1ae46287dec368aa7c7e80d
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:47 2016 -0700
+
+ randr/xf86: Add PRIME Synchronization / Double Buffer
+
+ Changes PRIME to use double buffering and synchronization if all required
+ driver functions are available.
+
+ rrcrtc.c:
+ Changes rrSetupPixmapSharing() to use double buffering and
+ synchronization in the case that all required driver functions are
+ available. Otherwise, falls back to unsynchronized single buffer.
+
+ Changes RRCrtcDetachScanoutPixmap() to properly clean up in the case of
+ double buffering.
+
+ Moves StopPixmapTracking() from rrDestroySharedPixmap() to
+ RRCrtcDetachScanoutPixmap().
+
+ Changes RRReplaceScanoutPixmap() to fail if we are using double buffering,
+ as it would need a second ppix parameter to function with double buffering,
+ and AFAICT no driver I've implemented double buffered source support in uses
+ RRReplaceScanoutPixmap().
+
+ randrstr.h:
+ Adds scanout_pixmap_back to struct _rrCrtc to facilitate PRIME
+ double buffering.
+
+ xf86Crtc.h:
+ Adds current_scanout_back to _xf86Crtc to facilitate detection
+ of changes to it in xf86RandR12CrtcSet().
+
+ xf86RandR12.c:
+ Changes xf86RandR12CrtcSet() to detect changes in
+ scanout_pixmap_back.
+
+ Adds scanout_pixmap_back to struct _rrCrtc to facilitate PRIME double
+ buffering.
+
+ v1: Initial commit
+ v2: Rename PresentTrackedFlippingPixmap to PresentSharedPixmap
+ v3: Refactor to accomodate moving (rr)StartFlippingPixmapTracking and
+ (rr)(Enable/Disable)SharedPixmapFlipping to rrScrPrivRec from ScreenRec
+ Add fallback if flipping funcs fail
+ v4: Detach scanout pixmap when destroying scanout_pixmap_back, to avoid
+ dangling pointers in some drivers
+ v5: Disable RRReplaceScanoutPixmap for double-buffered PRIME, it would need an
+ ABI change with support for 2 pixmaps if it were to be supported, but AFAICT
+ no driver that actually supports double-buffered PRIME uses it.
+ Refactor to use rrEnableSharedPixmapFlipping() as a substitute for
+ rrCrtcSetScanoutPixmap() in the flipping case.
+ Remove extraneous pSlaveScrPriv from DetachScanoutPixmap()
+ Remove extraneous protopix and pScrPriv from rrSetupPixmapSharing()
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit b601f96a5915a2c486b389483b291797e6fdf617
+Author: Alex Goins <agoins@nvidia.com>
+Date: Thu Jun 16 20:06:46 2016 -0700
+
+ xf86: Add PRIME flipping functions to Screen
+
+ Adds typedefs for (*RRStartFlippingPixmapTrackingProcPtr),
+ (*RREnableSharedPixmapFlippingProcPtr),
+ and (*RRDisableSharedPixmapFlippingProcPtr) in randrstr.h.
+
+ Adds typedefs for (*PresentSharedPixmapProcPtr),
+ (*SharedPixmapNotifyDamageProcPtr),
+ (*RequestSharedPixmapNotifyDamageProcPtr), and
+ (*StopFlippingPixmapTrackingProcPtr) in scrnintstr.h.
+
+ Adds RR(Enable/Disable)SharedPixmapFlipping, and
+ RRStartFlippingPixmapTracking to rrScrnPrivRec.
+
+ Adds StopFlippingPixmapTracking, PresentSharedPixmap,
+ SharedPixmapNotifyDamage, and RequestSharedPixmapNotifyDamage to ScreenRec.
+
+ rrScrnPrivRec used for functions that use RandR-private data types, and
+ ScreenRec used for the rest.
+
+ RREnableSharedPixmapFlipping will allow the sink driver to setup for
+ flipping between two shared pixmaps.
+
+ RRDisableSharedPixmapFlipping will allow the sink driver to do teardown
+ associated with flipping between two shared pixmaps.
+
+ (RRStart/Stop)FlippingPixmapTracking are merely the double-buffered
+ equivalents of (Start/Stop)PixmapTracking, allowing the source driver to do
+ whatever setup and teardown necessary for presenting on the two shared
+ pixmaps.
+
+ PresentSharedPixmap is a function exposed by the source driver for the X
+ server or sink driver to call to request a present on a given shared
+ pixmap. This way, presents can be driven by the sink's vblank instead of a
+ timer or similar mechanism.
+
+ SharedPixmapNotifyDamage and RequestSharedPixmapNotifyDamage are OPTIONAL
+ (even for double-buffered PRIME) functions exposed by the sink driver and
+ the source driver, respectively. By calling
+ master->RequestSharedPixmapNotifyDamage(ppix), the sink driver can request
+ for the source driver to call slave->SharedPixmapNotifyDamage(ppix) in
+ response to damage on the master screen pixmap tracked by ppix.
+
+ v1: Initial commit
+ v2: Rename PresentTrackedFlippingPixmap to PresentSharedPixmap
+ Add SharedPixmapNotifyDamage / RequestSharedPixmapNotifyDamage
+ v3: Add RRCrtcPtr as a parameter to StartFlippingPixmapTracking
+ Move functions that use RandR-private data types to rrScrnPrivRec.
+ v4: Unchanged
+ v5: Add front and back parameters to RREnableSharedPixmapFlippingProcPtr
+ v6: Rebase onto ToT
+ v7: Unchanged
+
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit ef1578e736887aadf209172f48daa9eaec25b3db
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Sun Feb 28 00:53:24 2016 +0000
+
+ hw/xwin: Fix a typo in "Remove Shadow DirectDraw engine"
+
+ Commit 7a22912e "Remove Shadow DirectDraw engine" contained a typo, changing
+ the fullscreen && DirectDraw check in WM_DISPLAYCHANGE to fullscreen ||
+ DirectDraw
+
+ This causes disruptive depth changes to be improperly handled
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 0a0c1bd93259c208184d6ad974ba55658191af0c
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri Feb 26 18:03:04 2016 +0000
+
+ hw/xwin: Fix a crash trying to reload window icons when not in multiwindow mode
+
+ ReloadEnumWindowsProc() accesses window privates, which are only valid in
+ multiwindow mode, but is called in all modes.
+
+ Fix this potential crash by not doing this unless in multiwindow mode.
+
+ Reproduction steps:
+ 1/ XWin -mwextwm
+ 2/ Run a client which creates an X window e.g. xterm
+ 3/ Right click on notification area icon, and choose 'Reload .XWinrc' from the menu
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 91ae2571458c50d9f782190d9f80815b770aefac
+Author: Colin Harrison <colin.harrison@virgin.net>
+Date: Fri Feb 26 16:46:15 2016 +0000
+
+ hw/xwin: Fix a crash which occurs if focus returns to XWin after xkbcomp has failed
+
+ If WM_FOCUS is received while the "core devices failed" fatal error (due to
+ xkbcomp failing) is displayed, winRestoreModeKeyState() attempts to
+ dereference a NULL InputInfo.keyboard->key pointer.
+
+ Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
+ Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
+
+commit 4b123e0f61eb55e59d30bf442499cf3b3f621c3b
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Aug 4 16:05:05 2015 +0100
+
+ hw/xwin: Make window maximizable if a maximium size larger than virtual desktop size is specified
+
+ Firefox 38 has a WM_NORMAL_HINTS with a maximum size of 32767x32767.
+
+ Don't remove the maximize control from the window frame if the maximum size
+ is bigger than the virtual desktop size, as maximizing the window will not
+ exceed the maximium size.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 504bf495f9b3adea1ba650469223511f81709714
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed Jul 8 19:12:22 2015 +0100
+
+ hw/xwin: Detect invalid options in combination with -nodecoration
+
+ Detect invalid options in combination with -nodecoration
+
+ These are particularly problematic as -nodecoration implies a default of
+ -nomultimonitors, for some reason, which will gives rendering issues with
+ -multiwindow.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit e1b983b55e4cefcf976c8f92d608af8216a56927
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Nov 11 11:46:25 2014 +0000
+
+ hw/xwin: Default to -noresize when -fullscreen is used
+
+ Currently, just using -fullscreen fails in winValidateArgs(), as the default
+ -resize=randr is incompatible with -fullscreen.
+
+ Set the default resize mode to -noresize if -fullscreen is used.
+
+ Also, rename enum value notAllowed -> resizeNotAllowed for clarity.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 42f7cd5d92f2046e1b5c264b3d76c3afda624a55
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Sat Oct 11 14:49:16 2014 +0100
+
+ hw/xwin: Tell LogInit() to backup previous logfile as .old
+
+ Future work: Do we really need to call LogInit() in so many different
+ places?
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 197419838273eddbd0bd34890771799f4bebbc07
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri Sep 26 13:18:33 2014 +0100
+
+ hw/xwin: Downgrade some uninformative, always-emitted log output to debug
+
+ Downgrade from error to debug some uninformative, always-emitted log output
+ about thread synchronization during initialization
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 17c8bf348eea4f12ce7cb4ca7db0d0576e28c982
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Apr 28 16:04:40 2015 +0100
+
+ hw/xwin: Check for just the hostname in window title
+
+ When -hostintitle is enabled, only use the hostname, not a FQDN from
+ WM_CLIENT_MACHINE, when checking if the window title already contains it
+
+ Also restructure GetWindowName() to fix a potential memory leak.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit c05c4360eea245b3ef5f3a355b95dcd63244ef70
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon Sep 22 14:40:41 2014 +0100
+
+ hw/xwin: Use _NET_WM_NAME for window titles in multiwindow mode
+
+ Use _NET_WM_NAME in preference to WM_NAME for window title
+
+ Update window title when _NET_WM_NAME property changes
+
+ We should always have been doing this, but some qt5 examples only set
+ _NET_WM_NAME, so now it's become more important...
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 866d8299abc4315d4836292aeac4abe0b686fc10
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu Mar 13 17:53:44 2014 +0000
+
+ hw/xwin: Remove decorations from _NET_WM_WINDOW_TYPE_SPLASH type windows
+
+ In multiwindow mode, remove decorations from _NET_WM_WINDOW_TYPE_SPLASH type
+ windows.
+
+ Some programs use _NET_WM_WINDOW_TYPE_SPLASH_SCREEN in error, so also accept
+ that as equivalent.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 356b9129067dd0e1dc62e893d47a1e9b033885bd
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu Apr 7 17:40:56 2016 +0100
+
+ hw/xwin: Use Bool type in winShowWindowOnTaskbar() prototype
+
+ Use the Bool type from X11/Xdefs.h for winShowWindowOnTaskbar().
+
+ This is the boolean type we should be using inside the X server, rather than
+ BOOL, which evaluates to either the Win32 API type, or the Xlib API type,
+ depending on the context...
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 7397a2191f333a8632109873cc60d13ca4d550b0
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Tue Jun 21 13:54:35 2016 +0200
+
+ xwayland-input: Fake crossing to rootwin
+
+ This partially reverts commit c1565f3.
+
+ When the pointer moves from an X11 window to a Wayland native window,
+ no LeaveNotify event is emitted which can lead to various unexpected
+ behaviors like tooltips remaining visible after the pointer has left the
+ window.
+
+ Yet the pointer_handle_leave() is called and so is the DIX CheckMotion()
+ but since the pointer enters a Wayland native window with no other
+ Xwayland window matching, DoEnterLeaveEvents() does not get invoked and
+ therefore no LeaveNotify event is sent to the X11 client at the time the
+ pointer leaves the window for a Wayland native surface.
+
+ Restore the XYToWindow() handler in xwayland-input that was previously
+ removed with commit c1565f3 and use that handler to pretend that the
+ pointer entered the root window in this case so that the LeaveNotify
+ event is emitted.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96437
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Acked-by: Daniel Stone <daniels@collabora.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 111a045dcf0912dc5b178c18acda479b3972876b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 21 11:45:17 2016 -0400
+
+ Revert "XDMCP: For IPv6 add link local addresses to the end of the list"
+
+ This reverts commit fdd448cd39b4ca84a28d73fc628911070437b703.
+
+commit fdd448cd39b4ca84a28d73fc628911070437b703
+Author: Reinhard Max <max@suse.de>
+Date: Thu Apr 28 15:21:15 2016 +0200
+
+ XDMCP: For IPv6 add link local addresses to the end of the list
+
+ For link local addresses the XDMCP server would need to either know the
+ interface thru a scope identifier or try all available interfaces. If
+ they don't this address will fail in which case the XDMCP server could
+ still try the other addresses passed - however some only try the first
+ address and then give up.
+
+ Even if this seems to be the wrong place to fix this it seems to be
+ easier than fixing all display servers.
+
+ [ajax: Cleaned up commit message]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit ce82ae1964b2115a780786676c614546297a79c9
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Feb 2 14:10:49 2016 -0500
+
+ res: Account for GLXPixmap references too
+
+ GLX_EXT_tetxure_from_pixmap operates on a GLXPixmap, which takes a
+ reference on the backing pixmap; that GLXPixmap might be long-lived, so
+ we should account for it in ResQueryClientPixmapBytes.
+
+ Acked-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 5d6ad0d3a7611c4dff2d79b6af9eb5c0885656ef
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Feb 2 13:49:37 2016 -0500
+
+ res: Fix accounting of redirected window pixmaps for Composite
+
+ The previous change removed the special case that matched resources of
+ CompositeClientWindowType and walked back from that to the window
+ pixmap. That was intentional, since that logic was broken anyway. CCWTs
+ don't map 1:1 to references on the backing pixmap; a window redirected
+ by multiple clients (say, by the server since it's on the synthetic
+ visual, and then manually by a compositor) would have a window pixmap
+ refcount of 1, but would have those bytes accounted twice.
+
+ The right thing is to have Composite wrap window accounting, and add the
+ pixmap bytes once and only once for the redirection reference.
+
+ Note that the view from the client can still be non-intuitive in the
+ face of Composite. xcompmgr, for example, holds _two_ references to
+ each window pixmap (one each from CompositeNameWindowPixmap and
+ RenderCreatePicture), so a synthetic-visual window will have its bytes
+ split 2/3 to xcompmgr and 1/3 to the server-client. Nothing to be done
+ about that, and at least this way we're not over-accounting.
+
+ Acked-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 4f8a72034c4a2654bfc16d929e09a69d1cc138ef
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Feb 2 13:46:42 2016 -0500
+
+ res: Simplify QueryClientPixmapBytes
+
+ I suspect this code predates the common resource hooks for computing
+ sizes. It's ugly in any case since the Resource extension shouldn't
+ need to know which extensions can take a reference on pixmaps. Instead,
+ let's just walk every resource for the client and sum up all the pixmap
+ bytes that way.
+
+ This might be slightly slower since we're calling the size func once for
+ every resource. On the other hand, it might be slightly faster since we
+ only walk the resource table once instead of 3-5 times. Probably a
+ wash, and not really a performance path in any case.
+
+ Acked-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 263c5333a54107efac702a54d7e6329ae25ff4e0
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Dec 25 18:32:46 2015 +0900
+
+ xfree86/modes: Simplify in_range logic in xf86_crtc_set_cursor_position
+
+ Consolidate to a single if/else statement and eliminate the redundant
+ local variable in_range and assignments to x/y.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit a991b1ec30344c16d318d2c0640f9e5d380193e0
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Mon Feb 1 16:07:22 2016 +0900
+
+ xfree86/modes: Disambiguate driverIsPerformingTransform
+
+ The driver can now specify exactly which aspects of the transform it
+ wants to handle via XF86DriverTransform* flags.
+
+ Since the driver can now choose whether it wants to receive transformed
+ or untransformed cursor coordinates, xf86CrtcTransformCursorPos no
+ longer needs to be available to drivers, so make it static.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit aad96f85005f8eab27df62049d619092865a9b16
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Dec 25 18:28:47 2015 +0900
+
+ xfree86/modes: Fix HW cursor clipping for driverIsPerformingTransform (v2)
+
+ Even if the driver is handling the transform, we still need to transform
+ the cursor position for clipping, otherwise we may hide the HW cursor
+ when the cursor is actually inside the area covered by the CRTC.
+
+ v2: Use crtc_x/y local variables for clarity
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 828887b6f4a997b6468da565a88b6fe9afcda191
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 14 13:45:27 2016 -0700
+
+ ephyr: Process only the last expose or configure available from the server
+
+ Delay expose or configure processing until the event queue is empty so
+ that we don't end up processing a long series of events one at a
+ time. Expose events already have a check waiting for the last in a
+ series, this further improves that by discarding multiple
+ series of events.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit c17a41794507d6d04c850e9e1bc04fc60c31de18
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat Jun 4 19:55:07 2016 -0700
+
+ ephyr: Process queued X events before blocking [v2]
+
+ If we end up reading all pending X events in the course of other server
+ execution, then our notify FD callback won't get invoked and we won't
+ process them. Fix this by noting that there are queued events in the
+ block handler, setting the poll timeout to zero and queuing a work
+ proc to clear the event queue.
+
+ v2: use a work proc to clear the event queue rather than doing it in
+ the block handler directly.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit f3248eba6e2d0c099025f8e9a4874b431246eac7
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 14 13:19:49 2016 -0700
+
+ ephyr: Handle window resize when using glamor
+
+ Under glamor, we need to re-create the screen pixmap at the new size
+ so that we can ask glamor for the associated texture. Fortunately, we
+ can simply use ephyr_glamor_create_screen_resources to create the new
+ pixmap.
+
+ Because this is being done after the server has started, we need to
+ walk the window heirarchy and reset any windows pointing at the old
+ pixmap. I could easily be convinced that this TraverseTree should be
+ moved to miSetScreenPixmap.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 235d21670dcff224807ff719c7fa86212058ec46
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 14 13:16:03 2016 -0700
+
+ ephyr: Don't configure window while responding to configure events
+
+ This leads to and endless sequence of window resizes.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit fb1edccf3c90c626f120b3c399657f24d3f7901e
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 26 12:11:46 2016 -0700
+
+ dix: Call screen block/wakeup handlers closest to blocking [v3]
+
+ The screen block and wakeup handlers are the only ones which provide a
+ well known ordering between the wrapping layers; placing these as
+ close as possible to the server blocking provides a way for the driver
+ to control the flow of execution correctly.
+
+ Switch the shadow code to run in the screen block handler so that it
+ now occurrs just before the server goes to sleep.
+
+ Switch glamor to call down to the driver after it has executed its own
+ block handler piece, in case the driver needs to perform additional
+ flushing work after glamor has called glFlush.
+
+ These changes ensure that the following modules update the screen in
+ the correct order:
+
+ animated cursors (uses RegisterBlockAndWakeupHandlers dynamically)
+ composite (dynamic wrapping)
+ misprite (dynamic wrapping)
+ shadow (static wrapping)
+ glamor (static wrapping)
+ driver (static wrapping)
+
+ It looks like there's still a bit of confusion between composite and
+ misprite; if composite updates after misprite, then it's possible
+ you'd exit the block handler chain with the cursor left hidden. To fix
+ that, misprite should be wrapping during ScreenInit time and not
+ unwrapping. And composite might as well join in that fun, just to make
+ things consistent.
+
+ [v2] Unwrap BlockHandler in shadowCloseScreen (ajax)
+ [v3] ephyr: Use screen block handler for flushing changes
+
+ ephyr needs to make sure it calls glXSwapBuffers after glamor finishes
+ its rendering. As the screen block handler is now called last, we have
+ to use that instead of a registered block/wakeup handler to make sure
+ the GL rendering is done before we copy it to the front buffer.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit a134d1e7eada0ac90fb622f45833c87b72c9aa06
Author: Guilherme Quentel Melo <gqmelo@gmail.com>
Date: Tue May 10 00:29:58 2016 +0000
@@ -335,9 +7694,254 @@ Date: Tue May 10 00:29:58 2016 +0000
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Guilherme Quentel Melo <gqmelo@gmail.com>
- (cherry picked from commit a134d1e7eada0ac90fb622f45833c87b72c9aa06)
-commit be8eb5c4a1dda472d54f96bd54ee3e9421daf2e7
+commit 266cf39a8f108e2f365a9772f4ee4d9fca88eb36
+Merge: fa7b70a9b8 848089e0dd
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Jun 20 11:21:40 2016 -0400
+
+ Merge remote-tracking branch 'hans/for-master'
+
+commit fa7b70a9b895789ec57562bbba0bc052fc91d134
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Jun 14 17:36:16 2016 -0700
+
+ kdrive: Only enable threaded input if we have input devices
+
+ When there aren't any devices, the input thread is going to be pretty
+ lonely, so don't bother to even start it.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6f2a5b8cdf7b1e913a1e0581e65195dd10f04ca3
+Author: Jason Gerecke <killertofu@gmail.com>
+Date: Fri Jun 17 08:44:41 2016 -0700
+
+ xwayland: Expose all NBUTTONS buttons on the pointer
+
+ The call to 'InitButtonClassDeviceStruct' which initializes the pointer
+ buttons only results in the first three buttons being created due to a
+ hardcoded '3'. In order to expose all the buttons defined in the
+ btn_labels array, we subtitute 'NBUTTONS' in its place.
+
+ Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
+ Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 72df6e2a3a5020696902b70fe940934ef0a681c4
+Author: Jason Gerecke <killertofu@gmail.com>
+Date: Fri Jun 17 08:44:40 2016 -0700
+
+ xwayland: Use correct labels when initializing pointer valuators
+
+ Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
+ Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit dab5b3922c50f73712a8ea0cb9742c4bc7d7ab1d
+Author: Jason Gerecke <killertofu@gmail.com>
+Date: Fri Jun 17 08:44:39 2016 -0700
+
+ xwayland: Fix whitespace errors
+
+ Substitute a few errant tab characters with eight spaces to conform to the
+ prevailing style.
+
+ Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 848089e0dde38f043c85332785520946103e77c1
+Author: Lyude Paul <cpaul@redhat.com>
+Date: Mon Jun 13 15:31:02 2016 -0400
+
+ modesetting: Clear drmmode->fb_id before unflipping
+
+ [fix copied from 40191d82370e in xf86-video-ati]
+
+ Without this, we end up setting rotated CRTCs back to their previous
+ framebuffer right after we perform a rotation. Reproducer:
+
+ - Have two monitors connected at the same resolution
+ - Rotate one monitor from normal straight to inverted
+ - Watch as the monitor you didn't rotate either freezes or shows intense
+ flickering
+
+ Signed-off-by: Lyude <cpaul@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 4313122dea0df9affc280ee698e929489061ccc6
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Jun 1 15:14:32 2016 +0200
+
+ modesetting: Only add main fb if necessary
+
+ If we're doing reverse-prime; or doing rotation the main fb is not used,
+ and there is no reason to add it in this case.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 877453212166fdc912e0d687cdecee11aba563b5
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Jun 1 15:11:05 2016 +0200
+
+ modesetting: Remove unnecessary fb addition from drmmode_xf86crtc_resize
+
+ drmmode_set_mode_major() is the only user of drmmode->fb_id and will
+ create it if necessary.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 210d83ad492f0e91889472eaae549106d9b4ebf5
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Jun 1 15:07:22 2016 +0200
+
+ modesetting: Set ppix->fb_id to 0 after removing the fb
+
+ This ensures the fb gets re-added when a shared pixmap is re-used for
+ a second drmmode_set_scanout_pixmap_cpu call.
+
+ Note currently the xserver never re-uses a shared pixmap in this way,
+ so this is mostly a sanity fix.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit b8ef71fb07a8ba9587aeaca942b4de20b59266ca
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Wed Jun 1 14:59:38 2016 +0200
+
+ modesetting: Properly cleanup fb for reverse-prime-offload
+
+ drmmode_set_scanout_pixmap_gpu(pix) adds drmmod->fb_id through a call
+ to drmmode_xf86crtc_resize(), but on a subsequent
+ drmmode_set_scanout_pixmap_gpu(NULL) it would not remove the fb.
+
+ This keeps the crtc marked as busy, which causes the dgpu to not
+ being able to runtime suspend, after an output attached to the dgpu
+ has been used once. Which causes burning through an additional 10W
+ of power and the laptop to run quite hot.
+
+ This commit adds the missing remove fb call, allowing the dgpu to runtime
+ suspend after an external monitor has been plugged into the laptop.
+
+ Note this also makes drmmode_set_scanout_pixmap_gpu(NULL) match the
+ behavior of drmmode_set_scanout_pixmap_cpu(NULL) which was already
+ removing the fb.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit 15595d29c2c3992f260a3314f26fa691f1e5cec8
+Author: Nikhil Mahale <nmahale@nvidia.com>
+Date: Thu May 26 21:50:16 2016 +0530
+
+ randr: Adjust master's last set time with slaves
+
+ In prime configurations master's last set time may not be latest
+ and greatest, adjust it with slaves last set time, pick up greatest
+ one. Otherwise xserver may end with events which has
+ lastSetTime < lastConfigTime even if that's not
+ the case and confuse xrandr client.
+
+ [hdegoede: rebase on "xrandrprovider: Do not use separate lists for unbound /
+ source / offload slaves"]
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 5c7af02b103790ac1fb6a71822788892c70290b6
+Author: Hans de Goede <hdegoede@redhat.com>
+Date: Fri May 13 15:58:10 2016 +0200
+
+ xrandrprovider: Do not use separate lists for unbound / source / offload slaves
+
+ A single provider can be both a offload and source slave at the same time,
+ the use of seperate lists breaks in this case e.g. :
+
+ xrandr --listproviders
+ Providers: number : 2
+ Provider 0: id: 0x7b cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 3 outputs: 2 associated providers: 0 name:modesetting
+ Provider 1: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 0 name:modesetting
+
+ xrandr --setprovideroutputsource 1 0x7b
+ xrandr --listproviders
+ Providers: number : 2
+ Provider 0: id: 0x7b cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 3 outputs: 2 associated providers: 1 name:modesetting
+ Provider 1: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 1 name:modesetting
+
+ xrandr --setprovideroffloadsink 1 0x7b
+ xrandr --listproviders
+ Providers: number : 3
+ Provider 0: id: 0x7b cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 3 outputs: 2 associated providers: 2 name:modesetting
+ Provider 1: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 2 name:modesetting
+ Provider 2: id: 0x46 cap: 0xf, Source Output, Sink Output, Source Offload, Sink Offload crtcs: 2 outputs: 5 associated providers: 2 name:modesetting
+
+ Not good. The problem is that the provider with id 0x46 now is on both
+ the output_slave_list and the offload_slave_list of the master screen.
+
+ This commit fixes this by unifying all 3 lists into a single slaves list.
+
+ Note that this does change the struct _Screen definition, so this is an ABI
+ break. I do not expect any of the drivers to actually use the removed / changed
+ fields so a recompile should suffice.
+
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit bab0f450a719a11799491043b82c2f293fed27fe
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Feb 14 09:58:44 2015 +0000
+
+ present: Fix presentation of flips out of order
+
+ The flip queue currently only holds events submitted to the driver for
+ flipping, awaiting the completion notifier. It is short. We therefore
+ can speed up interrupt processing by keeping the small number of events
+ ready to be flipped on the end of the flip queue. By appending the
+ events to the flip_queue in the order that they become ready, we also
+ resolve one issue causing Present to display frames out of order.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit fbe660b7652b945bdd8e3eb0780179d83cc7de96
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Sat Feb 14 09:58:43 2015 +0000
+
+ present: Improve scaling of vblank handler
+
+ With large numbers of queued vblank, the list iteration on every
+ interupt dominates processing time. If we reorder the list to be in
+ ascending event order, then not only is also likely to be in order for
+ notification queries (i.e. the notification will be near the start of
+ the list), we can also stop iterating when past the target event_id.
+
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+ Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit c6511d0142040654140bdedd6f03d43af0abba21
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Wed Oct 2 15:47:54 2013 +0200
+
+ exa: only draw valid trapezoids
+
+ Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484
+
+ If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly.
+ A similar fix should also be applied to pixman.
+
+ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 2d6230e77348e550c90e00c007b113ce38c81d12
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 14 17:09:07 2016 -0700
@@ -350,9 +7954,8 @@ Date: Tue Jun 14 17:09:07 2016 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 2d6230e77348e550c90e00c007b113ce38c81d12)
-commit 5c549168a2947c56727a7546baee21d04c46d563
+commit edd24aa50b17849b904a3ac5429e333bac9bac9c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jun 6 09:22:28 2016 +0200
@@ -365,9 +7968,205 @@ Date: Mon Jun 6 09:22:28 2016 +0200
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96246
- (cherry picked from commit edd24aa50b17849b904a3ac5429e333bac9bac9c)
-commit f05a5859102409fe203bcffa96c0231c8b406659
+commit 941aeb3b92e644923bd112eef8023f033a140ee6
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri May 13 08:58:58 2016 +0200
+
+ randr: Do not update ConnectionInfo if NULL
+
+ RRScreenSizeNotify() will update the connection information block, but
+ if this occurs during initialization before ConnectionInfo is even
+ initialized, this will lead to a crash.
+
+ Simply check for ConnectionInfo prior to update it to avoid the crash.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+
+commit 6a6bbc3b756706bdade01434f1ee8d8cbe7dd854
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu May 12 14:51:51 2016 +0200
+
+ xwayland: Restore wl_display_roundtrip() in InitInput
+
+ This partially revert commit 984be78
+
+ The rountrip in Xwayland's InitInput() is unlikely the culprit for the
+ crash reported in bug 95337, even though it's triggered from
+ InitInput().
+
+ Startup goes like this:
+
+ xwl_screen_init()
+ xwl_output_create()
+ wl_display_roundtrip()
+ InitInput()
+ wl_display_roundtrip()
+ ConnectionInfo initialized
+
+ What happens in bug 95337 is that some output data is already available
+ when we reach InitInput()'s wl_display_roundtrip() and therefore we end
+ up trying to update the ConnectionInfo's data from RR routines before
+ ConnectionInfo is actually initialized.
+
+ Removing the wl_display_roundtrip() from InitInput() will not fix the
+ issue (although it would make it less lileky to happen), because
+ xwl_screen_init() also does a wl_display_roundtrip() after creating the
+ output, so the race that led to bug 95337 remains.
+
+ However, re-setting the xwl_screen->expecting_event to 0 again in
+ InitInput() still doesn't seem right. so this part is not restored
+ (thus a partial revert).
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
+
+commit 6cb34816afa95d9214199c363f9b4bb5ecbae77b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Apr 29 14:22:52 2016 -0400
+
+ xace: Remove the audit hooks and tune dispatch
+
+ There are no in-tree consumers of the audit hooks, and they are in any
+ case redundant with the dtrace dispatch hooks. Neither is there any
+ in-tree user of the core request dispatch hook. The extension hook is
+ only used for non-default security cases, but in the absence of LTO we
+ always have to take the function call into XaceHookDispatch to find out
+ that there's no callback registered.
+
+ Cc: Eamon Walsh <ewalsh@tycho.nsa.gov>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit da9fec4eddd554b4b709ba58b4436aef5a76cd51
+Author: Eric Biggers <ebiggers3@gmail.com>
+Date: Thu Jun 9 19:45:15 2016 -0500
+
+ Allow ConstantDeceleration < 1.0
+
+ As documented in xorg.conf(5), a value of ConstantDeceleration between 0
+ and 1 will speed up the pointer. However, values less than 1 actually
+ had no effect. Fix this.
+
+ Note that this bug only affected "ConstantDeceleration" as configured
+ through xorg.conf, not "Device Accel Constant Deceleration" as configured
+ through xinput. The property handler AccelSetDecelProperty() also did
+ not need to be changed, as it did not limit the values of the property.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=92766
+
+ Signed-off-by: Eric Biggers <ebiggers3@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7cf80b9714864c3c4eb9898ff1b7d657ecd16df7
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jun 1 14:27:23 2016 -0400
+
+ xfree86: Don't swallow ±iglx command line flag
+
+ We want to notice that it's set, but still pass it through to dix.
+ Return 0 to indicate this.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4653793de3860f2d83a39919af348527bc719794
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Jun 8 17:10:11 2016 +0200
+
+ wayland: Remove unused field in xwl_screen
+
+ Can't find any reference of pointer_limbo_window in the code, let's
+ remove it.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+
+commit c69bd15e00aea2610834d05f63777f9bf20eca34
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jun 1 14:38:54 2016 +1000
+
+ Allow compile-time selection of a fallback input driver
+
+ A new --with-fallback-input-driver=foo option allows selecting a
+ fallback driver for the server if the driver configured for the device
+ is not found. Note that this only applies when the device has a driver
+ assigned and that module fails to load, devices without a driver are
+ ignored as usual.
+
+ This avoids the situation where a configuration assigns e.g. the
+ synaptics driver but that driver is not available on the system,
+ resulting in a dead device. A fallback driver can at least provides some
+ functionality.
+
+ This becomes more important as we move towards making other driver true
+ leaf nodes that can be installed/uninstalled as requested. Specifically,
+ wacom and synaptics, a config that assigns either driver should be
+ viable even when the driver itself is not (yet) installed on the system.
+
+ It is up to the distributions to make sure that the fallback driver is
+ always installed. The fallback driver can be disabled with
+ --without-fallback-input-driver and is disabled by default on non-Linux
+ systems because we don't have generic drivers on those platforms.
+ Default driver on Linux is libinput, evdev is the only other serious
+ candidate here.
+
+ Sample log output:
+ [ 3274.421] (II) config/udev: Adding input device SynPS/2 Synaptics TouchPad (/dev/input/event4)
+ [ 3274.421] (**) SynPS/2 Synaptics TouchPad: Applying InputClass "touchpad weird driver"
+ [ 3274.421] (II) LoadModule: "banana"
+ [ 3274.422] (WW) Warning, couldn't open module banana
+ [ 3274.422] (II) UnloadModule: "banana"
+ [ 3274.422] (II) Unloading banana
+ [ 3274.422] (EE) Failed to load module "banana" (module does not exist, 0)
+ [ 3274.422] (EE) No input driver matching `banana'
+ [ 3274.422] (II) Falling back to input driver `libinput'
+ .. server proceeds to assign libinput, init the device, world peace and rainbows
+ everywhere, truly what a sight. Shame about the banana though.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a6b6e8ba026acedef6336b17adf06aebddd5f22f
+Author: Dave Airlie <airlied@gmail.com>
+Date: Fri May 6 10:46:14 2016 +1000
+
+ prime: clean up slave bo properly. (v3)
+
+ This is an ABI break, in that we now pass NULL to a function that hasn't
+ accepted it before.
+
+ Alex Goins had a different patch for this but it wasn't symmetrical, it
+ freed something in a very different place than it allocated it, this
+ attempts to retain symmetry in the releasing of the backing bo.
+
+ v2: use a new toplevel API, though it still passes NULL to something
+ that wasn't expecting it.
+ v3: pass -1 instead of 0.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Tested-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+ Reviewed-by: Alex Goins <agoins at nvidia.com>
+
+commit aa5390aa83be55f887e3b4f78681b4f3d3386eb5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon May 9 14:18:32 2016 -0400
+
+ xfree86: Remove redundant parse of AIGLX server flag
+
+ Not visible in the patch, but the same stanza is repeated below inside
+ the #ifdef GLXEXT. There's no reason to bother with checking it if we
+ built without GLXEXT so remove the unconditional one.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 166d4c817897f5aa197f639bf06b5b3e04994496
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jun 3 10:25:20 2016 +0900
@@ -379,9 +8178,8 @@ Date: Fri Jun 3 10:25:20 2016 +0900
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
- (cherry picked from commit 166d4c817897f5aa197f639bf06b5b3e04994496)
-commit e4bf0e5ad5503c9a1d08080bca0b826ac64bd389
+commit d798b8318adf298bc23166e74f31e49805f0d881
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jun 3 10:25:19 2016 +0900
@@ -394,9 +8192,285 @@ Date: Fri Jun 3 10:25:19 2016 +0900
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96344
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit d798b8318adf298bc23166e74f31e49805f0d881)
-commit e02d2174570e42800c21a2205f83dd286881469f
+commit 5bcdd1cc753d8e60c249eeacba695653af1a39d8
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 7 15:52:15 2016 -0400
+
+ dix: Update some comments to reflect the new non-SIGIO input model
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 48a9b29b0a09b865492d60e8a7cd2a94864fbb3f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 7 15:52:14 2016 -0400
+
+ xfree86: Undocument UseSIGIO in xorg.conf
+
+ The doc text is wrong at this point, input processing isn't going to
+ vary based on this, so we shouldn't say it does. The only thing this
+ _does_ get used for is DRI1 SwapBuffers (on everything but savage), and
+ if you disable it you're not going to get DRI1 at all, so we really
+ shouldn't even mention it.
+
+ Still, leave the option wired up to the parser so we don't break any
+ DRI1-driver-using setup relying on it being disabled, and so we don't
+ complain about unused options elsewhere.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Acked-by: Keith Packard <keithp@keithp.com>
+
+commit 2725dd024de33e96555cbf6ff28184a64d515c3c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 7 15:52:13 2016 -0400
+
+ dri1: Hide the SIGIO details from drivers
+
+ Not being used, and not likely to be useful.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Acked-by: Keith Packard <keithp@keithp.com>
+
+commit 95ce2bccdcdc88355262674a636c342c946914da
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 7 15:52:12 2016 -0400
+
+ dmx: Remove SIGIO input support here too
+
+ This code was broken anyway. Note that DEVICE_OFF would make dmx think
+ _no_ devices were using SIGIO anymore, which means 'xinput disable' on
+ your mouse would probably do weird things to your keyboard too. Rather
+ than try to repair that and keep SIGIO working on this one niche DDX,
+ just rip it out and use the thread model like everyone else.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Acked-by: Keith Packard <keithp@keithp.com>
+
+commit 6178b1c91cfc9e860914acc6f0be2f2d2e07a124
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 7 15:52:11 2016 -0400
+
+ dix: Use OsSignal() not signal()
+
+ As the man page for the latter states:
+
+ The effects of signal() in a multithreaded process are unspecified.
+
+ We already have an interface to call sigaction() instead, use it.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 8174daa6bd3f0c792425a5ebef63a6a9ce7d00a4
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun Jun 5 12:32:19 2016 -0700
+
+ os: Do timers under input lock, not blocked signals
+
+ Timer processing can happen on either the main thread or the input
+ thread. As a result, it must be done under the input lock.
+
+ Signals are unrelated to timers now that SIGIO isn't used for input
+ processing, so stop blocking signals while processing timers.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 88e981e7088198fabea6c322c58f371d91578b6a
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Mar 9 10:33:50 2016 +0100
+
+ xwayland: sync event queue to check compositor reply
+
+ Read and dispatch pending Wayland events to make sure we do not miss a
+ possible reply from the compositor prior to discard a key repeat.
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 26ad25a0ed1d99f3cacb711793c830cb5249580e
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Mar 9 11:17:27 2016 +0100
+
+ xwayland: refactor Wayland event handling
+
+ To be able to reuse some code.
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 239705a6feefaddf90be9541a054ebd8c8c10d81
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Mar 9 10:31:58 2016 +0100
+
+ xwayland: add a server sync before repeating keys
+
+ Key repeat is handled by the X server, but input events need to be
+ processed and forwarded by the Wayland compositor first.
+
+ Make sure the Wayland compositor is actually processing events, to
+ avoid repeating keys in Xwayland while the Wayland compositor cannot
+ deal with input events for whatever reason, thus not dispatching key
+ release events, leading to repeated keys while the user has already
+ released the key.
+
+ Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=762618
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fda5675f9d257d583ea0683adf863c5e1e51e30c
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed Mar 9 10:31:13 2016 +0100
+
+ xkb: add hook to allow/deny AccessX key repeat
+
+ The xserver generates the key repeat by itself.
+
+ But when used with another server processing inputs first (e.g. a
+ Wayland compositor), the other server may be busy dealing with some
+ other things and not queue up key release events in time.
+
+ Add a vfunc in XkbSrvInfo to possibly add a check before re-emitting a
+ keypress event in the AccessX timer handler, so that the key repeat has
+ a chance to be denied if the server processing the input is not ready.
+
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3735ab965a4642273d070840bda4e827991e5219
+Merge: 7c77c42fe8 43dbc556f3
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Jun 2 07:47:16 2016 -0700
+
+ Merge remote-tracking branch 'daenzer/for-master'
+
+commit 7c77c42fe87316e5c68611f03b0bda96656c4a4c
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 27 17:36:57 2016 -0700
+
+ dix: Don't update current time in the middle of input event processing
+
+ In patch 137ac094e7ab8c871f3b36e40ad826ac797f0e26, Adam moved an
+ expensive call to UpdateCurrentTime out of the main dispatch
+ loop. That's a good change as the original fix from Chase was a bit
+ expensive. However, it breaks grab processing and so a couple of the
+ calls to UpdateCurrenTime need to be removed.
+
+ Input event processing can generate a stream of events; a button press
+ that activates a grab will send a press followed by a sequence of
+ enter/leave events. All of these should have the same time stamp on
+ the wire as they occur at the 'same' time.
+
+ More importantly, the grab time recorded in the device is pulled from
+ currentTime after all of the events are delivered, so if currentTime
+ doesn't match the time in the device event, then future grab
+ modifications will fail as the time marked in the device will be
+ 'later' than the grab time known to the client (which is defined as
+ the timestamp from the activating input event).
+
+ A bit of history here -- it used to be that currentTime was driven
+ *entirely* by input events; those timestamps didn't even have to be
+ related to the system time in any way. Then we started doing ICCCM
+ stuff and people got confused when PropertyNotify events would have
+ the same timestamp even when delivered minutes apart because no input
+ events were delivered.
+
+ We added code in the server to go update the time, but only if no
+ input events were pending (so that the clock "wouldn't" go
+ backwards). The only places where this is necessary is in request
+ processing which may generate an event with a timestamp, and there
+ only at the very top of the request processing code so that the whole
+ request would be processed at the 'same time', just like events.
+
+ cc: Chase Douglas <chase.douglas@canonical.com>
+ cc: Peter Hutterer <peter.hutterer@who-t.net>
+ cc: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ce6546337487c052b5dd3c04d3d8d4b09d691c3d
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 31 09:38:17 2016 -0700
+
+ os: Initialize NotifyFds earlier in startup
+
+ If the server calls AbortServer during the first-time initialization
+ (which can happen if you start the server on an already using
+ DISPLAY), then the dbus code will shut down and call the notify fd
+ interface. If the notify fd list hasn't been initialized, the server
+ will crash.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f0756793e4c30278164d7a5cc483ce6a311c58dc
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue May 31 09:14:17 2016 -0700
+
+ os: Lock input while messing with input device list
+
+ The list of input devices may be changed by hotplugging while the
+ server is active, and those changes may come from either the main
+ thread or the input thread. That means the list of input devices needs
+ to be protected by a mutex.
+
+ This prevents input drivers from receiving I/O ready callbacks after
+ removing a device.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a779fda224bee0c4d27636503367e55ae93b33c2
+Author: Jonas Ådahl <jadahl@gmail.com>
+Date: Tue May 24 18:46:42 2016 +0800
+
+ xwayland: Use the CLOCK_MONOTONIC clock
+
+ By default the X server will try CLOCK_MONOTONIC_COARSE before
+ CLOCK_MONOTONIC, while A Wayland compositor may only support getting
+ their timestamps from the CLOCK_MONOTONIC clock. This causes various
+ issues since it may happen that a timestamp from CLOCK_MONOTONIC
+ retrieved before a sending an X request will still be "later" than the
+ timestamp the X server than gets after receiving the request, due to the
+ fact that CLOCK_MONOTONIC_COARSE has a lower resolution.
+
+ To avoid these issues, make Xwayland always use CLOCK_MONOTONIC, so
+ that it becomes possible for Wayland compositor only supporting
+ CLOCK_MONOTONIC and X server to use the same clock.
+
+ Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
+ Acked-by: Daniel Stone <daniels@collabora.com>
+ Tested-by: Olivier Fourdan <ofourdan@redhat.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 43dbc556f3a4d743b9121d6cfc21961be4a9da56
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Thu Dec 24 16:43:44 2015 +0900
+
+ xfree86/modes: Remove xf86_reload_cursors v2
+
+ No longer needed now that xf86CursorResetCursor is getting called for
+ each CRTC configuration change.
+
+ v2: Keep xf86_reload_cursors as a deprecated empty inline function
+ until all drivers stop calling it. (Adam Jackson)
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit e156c0ccb530897d3a428255bd5585f7ea7b9b41
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Mar 30 18:23:04 2016 +0900
+
+ os: Use strtok instead of xstrtokenize in ComputeLocalClient
+
+ Fixes leaking the memory pointed to by the members of the array returned
+ by xstrtokenize.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 5ff75da317539e87cca429185d710d0eeb9d9222
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu May 26 19:01:59 2016 +0900
@@ -410,9 +8484,138 @@ Date: Thu May 26 19:01:59 2016 +0900
This fixes rendercheck regressions from the commit above.
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 5ff75da317539e87cca429185d710d0eeb9d9222)
-commit f5b224a0e20f1d44d4ab1aeeddbb4e2d40dec998
+commit 84e0d5d63c393fc36e91433cd7897e776e82528c
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri May 27 16:58:19 2016 +0900
+
+ xfree86/modes: Assign xf86_config->cursor in xf86_load_cursor_image v2
+
+ Fixes a crash on startup in the radeon driver's drmmode_show_cursor()
+ due to xf86_config->cursor == NULL, because no CRTC was enabled yet, so
+ xf86_crtc_load_cursor_image was never called.
+
+ (Also use scrn->pScreen instead of xf86ScrnToScreen(scrn))
+
+ v2: Set xf86_config->cursor at the beginning of xf86_load_cursor_image
+ instead of at the end.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 28b2c880a9dbfd91e82397a0f22482d258a8b670
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 19:11:50 2016 -0700
+
+ xfree86: Provide xf86BlockSIGIO and xf86ReleaseSIGIO as wrappers for input mutex
+
+ Threaded input doesn't use SIGIO anymore, but existing drivers using
+ xf86BlockSIGIO and xf86ReleaseSIGIO probably want to lock the input
+ mutex during those operations. Provide inline functions to do this
+ which are marked as 'deprecated' so that drivers will get warnings
+ until they are changed.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 2bed654be7001407ae65f7128440340fd3c1f083
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 19:05:13 2016 -0700
+
+ dix: Remove bogus input_mutex and input_mutex_count definitions from globals.c
+
+ These are local to inputthread.c; the ones in globals.c aren't
+ declared in any header file.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 06bdc3bc1aeca2635d0f711ac7eef34796e28339
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 01:14:59 2016 -0700
+
+ os: fix input_mutex_count off-by-one in input_force_unlock
+
+ input_force_unlock was mis-using input_mutex_lock and leaving it set
+ to -1. As this is executed from OsInit at each server generation, on
+ the second time through, the mutex would be left locked (!) due to the
+ trylock call. This caused input to fail after the first server reset.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit de3620065945f199a203afb831cac99bb8bff75b
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 27 17:51:01 2016 -0700
+
+ xfree86: Remove event reading code from xf86Wakeup
+
+ Oops. This didn't get removed when xfree86 was converted over to use
+ the input thread.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c9703007ea77a8aa5aba4e7bc7367814526056fe
+Author: Keith Packard <keithp@keithp.com>
+Date: Sat May 28 10:34:07 2016 -0700
+
+ Add ax_pthread.m4 to m4/
+
+ Threaded input requires AX_PTHREAD, which is provided by this file.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c07b796b47ae7f5a616d5e8e02ab0f84dc438a93
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 18:38:18 2016 -0700
+
+ xfree86: Bump ABI versions
+
+ threaded input can affect drivers that use OsBlockSIGIO when dealing
+ with cursors.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Requested-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 24e4c6db25aef7a057f3f384f1e2ce67e66fa40e
+Author: Keith Packard <keithp@keithp.com>
+Date: Sun May 29 18:43:00 2016 -0700
+
+ test: Actually verify that two equivalent touch points are the same
+
+ I typo'd when fixing this at Peter's request and left off the '2' from
+ the second variable name.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1338bfa81c6eddc66f07c15225c3feff062182ce
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 27 01:56:39 2016 -0700
+
+ test: Make touch test reflect new ability to realloc touch array [v2]
+
+ Threaded input allows the input code to call malloc while processing
+ events. In this case, that's in the middle of processing touch events
+ and needing to resize the touch buffer.
+
+ This test was expecting the old behaviour where touch points would get
+ dropped if the buffer was full. The fix is to check for the new
+ behaviour instead.
+
+ [v2]
+
+ * make sure two finding two equivalent touches return the same touch
+ object
+
+ * check to make sure the queue resizes by the expected amount
+
+ Changes provided by Peter Hutterer <peter.hutterer@who-t.net>
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8b9b4387e8473810f6174519ee76818fcaae725d
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 27 10:55:02 2016 -0700
@@ -428,9 +8631,222 @@ Date: Fri May 27 10:55:02 2016 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
- (cherry picked from commit 8b9b4387e8473810f6174519ee76818fcaae725d)
-commit fad7cab684199b7a0e721e59bb25b1eb6f1a9aa8
+commit 0d16a0c3b95d4ac446a07d8b95e634de5cb8055f
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu May 26 10:22:17 2016 -0700
+
+ os: Increase default client buffer to 16kB
+
+ This matches a change made in xcb and improves performance for a small
+ increase in memory usage.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+
+commit 714736124f2bfba9ede076eff3bf017f986ce6c4
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri May 27 02:02:48 2016 -0700
+
+ modesetting: Use new xf86CurrentCursor API
+
+ Use this instead of the (now deprecated) cursor pointer in the
+ xf86CrtcConfigRec.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit e69061e605c66084056cf2064dcc5d4c6c8aa0cf
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 8 14:26:50 2015 -0800
+
+ kdrive: Use threaded input
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a977c9c4d07a04c0c7b3713a21eefb92a8d3005b
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 8 14:53:08 2015 -0800
+
+ xfree86: Use threaded input mechanism [v2]
+
+ Switch the XFree86 DDX over to threaded input
+
+ v2: Rewrite comment in xf86Helper about silken mouse
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f84703b50cc908a127f4ad923ebbf56f8f244c0d
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 8 14:20:21 2015 -0800
+
+ dix: Reallocate touchpoint buffer at input event time [v2]
+
+ Now that input is threaded, malloc can be used at event time to resize
+ the touchpoint buffer as needed.x
+
+ v2: Remove "Need to grow the queue means dropping events."
+ from comment as it no longer applies. (Peter Hutterer)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e2df803fcabd7c2d2fc7991c794856378dcb5489
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 8 19:53:36 2015 -0800
+
+ mi: Grow event queue while reading events
+
+ Now that events are read at normal process time, we can use malloc to
+ grow the event queue instead of discarding events.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 30ac7567980a1eb79d084a63e0e74e1d9a3af673
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 8 11:37:51 2015 -0800
+
+ Create a threaded mechanism for input [v7]
+
+ The current SIGIO signal handler method, used at generation of input events,
+ has a bunch of oddities. This patch introduces an alternative way using a
+ thread, which is used to select() all input device file descriptors.
+
+ A mutex was used to control the access to input structures by the main and input
+ threads. Two pipes to emit alert events (such hotplug ones) and guarantee the
+ proper communication between them was also used.
+
+ Co-authored-by: Fernando Carrijo <fcarrijo@freedesktop.org>
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+ v2: Fix non-Xorg link. Enable where supported by default.
+
+ This also splits out the actual enabling of input threads to
+ DDX-specific patches which follow
+
+ v3: Make the input lock recursive
+
+ v4: Use regular RECURSIVE_MUTEXes instead of rolling our own
+ Respect the --disable-input-thread configuration option by
+ providing stubs that expose the same API/ABI.
+
+ Respond to style comments from Peter Hutterer.
+
+ v5: use __func__ in inputthread debug and error mesages.
+
+ Respond to style comments from Peter Hutterer.
+
+ v6: use AX_PTHREAD instead of inlining pthread tests.
+
+ Suggested by Emil Velikov <emil.l.velikov@gmail.com>
+
+ v7: Use pthread_sigmask instead of sigprocmask when using threads
+
+ Suggested by Adam Jackson <ajax@redhat.com>
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit 728c9570a05f03bd90343ff6f5b1a8fd3988864c
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Dec 9 14:27:05 2015 -0800
+
+ xkb: Hold input lock across injected key event processing
+
+ This makes the code more consistent with other versions of
+ out-of-queue event processing
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 05d549d60440126105d5a70272e72ea2319724bd
+Author: Keith Packard <keithp@keithp.com>
+Date: Thu Dec 17 22:21:46 2015 -0800
+
+ xfree86: Remove unnecessary errno save/restore in xf86ReadInput
+
+ When this code was called from SIGIO, saving and restoring errno could
+ possibly have made sense in some strange environment. Now that this
+ will not be called from a signal handler, there is no reason to do that.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0bbb5aabf794720fa99ae5ea3f55138ded159705
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon May 16 21:33:41 2016 -0500
+
+ kdrive: Don't lock input across read in KdNotifyFd
+
+ We won't need these locks with the new threaded input code as it holds
+ the input lock across all of the input device I/O operations.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99
+Author: Keith Packard <keithp@keithp.com>
+Date: Tue Dec 8 14:39:46 2015 -0800
+
+ Remove SIGIO support for input [v5]
+
+ This removes all of the SIGIO handling support used for input
+ throughout the X server, preparing the way for using threads for input
+ handling instead.
+
+ Places calling OsBlockSIGIO and OsReleaseSIGIO are marked with calls
+ to stub functions input_lock/input_unlock so that we don't lose this
+ information.
+
+ xfree86 SIGIO support is reworked to use internal versions of
+ OsBlockSIGIO and OsReleaseSIGIO.
+
+ v2: Don't change locking order (Peter Hutterer)
+ v3: Comment weird && FALSE in xf86Helper.c
+ Leave errno save/restore in xf86ReadInput
+ Squash with stub adding patch (Peter Hutterer)
+ v4: Leave UseSIGIO config parameter so that
+ existing config files don't break (Peter Hutterer)
+ v5: Split a couple of independent patch bits out
+ of kinput.c (Peter Hutterer)
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 8cf832c288dec13cbf3c25478a8ccef52d61f3db
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon May 16 21:28:48 2016 -0500
+
+ kdrive: Remove unneeded AddEnabledDevice/RemoveEnabledDevice calls
+
+ kdrive uses the NotifyFd interface, which handles all of the necessary
+ fd configuration in the OS layer. Having it also use the old
+ EnableDevice interfaces is incorrect.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 4fca18dc03669bada75175df289fbee41275208e
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon May 9 13:28:08 2016 -0400
+
+ xfree86: Add IndirectGLX server flag (v2)
+
+ Not all display managers make it easy (or possible) to modify the
+ command line flags passed to the server, so add a way to get to it from
+ xorg.conf.
+
+ v2: Fix the FlagOptions list to not have IGLX after the terminator (Alan
+ Coopersmith)
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 181a4bd0cc436f89582408196038ff37032f9bac
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 16:19:38 2016 -0700
@@ -455,11 +8871,11 @@ Date: Fri May 13 16:19:38 2016 -0700
This fixes incorrect rendering in firefox for this page:
- https://gfycat.com/HoarseCheapAmericankestrel
+ https://gfycat.com/HoarseCheapAmericankestrel
while not breaking rendering for this page:
- https://feedly.com
+ https://feedly.com
v2: Add change accidentally left in patch for missing
glDisable(GL_COLOR_LOGIC_OP).
@@ -468,9 +8884,8 @@ Date: Fri May 13 16:19:38 2016 -0700
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=63397
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 181a4bd0cc436f89582408196038ff37032f9bac)
-commit 0c9a6d4093d6cdfadecb9a703cfb090e43ccf6aa
+commit b07bc700b3cf2f5c8912fc5b9e0dad2baf395525
Author: Keith Packard <keithp@keithp.com>
Date: Sat May 14 08:22:17 2016 -0700
@@ -480,9 +8895,8 @@ Date: Sat May 14 08:22:17 2016 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit b07bc700b3cf2f5c8912fc5b9e0dad2baf395525)
-commit e63e9b8f197889b6c162ba36988d6e5656cb0c10
+commit 743b6f231e999d8b2909228412266dc13cc433c5
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 04:25:43 2016 -0700
@@ -502,9 +8916,33 @@ Date: Fri May 13 04:25:43 2016 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 743b6f231e999d8b2909228412266dc13cc433c5)
-commit d37329cba42fa8e72fe4be8a7be18e512268b5bd
+commit f5670b4a7eb3b43fa20017f89192394930eae6f4
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Mar 9 11:13:14 2016 -0800
+
+ xfree86: Set xf86CrtcConfigRec cursor pointer to NULL in HideCursor
+
+ This makes the cursor pointer held by xf86Cursors.c get reset to NULL
+ whenever the cursor isn't displayed, and means that the reference
+ count held in xf86Cursor.c is sufficient to cover the reference in
+ xf86Cursors.c.
+
+ As HideCursor may be called in the cursor loading path after
+ UseHWCursor or UseHWCursorARGB when HARDWARE_CURSOR_UPDATE_UNHIDDEN
+ isn't set in the Flags field, the setting of the cursor pointer had to
+ be moved to the LoadCursor paths.
+
+ LoadCursorARGBCheck gets the cursor pointer, but LoadCursorImageCheck
+ does not. For LoadCursorImageCheck, I added a new function,
+ xf86CurrentCursor, which returns the current cursor. With this new
+ function, we can eliminate the cursor pointer from the
+ xf86CrtcConfigRec, once drivers are converted over to use it.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit b64108fa305e956e4edaae9d53071ff0abee268e
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed May 25 19:09:23 2016 +0900
@@ -517,9 +8955,8 @@ Date: Wed May 25 19:09:23 2016 +0900
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
- (cherry picked from commit b64108fa305e956e4edaae9d53071ff0abee268e)
-commit 009304ef129f21b286086f3c841b60c5f865241a
+commit 4711ebc174206b5a50e6ae8a7f974cd835e4ebd3
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue May 24 18:12:42 2016 +0900
@@ -538,9 +8975,67 @@ Date: Tue May 24 18:12:42 2016 +0900
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94514
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
- (cherry picked from commit 4711ebc174206b5a50e6ae8a7f974cd835e4ebd3)
-commit 888e5f636a32945b0a1f59d6db6e143d094cc2a0
+commit 4d649d51770cace4d7c1e51d9a199ac7a056c30a
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 18 16:03:48 2016 -0500
+
+ mi: Remove miPointerRec from API
+
+ This moves the definition of miPointerRec from mipointrst.h to
+ mipointer.c so that it is no longer visible in the API, allowing it to
+ be changed while the API/ABI is frozen.
+
+ Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 3f9015b6dc9e7e9c97f8717dea6af9f4d8523f2e
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed May 18 16:03:47 2016 -0500
+
+ xwayland: Move sprite invalidation logic into mipointer
+
+ This creates a function that invalidates the current sprite and forces
+ a sprite image reload the next time the sprite is checked, moving that
+ logic out of the xwayland sources and allowing the miPointerRec
+ structure to be removed from the server API.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+
+commit 4e124203f2260daaf54155f4a05fe469733e0b97
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue May 3 11:24:58 2016 -0400
+
+ damage: Make damageRegionProcessPending take a damage not a drawable
+
+ In the case where there's no damage monitor on the drawable, we look
+ that fact up twice: once before rendering to decide whether to compute
+ damage, and again after to decide whether to append it. This is wasted
+ effort, as the layer below us is effectively not allowed to change
+ whether there's a damage monitor for the drawable, but there's no way
+ the compiler can know that.
+
+ Instead, look it up once up front, and change the check macros and
+ damageRegionProcessPending to take a damage not a drawable.
+
+ v2: Explicitly pass pDamage to the macros as well (Michel Dänzer)
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 1bb932bf1417ff319a594d7e40f6813a26936784
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat May 7 00:43:33 2016 -0700
+
+ XQuartz: Fix default CFBundleVersion
+
+ m4/shell variable name collision broke the case when the configure
+ option was not used
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 2fbf5c2f91d33efbda573c4be036248b1d8ed7f1
Author: Andrew Comminos <andrew@comminos.com>
Date: Tue Dec 29 23:41:27 2015 -0800
@@ -555,193 +9050,152 @@ Date: Tue Dec 29 23:41:27 2015 -0800
Signed-off-by: Andrew Comminos <andrew@comminos.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 2fbf5c2f91d33efbda573c4be036248b1d8ed7f1)
-commit 81bd4fc18c407ebe8e535ffbe83b7578261e1643
-Author: Michel Dänzer <michel.daenzer@amd.com>
-Date: Fri Apr 1 18:24:00 2016 +0900
+commit 984be789d5935bc7f695dc61234ef0251ed33679
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed May 11 09:15:19 2016 +0200
- EXA: Honour op parameter to exaGlyphs even if maskFormat == NULL
+ xwayland: don't check events as early as InitInput
- Reported-by: Uli Schlachter <psychon@znc.in>
-
- Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94775
- Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- Reviewed-by: Uli Schlachter <psychon@znc.in>
- (cherry picked from commit 140c2f1a54dbc2503311e9a011e841aa1f277cbd)
-
-commit e849aecb65aabe2fc6abeab6e0ab0a721710c25c
-Author: Andreas Schwab <schwab@suse.de>
-Date: Thu Apr 28 14:47:33 2016 +0200
-
- x86emu: Change include order to avoid conflict with system header
+ If data is received during XWayland startup, it will be read early in
+ InitInput() before the connection data is initialized, causing a crash.
- R_SP is also defined in <sys/ucontext.h> on m68k. Also remove duplicate
- definitions.
+ Remove the wayland rountrips from InitInput() as this is done again in
+ xwl_screen_init() where it seems more appropriate.
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337
Reviewed-by: Adam Jackson <ajax@redhat.com>
- Signed-off-by: Andreas Schwab <schwab@suse.de>
- (cherry picked from commit 23dfa017298ceceac818f83779858e490c7757b6)
-commit 0f947779c7afcdaf246849b627c13a11987a4bbf
-Author: Dave Airlie <airlied@redhat.com>
-Date: Fri Mar 11 09:22:00 2016 +1000
+commit 3f569435e10df515c6f86289dc986bfc59c6bc18
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 31 16:56:44 2016 -0400
- glamor: add glamor_finish API
+ glx: Stop tracking hasUnflushedCommands
- Some drivers are calling glFinish, they really should be doing this.
+ This is only meaningful for indirect contexts, and all it does is
+ (maybe) prevent a flush when switching away from an indirect context.
+ Indirect contexts aren't worth optimizing for, and Mesa tracks whether
+ a flush is needed anyway.
- This also is needed for some reverse prime scenarios.
+ Careful readers will note that ReadPixels would reset the flag even
+ though it doesn't imply a flush!
- Signed-off-by: Dave Airlie <airlied@redhat.com>
- Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit aa4e757130010dd3202f10ec6cb0c306c1dbcfbc)
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit d25bb3ae9de1661ed0988a44119abeb52d52d4b7
-Author: Marek Chalupa <mchqwerty@gmail.com>
-Date: Mon Apr 25 11:33:00 2016 +0200
+commit 0ebb58f6b6f66afbc3a48bd10693fe190aed8694
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 31 16:20:40 2016 -0400
- xwayland-shm: fortify fallocate against EINTR
-
- If posix_fallocate or ftruncate is interrupted by signal while working,
- we return -1 as fd and the allocation process returns BadAlloc error.
- That causes xwayland clients to abort with 'BadAlloc (insufficient
- resources for operation)' even when there's a lot of resources
- available.
+ glx: Remove some redundant zero-init of GLX context state
- Fix it by trying again when we get EINTR.
+ The context is already calloc'd.
- Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
- Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
- (cherry picked from commit f48b0534f110397246809d279225afedb28aa233)
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit acbfff1d3b27bb71faf2fe95061de8414b536004
-Author: Alexandre Courbot <acourbot@nvidia.com>
-Date: Wed Mar 23 13:47:37 2016 +0900
+commit d5ba09598210063926aeff55ac58d2b7020d9a03
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 31 15:51:39 2016 -0400
- configure.ac: Keep environment CFLAGS when testing
-
- DRI2 detection could fail if configure is invoked with a sysroot passed
- as CFLAGS. Ideally configure should invoke gcc with the sysroot argument
- passed to the configure script, but for some reason this is not done by
- AC_COMPILE_IFELSE.
+ glx/dri2: Implement dri2FlushFrontBuffer explicitly
- Fix this by ensuring CFLAGS are preserved when checking for stuff.
+ No functional change.
- Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
- Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
- (cherry picked from commit 4cc32880737c2d3e568fdb4867b2dba10fb3998a)
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 1c811298eb953bb56e2ca05b1a881f88c0703df3
-Author: Simon Thum <simon.thum@gmx.de>
-Date: Tue Apr 5 14:29:47 2016 +0200
+commit 0ba4e251a1012bd5a2eab83e2c51006ec3805394
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 31 15:50:34 2016 -0400
- dix/ptraccel: Fix memory leak in InitPredictableAccelerationScheme
-
- This was quite unlikely except in situations where a proper startup
- would have been impossible anyway, but since automated checks don't
- grade likelyhood just fix it.
+ glx: Code motion
- Detected by Jeremy Huddleston's clang checks.
+ No functional change, just rearranging some code to make later commits
+ more obvious.
- Signed-off-by: Simon Thum <simon.thum@gmx.de>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit c8e5fc30575a309c25970fc68b9184c07bb74df4)
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 51441379a35077e868dae86e6b24cfa31d6dd1f8
-Author: Olivier Fourdan <ofourdan@redhat.com>
-Date: Thu Mar 17 09:53:58 2016 +0100
+commit f523ebb5492a2e12b76a8b5b7f1b0e5efd4a8040
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Apr 18 12:56:17 2016 -0400
- glamor: fix wrong offset on composite rectangles
+ dix: Remove pointless client-state callbacks
- When using PictOpSrc, the destination is wrongly shifted back to (0, 0).
+ Private storage is pre-zeroed by the private system itself.
- Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94568
- Reviewed-by: Adam Jackson <ajax@redhat.com>
- Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 8437955515ad59b0bfcd6598248e7f0ffc706370)
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
-commit 713a21cc702561931ed5e84c3a5c3d7e7c580725
-Author: Hans de Goede <hdegoede@redhat.com>
-Date: Tue Jun 14 11:58:01 2016 +0200
+commit 140c2f1a54dbc2503311e9a011e841aa1f277cbd
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Apr 1 18:24:00 2016 +0900
- modesetting: Load on GPU-s with 0 outputs
+ EXA: Honour op parameter to exaGlyphs even if maskFormat == NULL
- In newer laptops with switchable graphics, the GPU may have 0 outputs,
- in this case the modesetting driver should still load if the GPU is
- SourceOffload capable, so that it can be used as an offload source provider.
+ Reported-by: Uli Schlachter <psychon@znc.in>
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
- (cherry picked from commit 60ad701a6a8cb9f1eacb72acfe2cb8d3b7a865dc)
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94775
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Uli Schlachter <psychon@znc.in>
-commit a9f970fe28d76bd2c57b44aa02ac38eb8aab8acf
-Author: Hans de Goede <hdegoede@redhat.com>
-Date: Thu Jun 16 15:21:03 2016 +0200
+commit 7f0494671f95cfa33f6f2c7c74b20a21f239f8c5
+Author: Dave Airlie <airlied@redhat.com>
+Date: Fri May 6 05:41:58 2016 +1000
- modesetting: Fix swapping of provider sink / source capabilities
+ modesetting: fix build with glamor disabled.
- When a card has import capability it can be an offload _sink_, not
- a source and vice versa for export capability.
+ Fix build without --enable-glamor.
- This commit fixes the modesetting driver to properly set these
- capabilities, this went unnoticed sofar because most gpus have both
- import and export capability.
+ Caught by the arm tinderbox.
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
- (cherry picked from commit 94a1c77259ce39ba59ad87615df39b570ffab435)
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
+ Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-commit 0dc1a58b9379c79ede8c40b2e6f008dc0868a40e
-Author: Lyude Paul <cpaul@redhat.com>
-Date: Mon Jun 13 15:31:02 2016 -0400
+commit 66fdeb880aac0966be9aa41219047ade0148c35f
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Mon May 2 23:47:22 2016 +0100
- modesetting: Clear drmmode->fb_id before unflipping
+ xfree86: drop unneeded strdup for modulepath/logfile
- [fix copied from 40191d82370e in xf86-video-ati]
+ The destination variable is never freed, thus we even plug some memory
+ leaks.
- Without this, we end up setting rotated CRTCs back to their previous
- framebuffer right after we perform a rotation. Reproducer:
+ v2: Rebase against updated xf86CheckPrivs() helper.
- - Have two monitors connected at the same resolution
- - Rotate one monitor from normal straight to inverted
- - Watch as the monitor you didn't rotate either freezes or shows intense
- flickering
-
- Signed-off-by: Lyude <cpaul@redhat.com>
- Reviewed-by: Hans de Goede <hdegoede@redhat.com>
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 848089e0dde38f043c85332785520946103e77c1)
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-commit 619730cac614ff8306e17edd07ae860051c700b7
-Author: Hans de Goede <hdegoede@redhat.com>
-Date: Wed Jun 1 14:59:38 2016 +0200
+commit 032b1d79b7d04d47814a5b3a9fdd162249fea74c
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Mon May 2 23:47:21 2016 +0100
- modesetting: Properly cleanup fb for reverse-prime-offload
+ xfree86: use the xf86CheckPrivs() helper for modulepath/logfile
- drmmode_set_scanout_pixmap_gpu(pix) adds drmmod->fb_id through a call
- to drmmode_xf86crtc_resize(), but on a subsequent
- drmmode_set_scanout_pixmap_gpu(NULL) it would not remove the fb.
+ v2: Rebase against updated xf86CheckPrivs() helper.
- This keeps the crtc marked as busy, which causes the dgpu to not
- being able to runtime suspend, after an output attached to the dgpu
- has been used once. Which causes burning through an additional 10W
- of power and the laptop to run quite hot.
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 0fdd47560468e7b6147c666cc6b9eebcecb68572
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Mon May 2 23:47:20 2016 +0100
+
+ xfree86: factor out the check priviliges and print a big warning
- This commit adds the missing remove fb call, allowing the dgpu to runtime
- suspend after an external monitor has been plugged into the laptop.
+ Current message was quite off "file specified must be a relative path"
+ and alike. Just factor it out and use "path/file" as needed.
- Note this also makes drmmode_set_scanout_pixmap_gpu(NULL) match the
- behavior of drmmode_set_scanout_pixmap_cpu(NULL) which was already
- removing the fb.
+ v2: Rework error message, drop "Using default", print actual arg value.
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit b8ef71fb07a8ba9587aeaca942b4de20b59266ca)
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-commit 768e40e6c41dba3c7039db437d7b5be36f1477f5
+commit 2378adde6770385c06f7efcd32f270d00d49ce3f
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:33 2016 +1000
@@ -753,9 +9207,8 @@ Date: Fri Apr 29 14:01:33 2016 +1000
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 2378adde6770385c06f7efcd32f270d00d49ce3f)
-commit 69f9319568609f23cf313995cd65400180de9345
+commit 258588224d6b35de12f97d9092efa5cb3e426550
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:32 2016 +1000
@@ -767,9 +9220,8 @@ Date: Fri Apr 29 14:01:32 2016 +1000
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 258588224d6b35de12f97d9092efa5cb3e426550)
-commit 5b4ced6d3a4c309e1792ac49017fb961a7262e7f
+commit a41a171bcbae9aeafac2865faa904f15d9b59925
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:31 2016 +1000
@@ -779,9 +9231,8 @@ Date: Fri Apr 29 14:01:31 2016 +1000
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit a41a171bcbae9aeafac2865faa904f15d9b59925)
-commit cbbf4b0da098636e3d23407d62c3f41402c3f401
+commit fc1f61b75c9712e24ff665f95d62771f39eba1c7
Author: Dave Airlie <airlied@gmail.com>
Date: Fri Apr 29 14:01:30 2016 +1000
@@ -791,9 +9242,54 @@ Date: Fri Apr 29 14:01:30 2016 +1000
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit fc1f61b75c9712e24ff665f95d62771f39eba1c7)
-commit cc7c0b0e3c7f7af624c3b1bc360f7c6ff99ea3be
+commit 2d0f151c6195ba94d0320b55227a108e6301a74c
+Author: Alex Goins <agoins@nvidia.com>
+Date: Fri Apr 29 14:01:29 2016 +1000
+
+ modesetting: Consistent whitespace in driver.c
+
+ For some reason a couple of the dirty functions in driver.c used 8
+ spaces per tab instead of 4 like the rest of the file. Fix this to make
+ it more consistent and give me more room to work in ms_dirty_update in
+ subsequent commits.
+
+ v1: N/A
+ v2: N/A
+ v3: N/A
+ v4: Initial commit
+
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 137ac094e7ab8c871f3b36e40ad826ac797f0e26
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Apr 1 22:44:26 2016 -0400
+
+ dix: Push UpdateCurrentTimeIf down out of the main loop
+
+ This was added in:
+
+ commit 312910b4e34215aaa50fc0c6092684d5878dc32f
+ Author: Chase Douglas <chase.douglas@canonical.com>
+ Date: Wed Apr 18 11:15:40 2012 -0700
+
+ Update currentTime in dispatch loop
+
+ Unfortunately this is equivalent to calling GetTimeInMillis() once per
+ request. In the absolute best case (as on Linux) you're only hitting the
+ vDSO; on other platforms that's a syscall. Either way it puts a pretty
+ hard ceiling on request throughput.
+
+ Instead, push the call down to the requests that need it; basically,
+ grab processing and event generation.
+
+ Cc: Chase Douglas <chase.douglas@canonical.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit ac164e58870d70640381e68b776eb95578c7fbd3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed May 4 20:36:18 2016 +1000
@@ -827,9 +9323,222 @@ Date: Wed May 4 20:36:18 2016 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
- (cherry picked from commit ac164e58870d70640381e68b776eb95578c7fbd3)
-commit bcb633cae6c976b3416c736acab71c065adf5ee7
+commit 059d5ef30490233f410ca87084c7697b87e5b05e
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue May 3 23:43:06 2016 -0700
+
+ XQuartz: Update copyright years
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit d6ba4f2c52da150a9a92bdb00efe7902d17033bd
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue May 3 23:42:34 2016 -0700
+
+ XQuartz: Add --with-bundle-version and --with-bundle-version-string configure options
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit c1614928c10a8f8400f99acfd1b7f96d503af7ec
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue May 3 23:21:38 2016 -0700
+
+ XQuartz: Add --with-sparkle-feed-url configure option
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 299b01eabf827a7435b5d6004d50637ac710bbc7
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue May 3 23:14:24 2016 -0700
+
+ XQuartz: Update release feed URL to use new https URL
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 16d6733c63727d910eb516d7f6950f4675281f2d
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue May 3 23:24:44 2016 -0700
+
+ XQuartz: Fix the help text for --with-bundle-id-prefix
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 214a66b661dcb56ebb9776e34049753f65c7510a
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Tue May 3 23:16:46 2016 -0700
+
+ XQuartz: Remove --with-launchd-id-prefix
+
+ It's been deprecated for years.
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 2285fe78c04714561a0d1a164a41a38c48263f89
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Apr 22 15:04:37 2016 +1000
+
+ xfree86: add support for MatchIsTabletPad
+
+ The tablet pads have been separate kernel devices for a while now and
+ libwacom has labelled them with the udev ID_INPUT_TABLET_PAD for over a year
+ now. Add a new MatchIsTabletPad directive to apply configuration options
+ specifically to the Pad part of a tablet.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit fa02b05645080c285da5972262a8d37403e39d7e
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue May 3 06:54:57 2016 +1000
+
+ modesetting: port clean start code from amdgpu. (v2)
+
+ Both radeon and amdgpu don't set the mode until the first blockhandler,
+ this means everything should be rendered on the screen correctly by
+ then.
+
+ This ports this code, it also removes the tail call of EnterVT from
+ ScreenInit, it really isn't necessary and causes us to set a dirty mode
+ with -modesetting always anyways.
+
+ v2: reorder set desired modes vs block handler as done for amdgpu.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit caabc4e85540dcd4225f2780b5616f7d870fbb06
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue May 3 06:54:56 2016 +1000
+
+ modesetting: add support for background none.
+
+ This adds support using glamor for background None.
+
+ loosely based off the amdgpu code. relies on the glamor_finish code.
+
+ Acked-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit c33250945b45adc447154239f0cf48fb9b2d7335
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Apr 8 11:26:36 2016 -0400
+
+ kdrive: Nuke a bunch of dead code
+
+ gcc6 says:
+
+ keyboard.c:46:21: warning: ‘linux_to_x’ defined but not used
+
+ Only referenced by a bunch of long if-0'd code, so chuck it all out.
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit a5dd7b890f4f3a5245639591c73303c5a087b38a
+Author: Adam Jackson <ajax@redhat.com>
+Date: Fri Apr 8 11:24:50 2016 -0400
+
+ dix: Squash some new gcc6 warnings
+
+ -Wlogical-op now tells us:
+
+ devices.c:1685:23: warning: logical ‘and’ of equal expressions
+
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 23dfa017298ceceac818f83779858e490c7757b6
+Author: Andreas Schwab <schwab@suse.de>
+Date: Thu Apr 28 14:47:33 2016 +0200
+
+ x86emu: Change include order to avoid conflict with system header
+
+ R_SP is also defined in <sys/ucontext.h> on m68k. Also remove duplicate
+ definitions.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Andreas Schwab <schwab@suse.de>
+
+commit aa4e757130010dd3202f10ec6cb0c306c1dbcfbc
+Author: Dave Airlie <airlied@redhat.com>
+Date: Fri Mar 11 09:22:00 2016 +1000
+
+ glamor: add glamor_finish API
+
+ Some drivers are calling glFinish, they really should be doing this.
+
+ This also is needed for some reverse prime scenarios.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit f48b0534f110397246809d279225afedb28aa233
+Author: Marek Chalupa <mchqwerty@gmail.com>
+Date: Mon Apr 25 11:33:00 2016 +0200
+
+ xwayland-shm: fortify fallocate against EINTR
+
+ If posix_fallocate or ftruncate is interrupted by signal while working,
+ we return -1 as fd and the allocation process returns BadAlloc error.
+ That causes xwayland clients to abort with 'BadAlloc (insufficient
+ resources for operation)' even when there's a lot of resources
+ available.
+
+ Fix it by trying again when we get EINTR.
+
+ Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
+ Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
+
+commit 4cc32880737c2d3e568fdb4867b2dba10fb3998a
+Author: Alexandre Courbot <acourbot@nvidia.com>
+Date: Wed Mar 23 13:47:37 2016 +0900
+
+ configure.ac: Keep environment CFLAGS when testing
+
+ DRI2 detection could fail if configure is invoked with a sysroot passed
+ as CFLAGS. Ideally configure should invoke gcc with the sysroot argument
+ passed to the configure script, but for some reason this is not done by
+ AC_COMPILE_IFELSE.
+
+ Fix this by ensuring CFLAGS are preserved when checking for stuff.
+
+ Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+
+commit 16e4bce9e5257c50c80c66efee0d07c2483619e1
+Author: Simon Thum <simon.thum@gmx.de>
+Date: Fri Apr 8 13:24:39 2016 +0200
+
+ dix/ptraccel: Remove float literals
+
+ This was fine back when valuators were integer. Device
+ properties are float (not double), so some instances remain.
+
+ Signed-off-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c8e5fc30575a309c25970fc68b9184c07bb74df4
+Author: Simon Thum <simon.thum@gmx.de>
+Date: Tue Apr 5 14:29:47 2016 +0200
+
+ dix/ptraccel: Fix memory leak in InitPredictableAccelerationScheme
+
+ This was quite unlikely except in situations where a proper startup
+ would have been impossible anyway, but since automated checks don't
+ grade likelyhood just fix it.
+
+ Detected by Jeremy Huddleston's clang checks.
+
+ Signed-off-by: Simon Thum <simon.thum@gmx.de>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f641ae412287ecb7a3437987e2ba1646a8443aa4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Mar 9 10:45:48 2016 +1000
@@ -842,90 +9551,183 @@ Date: Wed Mar 9 10:45:48 2016 +1000
https://bugzilla.redhat.com/show_bug.cgi?id=1282252
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit f641ae412287ecb7a3437987e2ba1646a8443aa4)
-commit da4c6e1aaae6f564cbde7981898582018108622e
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sat Feb 14 09:58:44 2015 +0000
+commit 577bebe2067293bb154068e99a2ef085b066cb67
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Sun Apr 17 20:30:46 2016 +0100
- present: Fix presentation of flips out of order
+ xfree86/parser: simplify #ifdef ladder
- The flip queue currently only holds events submitted to the driver for
- flipping, awaiting the completion notifier. It is short. We therefore
- can speed up interrupt processing by keeping the small number of events
- ready to be flipped on the end of the flip queue. By appending the
- events to the flip_queue in the order that they become ready, we also
- resolve one issue causing Present to display frames out of order.
+ Rather than 'hacking' around symbol names and providing macros such as
+ 'Local' just fold things and make the code more readable.
- Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
- Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit bab0f450a719a11799491043b82c2f293fed27fe)
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-commit 1a3577259f7d3d4c91f8a6eff1a5d466dabb45ee
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sat Feb 14 09:58:43 2015 +0000
+commit 537276a5b86b7341169ea4eb36d479a503ba5d84
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Sun Apr 17 20:30:45 2016 +0100
- present: Improve scaling of vblank handler
+ xfree86/parser: reuse StringToToken() in xf86getToken()
- With large numbers of queued vblank, the list iteration on every
- interupt dominates processing time. If we reorder the list to be in
- ascending event order, then not only is also likely to be in order for
- notification queries (i.e. the notification will be near the start of
- the list), we can also stop iterating when past the target event_id.
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 944ea03d5be2ffe22a3f1c4c287760261c31235f
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Sun Apr 17 20:30:44 2016 +0100
+
+ xfree86/parser: move StringToToken() definition further up
- Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
- Reviewed-and-tested-by: Mario Kleiner <mario.kleiner.de@gmail.com>
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit fbe660b7652b945bdd8e3eb0780179d83cc7de96)
+ ... so that we can use it without the forward declaration. Plus we're
+ doing to reuse it in the next commit ;-)
+
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
-commit db258a27f021c80281ed4f89df897dfda0ffce9f
-Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Date: Wed Oct 2 15:47:54 2013 +0200
+commit b93be14b7d339e4e46d941729dad853452fae8c0
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Sun Apr 17 20:30:43 2016 +0100
- exa: only draw valid trapezoids
+ xfree86/parser: annotate xf86ConfigSymTabRec as constant data
- Fixes freedesktop.org bug https://bugs.freedesktop.org/show_bug.cgi?id=67484
+ Add the const notation to all the static storage as well as the
+ functions that use it - xf86getToken(), xf86getSubTokenWithTab(),
+ StringToToken() and xf86getStringToken().
- If t->bottom is close to MIN_INT, removing top can wraparound, so do the check properly.
- A similar fix should also be applied to pixman.
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+
+commit 3981dcdd489b60fbf356534a509ca93dcbedf769
+Author: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Sun Apr 17 20:34:43 2016 +0100
+
+ dri3: remove unused file dri3int.h
- Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
- Reviewed-by: Hans de Goede <hdegoede@redhat.com>
- Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit c6511d0142040654140bdedd6f03d43af0abba21)
+ Copied during the prototyping stage and never used.
+
+ Cc: Keith Packard <keithp@keithp.com>
+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-commit 62bf33d0d105beb257619ef6b77919d01b04d401
+commit a1b13cda6169a98d694451fec75e63352e9d90bd
Author: Adam Jackson <ajax@redhat.com>
-Date: Wed Jun 1 14:27:23 2016 -0400
+Date: Wed Jan 6 09:09:21 2016 -0500
- xfree86: Don't swallow ±iglx command line flag
+ xfree86: Remove xf86RegisterRootWindowProperty
- We want to notice that it's set, but still pass it through to dix.
- Return 0 to indicate this.
+ All consumers have been ported to the root window callback, so this can
+ all be nuked.
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 7cf80b9714864c3c4eb9898ff1b7d657ecd16df7)
-commit d7ae950c1d08724144514151afe47a3fd8e84f3c
+commit e89c7f1c2a0ea3480b21446e413073c1427285ae
Author: Adam Jackson <ajax@redhat.com>
-Date: Mon May 9 13:28:08 2016 -0400
+Date: Wed Jan 6 09:04:15 2016 -0500
- xfree86: Add IndirectGLX server flag (v2)
+ xfree86: Create EDID atom from the root window callback (v2)
- Not all display managers make it easy (or possible) to modify the
- command line flags passed to the server, so add a way to get to it from
- xorg.conf.
+ v2: Fix swapped callback args
- v2: Fix the FlagOptions list to not have IGLX after the terminator (Alan
- Coopersmith)
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 8e3010d7d8e8c49c8859b576de1808ae7b2859be
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 6 08:54:47 2016 -0500
+
+ xfree86: Remove a never-hit diagnostic message
- Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Practically speaking, the EDID major version is never not 1.
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 7961377567f15dfad9d96c5c0a0992b38013d973
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 6 08:47:37 2016 -0500
+
+ xfree86: Make xf86SetDDCproperties work more than once (v2)
+
+ We can call this more than once via xf86OutputSetEDID since hotplug is
+ actually a thing in RANDR 1.2, but xf86RegisterRootWindowProperty merely
+ adds the data to a list to be applied to the root at CreateWindow time,
+ so calls past the first (for a given screen) would have no effect until
+ server regen.
+
+ Once we've initialised pScrn->pScreen is filled in, so we can just set
+ the property directly.
+
+ v2: Removed pointless version check, deobfuscate math (Walter Harms)
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 4fca18dc03669bada75175df289fbee41275208e)
-commit 02f9b3c18f6561d47b518bdcd6043a0ec8995c32
+commit 8be83fff04a009109a956837ca983a96fd279711
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 6 08:35:43 2016 -0500
+
+ xfree86: Remove some leftovers from DisplayID support
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 0cd2a24b61ef1583fc6b3fec7d01c7481cc97d52
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 6 08:30:07 2016 -0500
+
+ xfree86: Unexport xf86Initialising, remove xf86ServerIsInitialising
+
+ Neither of these are used from outside the server.
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit e70ee11a39b957141fbc565d79d128a46fac5f34
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 5 16:27:41 2016 -0500
+
+ xfree86: Create VT atoms from the root window callback (v2)
+
+ v2: Fix swapped callback args
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit da9ee1eddd65d00788cef8a3becfad948c0a2168
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 5 16:11:42 2016 -0500
+
+ xfree86: Create seat atom from the root window callback (v2)
+
+ v2: Fix swapped callback args
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2c3a3afb5104714b637c1c4aea195df73e0fa918
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 5 15:56:42 2016 -0500
+
+ dix: Add RootWindowFinalizeCallback
+
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 8437955515ad59b0bfcd6598248e7f0ffc706370
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date: Thu Mar 17 09:53:58 2016 +0100
+
+ glamor: fix wrong offset on composite rectangles
+
+ When using PictOpSrc, the destination is wrongly shifted back to (0, 0).
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94568
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+
+commit e8e5d839968e22cf42a6e1982a07b02c6f4a4562
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Apr 1 13:38:11 2016 +0200
@@ -945,115 +9747,276 @@ Date: Fri Apr 1 13:38:11 2016 +0200
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit e8e5d839968e22cf42a6e1982a07b02c6f4a4562)
-commit a482b0b6c7d4e66276190acab25c945d74da1178
+commit f9b5bbaa3a7fce1a4efb2084b8d9d82b98d4ee83
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Mar 8 15:42:42 2016 +1000
+
+ xkb: fix SlowKeys release/reject beeps
+
+ Wrong use of the mask here caused a beep whenever a key was rejected but
+ also when it was released after being accepted. Fix the mask to check
+ for the correct enabled controls.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit a6288f0954cf97499e78849a87847062ee962c17
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Nov 3 19:07:43 2015 +0000
+
+ hw/xwin: xcbify internal window manager
+
+ Convert the code for the multiwindow mode internal window manager to xcb
+
+ xcb conversion avoids xlib/xserver namespace collision and _XSERVER64 type
+ sizing issues
+
+ v2: Various fixes
+ v3: Don't include X11/extensions/windowswmstr.h, which uses the Display type
+ and thus depends on Xlib.h, just for _WINDOWSWM_NATIVE_HWND
+ v4: Fix indentation, add some error handling.
+ Fix a bug with ConfigureNotify handling
+ v5: Fix a bug which prevented WM_NORMAL_HINTS from being checked
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 8114b8127f01fc81390fc13e3d09bcc50e41a66f
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed Jul 1 16:30:36 2015 +0100
+
+ hw/xwin: In multiwindow mode, do window minimization entirely in the WM
+
+ Remove winMinimizeWindow(), implement as UpdateState() in the WM instead,
+ which uses getHwnd() to map a Window XID to a HWND (like everything else in
+ the WM), rather than peering into the servers internal data structures.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 6a64b9d7af70dc7ff2cac8b35a1f7b0797823733
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon Nov 2 17:55:19 2015 +0000
+
+ hw/xwin: xcbify code for converting X11 icon to Win32 icon
+
+ Convert the code for converting an X11 icon to Win32 icon from Xlib to xcb.
+
+ v2: some warning fixes in winXIconToHICON()
+ v3: declaration-after-statement warning fixes
+ v4: printf format fixes
+ v5: convert in place rather than in a library
+
+ This also avoids the xlib/xserver namespace collision issues, so
+ winmultiwindowicons.h can be included everywhere it should be, which fixes
+ compilation with -Werror=implicit-function-declaration
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 0a69c1e2fa0ea63b02fff98e68d9f56a369e882b
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Wed Mar 30 18:31:38 2016 +0100
+
+ xwin/glx: Build fix for warnings about missing WGL extensioons
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+
+commit b08526eecf1e165ed9ec2e6b571a5a616a9b696e
Author: Adam Jackson <ajax@redhat.com>
-Date: Fri Apr 8 11:26:36 2016 -0400
+Date: Wed Mar 16 11:38:13 2016 -0400
- kdrive: Nuke a bunch of dead code
+ glx: Implement GLX_EXT_libglvnd (v2)
- gcc6 says:
+ For the dri2 backend, we depend on xfree86 already, so we can walk the
+ options for the screen looking for a vendor string from xorg.conf. For
+ the swrast backend we don't have that luxury, so just say mesa. This
+ extension isn't really meaningful on Windows or OSX yet (since libglvnd
+ isn't really functional there yet), so on those platforms we don't say
+ anything and return BadValue for the token from QueryServerString.
- keyboard.c:46:21: warning: ‘linux_to_x’ defined but not used
+ v2: Use xnf* allocators when parsing options (Eric and Emil)
- Only referenced by a bunch of long if-0'd code, so chuck it all out.
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2e8781ead3067b195baec2e76a28091575679383
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 23 15:41:24 2016 -0400
+
+ glx: Compute the GLX extension string from __glXScreenInit
- Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Now that the enable bits are in the screen base class we can compute
+ this in one place, rather than making every backend do it.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit c33250945b45adc447154239f0cf48fb9b2d7335)
-commit 0dfa816af2a383449804b891f4a9f8c431e00528
+commit e21de4bf3c5ff8cbb9c5ea023d04162e5e56b3df
Author: Adam Jackson <ajax@redhat.com>
-Date: Fri Apr 8 11:24:50 2016 -0400
+Date: Wed Mar 23 15:36:52 2016 -0400
- dix: Squash some new gcc6 warnings
+ glx: Move glx_enable_bits up to the GLX screen base class
- -Wlogical-op now tells us:
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 23cce73221c0b96e7778da34616f8c3f4d6aa819
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 23 15:13:51 2016 -0400
+
+ xquartz/glx: Remove unused fields from the glx screen subclass
- devices.c:1685:23: warning: logical ‘and’ of equal expressions
+ dmt:~/git/xserver% git grep -E '\<(index|num_vis)\>' hw/xquartz/GL
+ hw/xquartz/GL/indirect.c: int index;
+ hw/xquartz/GL/indirect.c: int num_vis;
- Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit a5dd7b890f4f3a5245639591c73303c5a087b38a)
-commit 98499770640c747128f212b1ebb6bd42775f3b72
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat May 7 00:43:33 2016 -0700
+commit 36bcbf76dcc7e88cac093f8fb656c525bfeaf65d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 23 15:26:23 2016 -0400
- XQuartz: Fix default CFBundleVersion
+ glx: Enable GLX 1.4 unconditionally
- m4/shell variable name collision broke the case when the configure
- option was not used
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 2a72789ee8e88f612dff48ebe2ebe9fecda7a95d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 16 16:28:13 2016 -0400
+
+ xwin/glx: Drop GLWIN_NO_WGL_EXTENSIONS hack
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit 1bb932bf1417ff319a594d7e40f6813a26936784)
+ This doesn't seem very useful, and we're about to implement 1.4 across
+ the board, so some WGL extensions will become required.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 1a81f2a51955e5c8a9d1d80cc008e2927ddd0123
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue May 3 23:43:06 2016 -0700
+commit 77bdaa1313aa55191b49ec73c1e377928ca294fe
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Mar 22 14:40:37 2016 -0400
- XQuartz: Update copyright years
+ glx: Use __glXInitExtensionEnableBits in all backends (v2)
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit 059d5ef30490233f410ca87084c7697b87e5b05e)
+ On xquartz this enables SGI_make_current_read, which is a mostly
+ harmless lie as CGL doesn't implement it, as well as SGIX_pbuffer, which
+ is fine because no pbuffer-enabled configs are created.
+
+ On xwin this enables SGIX_pbuffer and ARB_multisample in all cases.
+ Again this is harmless if the backend doesn't support the features,
+ since no fbconfigs will be created to expose them.
+
+ It also adds SGIX_visual_select_group to both xquartz and xwin.
+ Amusingly, both were filling in the appropriate field in the fbconfig
+ already.
+
+ v2: Warn about missing WGL extensions (Emil)
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 73987379d73cd6ef2701dad7e3027f9363cb81b4
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue May 3 23:42:34 2016 -0700
+commit 15af78fc56569dc3b6a7f2c5a6a49edb602111b7
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 23 15:19:15 2016 -0400
- XQuartz: Add --with-bundle-version and --with-bundle-version-string configure options
+ glx: Enable GLX_SGI_make_current_read in the core
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit d6ba4f2c52da150a9a92bdb00efe7902d17033bd)
+ GLX 1.3 implies equivalent functionality, so this is safe to enable
+ unconditionally, and bindContext always takes both drawable and readable
+ arguments in any case. Mesa stopped exporting the __DRI_READ_DRAWABLE
+ extension in 8.0 (when the DRI1 drivers were removed) so this will
+ restore the extension string.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit bab72d3905bdafe4815ab1dc5509988c8e467769
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue May 3 23:21:38 2016 -0700
+commit 9b2fc6d98691966f1c9186edad956f78c31f3698
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Mar 23 14:57:25 2016 -0400
- XQuartz: Add --with-sparkle-feed-url configure option
+ xwin/glx: Enable GLX_SGI_make_current_read unconditionally (v2)
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit c1614928c10a8f8400f99acfd1b7f96d503af7ec)
+ This seems to be fairly universal these days, and if it doesn't exist
+ the only thing you break is separate drawable and readable, which is a
+ rare feature to use. So pretend it's always there and just throw an
+ error on MakeCurrent if it isn't, and don't consider it when computing
+ the GLX version number.
+
+ v2: Fix type-o for glxWinScreen (Jon Turney)
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit a1915ad14d89bdcd0f2a6607d6d1cb8f90201158
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue May 3 23:14:24 2016 -0700
+commit b2ef7df476af619903ef7f6b6962b371ae14306c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Sat Mar 19 13:44:10 2016 -0400
- XQuartz: Update release feed URL to use new https URL
+ xquartz/glx: Error out for MakeContextCurrent(draw != read)
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit 299b01eabf827a7435b5d6004d50637ac710bbc7)
+ CGL doesn't have a way to express this directly, unlike EGL WGL and GLX.
+ It might be implementable, but it's never actually worked, and it's a
+ fairly niche feature so we're better off throwing an error if someone
+ attempts it.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit ab5f69e5419b34f21cfd30d38374d14103a88f40
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue May 3 23:24:44 2016 -0700
+commit f95645c6f70019316f8ad77b7beb84530fc0505f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Mar 22 14:37:19 2016 -0400
- XQuartz: Fix the help text for --with-bundle-id-prefix
+ glx: Don't enable EXT_texture_from_pixmap unconditionally
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit 16d6733c63727d910eb516d7f6950f4675281f2d)
+ Not all backend servers implement this. Those that don't happen to not
+ use __glXInitExtensionEnableBits, but we'd like that to change, so fix
+ it up before we switch them over.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 3600f8600f1a876409c3a7f2b29f036156b2c7c6
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue May 3 23:16:46 2016 -0700
+commit 410aec82556def5395f51299bcefbeb7d0bda604
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Mar 22 14:29:06 2016 -0400
- XQuartz: Remove --with-launchd-id-prefix
+ glx: Remove server-side mention of GLX_MESA_swap_control
- It's been deprecated for years.
+ This extension is direct-only and has no GLX protocol. We don't even
+ track an enable bit for it, trying to turn it on is pointless.
- Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
- (cherry picked from commit 214a66b661dcb56ebb9776e34049753f65c7510a)
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 9454cd51da9b38b974cff7c8b7125901f6403848
+commit 3a21da59e59cf11a9113d71e3431c4bd394ff1e8
Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Apr 4 14:39:36 2016 -0400
+Date: Wed Mar 16 19:05:17 2016 -0400
- xserver 1.18.3
+ glx: Remove default server glx extension string
+ This existed only to be strdup'd and then immediately freed.
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
-commit 082d5ea9a8f882c5ab7c30c481e2d9a5c5f11376
+commit 44e1c97ca6fe992bbb6ef9ecb0b82a113adfa57e
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Mar 21 09:53:17 2016 +0100
@@ -1066,9 +10029,8 @@ Date: Mon Mar 21 09:53:17 2016 +0100
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 44e1c97ca6fe992bbb6ef9ecb0b82a113adfa57e)
-commit fcb89adb4a6cde585923e63d3c34df465aa78d1b
+commit 6e3a6e30a6ac66942a0756a5d079993181f02e34
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu Mar 17 14:39:45 2016 +0100
@@ -1085,9 +10047,8 @@ Date: Thu Mar 17 14:39:45 2016 +0100
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
- (cherry picked from commit 6e3a6e30a6ac66942a0756a5d079993181f02e34)
-commit b8f9fd83189bd5593793c1cfcbfedb5150d7c5a5
+commit 418fe365b45a143680d3b4143dc60f7cdc5a3507
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Mar 24 17:34:23 2016 +0900
@@ -1105,9 +10066,37 @@ Date: Thu Mar 24 17:34:23 2016 +0900
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94560
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 418fe365b45a143680d3b4143dc60f7cdc5a3507)
-commit 1211d483d4581ee5ccbd50c654d30cf3318fe7c6
+commit adefbaee499b9679c6cac21f52ec6545af2b36b5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 28 18:11:09 2016 +0900
+
+ os: Treat ssh as a non-local client (v4)
+
+ By the time we get to ComputeLocalClient, we've already done
+ NextAvailableClient → ReserveClientIds → DetermineClientCmd (assuming
+ we're built with #define CLIENTIDS), so we can look up the name of the
+ client process and refuse to treat ssh's X forwarding as if it were
+ local.
+
+ v2: (Michel Dänzer)
+ * Only match "ssh" itself, not other executable names starting with
+ that prefix.
+ * Ignore executable path for the match.
+ v3: (Michel Dänzer)
+ * Use GetClientCmdName (Mark Kettenis)
+ * Perform check on Windows as well, but only ignore path on Cygwin
+ (Martin Peres, Emil Velikov, Jon Turney)
+ v4: (Michel Dänzer)
+ * Cut of any colon and whatever comes after it. (Adam Jackson)
+ * Add bugzilla reference.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93261
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 1c90797565385426ad63bd2108085c8466695c0b
Author: Sonny Jiang <sonny.jiang@amd.com>
Date: Mon Mar 28 16:36:50 2016 +0900
@@ -1121,9 +10110,8 @@ Date: Mon Mar 28 16:36:50 2016 +0900
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
- (cherry picked from commit 1c90797565385426ad63bd2108085c8466695c0b)
-commit 07ad2fde78f07e98caaf3e9b6b67af15359fefe4
+commit 3b385105b2d19a1c55e9779ae88d775185eea231
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Mar 24 17:42:47 2016 +0900
@@ -1144,9 +10132,8 @@ Date: Thu Mar 24 17:42:47 2016 +0900
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94596
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 3b385105b2d19a1c55e9779ae88d775185eea231)
-commit e8f785f82ec8d3a76ae377c7430b1945180cba00
+commit 8ac0e05cc6c6e87b223ba7cb31d8856771c5d41a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Mar 23 14:42:08 2016 -0400
@@ -1156,9 +10143,8 @@ Date: Wed Mar 23 14:42:08 2016 -0400
Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 8ac0e05cc6c6e87b223ba7cb31d8856771c5d41a)
-commit fb8ddcf1cb0f47257370c3d6a895a5a41bea8dc0
+commit a288cf58a0dc0f965a6f964c76bb86bb1989d797
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Mar 16 10:45:54 2016 +1000
@@ -1172,9 +10158,63 @@ Date: Wed Mar 16 10:45:54 2016 +1000
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Tested-by: Timo Aaltonen <tjaalton@ubuntu.com>
- (cherry picked from commit a288cf58a0dc0f965a6f964c76bb86bb1989d797)
-commit 1bffe77769a9dce623e4a587ed3895ba003c257b
+commit 4583fa9a6cd3095d7497c075d68e7430ea3c5cb0
+Author: Ángel González <ingenit@zoho.com>
+Date: Mon Oct 15 22:04:22 2012 +0200
+
+ security: Fix reversed comment
+
+ Commit 6045506be0cebca4ebbe943ae77f020aafa703d4 changed back
+ the behavior to only allow the trusted extensions to the untrusted clients,
+ but left the 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763
+ comment intended for Security*Un*trustedExtensions saying that
+ "untrusted clients shouldn't have access to these".
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Ángel González <ingenit@zoho.com>
+
+commit b78897d0a04a833720698901fbac9535570875e4
+Author: Evgeny M. Zubok <evgeny.zubok@tochka.ru>
+Date: Thu Apr 8 03:58:21 2010 -0700
+
+ xfree86: Change VBE version early-out to 1.2. (#22672)
+
+ Reporter has an S3 Trio with DDC and VESA 1.2.
+
+ Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
+ Reviewed-by: Matt Turner <mattst88@gmail.com>
+
+commit 184fbf7541012090b8716c7eaf00895efd16d0ac
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 14 11:37:32 2016 -0400
+
+ xfree86: Finish removing font modules
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 69d1528bc35073331e281448dfb04eb4240ff472
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Apr 26 16:42:20 2012 -0400
+
+ xfree86: Font modules aren't a real thing
+
+ There are no longer any loadable font modules (not that they ever did
+ much in the first place), so stop pretending they're a defined ABI
+ surface.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 4f8151c7a4bcf2d55848e70c83b2f9ce458cf316
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Mar 14 11:20:39 2016 -0400
+
+ Fix the typo from the previous patch, d'oh
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 75eecf28ae3709181a51571132b0accd9cae316e
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Mar 13 13:54:01 2016 +0000
@@ -1196,17 +10236,8 @@ Date: Sun Mar 13 13:54:01 2016 +0000
References: https://bugs.freedesktop.org/show_bug.cgi?id=94515
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 75eecf28ae3709181a51571132b0accd9cae316e)
-commit 93d4224ccf3dee5a51815a66f76c905450419b50
-Author: Adam Jackson <ajax@redhat.com>
-Date: Fri Mar 11 16:38:52 2016 -0500
-
- xserver 1.18.2
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit d88f8ffeb7ec0304d793388be5b65a293505bc3b
+commit 744c292ae49dd1f9d33b860d2b4f0ae27023809b
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Mar 11 13:50:32 2016 -0500
@@ -1223,9 +10254,8 @@ Date: Fri Mar 11 13:50:32 2016 -0500
but not removed from the Makefile, which broke 'make dist'.
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 744c292ae49dd1f9d33b860d2b4f0ae27023809b)
-commit 643359fb03c51244c9ed5f5efab4c84594259e8c
+commit 47bc7fcaa567b0d9e2627b4a21b112e96f81725b
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Feb 9 16:54:22 2016 +1000
@@ -1245,9 +10275,26 @@ Date: Tue Feb 9 16:54:22 2016 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 47bc7fcaa567b0d9e2627b4a21b112e96f81725b)
-commit 3e480c6f5168e7da1521bdcc15ed8b5b8762612d
+commit 316948734c2bba72d42c4cf4530932b5862c109f
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Fri Mar 11 12:21:06 2016 +0900
+
+ glamor: Make context current in glamor_pixmap_fbo_cache_put
+
+ Without this, we may be manipulating the context of another screen.
+
+ In a system with two GPUs using glamor, this fixes lots of
+
+ (EE) glamor256: GL error: GL_INVALID_OPERATION in glBindTexture(non-gen name)
+
+ spew since 0b4c0c75 ('glamor: Replace "finish access" shader with texture
+ swizzling').
+
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit ef3005da3d5dc92b3ee5a0ee78164e739a3216dc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jan 21 12:47:57 2016 -0500
@@ -1259,9 +10306,8 @@ Date: Thu Jan 21 12:47:57 2016 -0500
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit ef3005da3d5dc92b3ee5a0ee78164e739a3216dc)
-commit b9f7edda0634955711870bb1389095525d4496e3
+commit d15cb654b6ba365dac9a62064e277adebde2fdab
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 18 13:00:02 2015 -0400
@@ -1275,9 +10321,8 @@ Date: Mon May 18 13:00:02 2015 -0400
Reviewed-by: James Jones <jajones@nvidia.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit d15cb654b6ba365dac9a62064e277adebde2fdab)
-commit 2b3363418a425bf432b55927d8f8dd93c004c791
+commit a18238877bbf9aab95843d849a6f434275e9cd6c
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 3 16:50:02 2016 -0500
@@ -1290,9 +10335,8 @@ Date: Thu Mar 3 16:50:02 2016 -0500
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit a18238877bbf9aab95843d849a6f434275e9cd6c)
-commit 2541d765fdd1006d649063882e3a667438f1d30e
+commit 47c1d6b7abcfb1c6b478367bbc2e869c91485bc0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 10 12:29:34 2016 -0500
@@ -1303,9 +10347,8 @@ Date: Thu Mar 10 12:29:34 2016 -0500
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 47c1d6b7abcfb1c6b478367bbc2e869c91485bc0)
-commit 2a7b6ea1a54a4c8174669c1ca38c4665505c4637
+commit c01094c5312fbd84146dd83122e5256a8e57d092
Author: Eric Anholt <eric@anholt.net>
Date: Mon Feb 1 13:58:15 2016 -0800
@@ -1315,9 +10358,153 @@ Date: Mon Feb 1 13:58:15 2016 -0800
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit c01094c5312fbd84146dd83122e5256a8e57d092)
-commit 5af20f15636aa2ede3dac1af9e9afa063564130c
+commit 0b4c0c75d06f3dbe92be1a26a637e9f05529cb3d
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:14 2016 -0800
+
+ glamor: Replace "finish access" shader with texture swizzling.
+
+ For pictures without alpha, and for most other formats for GLES2, we
+ would make a temporary FBO, make another temporary texture, upload our
+ GLAMOR_MEMORY pixmap to the texture, then run the "finish access" shader
+ across it to swizzle its values around into the temporary FBO (which we
+ would use for a single Render operation and then throw away).
+
+ We can simplify everything by using GL_ARB_texture_swizzle (or its
+ GLES3 counterpart). It's just not worth the complexity to try to
+ improve the performance of this already low-performance path (SHM
+ pixmaps + Render) on GLES2.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit b0cc04992ced5d96bb5c52fc1e5c868797cc0a17
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:13 2016 -0800
+
+ glamor: Drop dead large-pixmap handling code in temp picture uploads.
+
+ The glamor_pixmap_ensure_fbo() in glamor_pixmap_upload_prepare() will
+ always fail on a large pixmap, so we can just be explicit about
+ bailing out here and then dump the rest of this garbage.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 094b1bea8bd08eec029e4d61ba40d81441c37905
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:12 2016 -0800
+
+ glamor: Drop unused PBO code in temporary picture uploading.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 6112fecc3a4fd7dfb0ef77a98cfd1f7c91ccea0c
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:11 2016 -0800
+
+ glamor: Generalize the a1-to-a8 conversion path.
+
+ Pixman is quite qualified to allocate our temporary memory, and all we
+ need to do is decide what formats to convert from and to.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 8f1411c3847a742f84ff07c4a0bb610801f5bfee
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:10 2016 -0800
+
+ glamor: Drop the REVERT_UPLOADING_1_5_5_5 path.
+
+ There was only a pretty special case that could have even worked --
+ you've got a GLES2 renderer, you've got a SHM pixmap, it's 1555 (not
+ the usual 565 for 16-bit), and you're little endian (BE was broken,
+ since GL's 5_5_5_1 picks the 1 bit from the lowest bit of the short,
+ and on BE we weren't doing the conversion path that swaps around the
+ channels). This is just not worth the complexity.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 2cc7a0815e5e2c2b1b1267cae9c348a8e95b1082
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:09 2016 -0800
+
+ glamor: Drop the GLES2 REVERT_UPLOADING_2_10_10_10 paths.
+
+ These just smash your 2_10_10_10 data into 8888, despite what the
+ comments said. That's not valid rendering, so just ditch this path
+ and fall back to software. One might also note in the code being
+ removed here that the REVERT_UPLOADING_10_10_10_2 path wasn't even
+ connected.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit f667d5177024d3fdfb1b51694bdaeba6cee67962
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:08 2016 -0800
+
+ glamor: Merge the two GL-type-from-pictformat paths.
+
+ It clarifies what the difference is between the two paths, and would
+ potentially encourage us to handle GLES extensions that expose
+ additional types.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit c7574c63c618d3a017105c380542eb04341b04a2
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:07 2016 -0800
+
+ glamor: Propagate that is_upload is always true.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 1bed5ef2b80c77c1bb9b62971367bea864fd8f66
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:06 2016 -0800
+
+ glamor: Drop dead fbo handling from GLAMOR_MEMORY pict uploads.
+
+ The previous commit asserts that we don't have one.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit ee7ca670b1695d64bc12cb37302913acc066a569
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:05 2016 -0800
+
+ glamor: Make sure that GLAMOR_MEMORY pixmaps don't retain an FBO.
+
+ glamor_composite_choose_shader() may upload our scratch pixmaps to get
+ a Render operation completed. We don't want to hang onto GL memory
+ for our scratch pixmaps, since we'll just have to reallocate them at a
+ new w/h next time around, and the contents will be updated as well.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit a96c6d4658e3f386002f96eede660af3b01e5209
+Author: Eric Anholt <eric@anholt.net>
+Date: Mon Feb 1 13:58:04 2016 -0800
+
+ glamor: Simplify temporary picture uploading call stack.
+
+ glamor_upload_sub_pixmap_to_texture() only had the one caller, so we
+ can merge it in, fix its silly return value, and propagate a bunch of
+ constants.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+
+commit 25ce263fd88684be9370025f93ba3a2bfc72ff1a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 16:45:18 2016 +0100
@@ -1325,9 +10512,8 @@ Date: Wed Mar 9 16:45:18 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 25ce263fd88684be9370025f93ba3a2bfc72ff1a)
-commit 9fc05b85e544638ccc4b811c19e64312b387c799
+commit da7724d3d277c6c8a814881785b716896802629a
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Mar 9 16:21:18 2016 +0100
@@ -1337,9 +10523,157 @@ Date: Wed Mar 9 16:21:18 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit da7724d3d277c6c8a814881785b716896802629a)
-commit 1aa9a2be313c51a78af9bceea865dcf069e9cebe
+commit d11fdff50c91575e977a63617806a61bca98cd35
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri Jan 3 13:21:40 2014 +0000
+
+ hw/xwin: Tidy-up of winmsg.h
+
+ - winVMsg() has no uses, so remove
+ - winMsgVerb() has only one use, with default verbosity, so remove
+ - winMsg() is identical to LogMessage()
+ - Put winDrvMsg() and winDrvMsgVerb() under XWIN_XF86CONFIG
+ - Include what you use Xfuncproto.h for _X_ATTRIBUTE_PRINTF
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 519b98765f0c7d083a744ae7beb641753e4eb751
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu Mar 3 22:32:28 2016 +0000
+
+ hw/xwin: Remove GC privates, unused since native GDI engine removal
+
+ Unused since native GDI engine removal in commit 8465ee78
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 9d28ff2a9be86662f56463aa1fd46d12988e30fa
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri Jul 31 20:23:59 2015 +0100
+
+ hw/xwin: Use NULL rather than NoopDDA for unimplemented engine functions
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit a309085a56de4d30dfbc44d9ff5302c7d9fdbf73
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri Jul 31 20:20:00 2015 +0100
+
+ hw/xwin: Remove unused FinishCreateWindowsWindow engine function
+
+ This only ever had an (unused) implementation in the DDNL engine, which was
+ removed in commit 57bbf6e2.
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit fa6f9d06a3d1a90134d9349f5ce4ec5b4eeff5e3
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri Jul 31 20:12:37 2015 +0100
+
+ hw/xwin: Remove unused HotKeyAltTab engine function
+
+ This was only ever used by the primaryfb engine, removed in commit c79f824b
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 7bd25aa8437ec410e7a7de1b0636ba33298fc8d6
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Fri Jul 31 19:44:34 2015 +0100
+
+ hw/xwin: Return FALSE to indicate failure in winSetEngine()
+
+ Return FALSE to indicate failure in winSetEngine(), if it couldn't find a
+ drawing engine to use
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 52e05b9282f0f220d7c762793ce0b8f606a45deb
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Feb 23 23:09:43 2016 +0000
+
+ hw/xwin: Remove WM_WM_MAP message, which is now unused
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit c42217aa3d372acaa5ca7c64895edbfbd20c8475
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon Nov 2 20:24:33 2015 +0000
+
+ hw/xwin: Remove WM_(UN|)MANAGE messages, which are now never sent
+
+ Remove fAnotherWMRunning which tracks this message (although since it was
+ never initialized, I doubt this worked reliably), and the only use of that,
+ which was to prevent winMWExtWMRestackWindows() from being used when the
+ internalwm is running
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit b6bdf368420355332e41c604c523584bd39933f9
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon Nov 2 20:51:51 2015 +0000
+
+ hw/xwin: Remove allowOtherWM, which is now always FALSE
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 8407d3096287868b5c5e50ca5a98d470918c85a9
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon Nov 2 20:34:09 2015 +0000
+
+ hw/xwin: Remove winIsInternalWMRunning(), which now always returns FALSE
+
+ Also remove then unused variables and IsRaiseonClick()
+
+ v2:
+ Also remove unused pScreenInfo variable in winMWEXtWMRestackFrame()
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 2779a28a86a13831b334e8678cd4e838b3b38472
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon Nov 2 20:07:04 2015 +0000
+
+ hw/xwin: Remove fInternalWM flag
+
+ Remove the fInternalWM flag as it is now always FALSE after removing the
+ -internalwm option
+
+ v2:
+ Also remove then unused pRLWinPriv local from pRLWinPriv()
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 98238ece5756801a8a67b9235e42cb9ab2318633
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Mon Nov 2 19:37:40 2015 +0000
+
+ hw/xwin: Ignore the obsolete, undocumented -internalwm option
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit cdeaebad9889d81d2698b8a10fec5e55d8dec7a1
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Mar 1 21:37:05 2016 +0000
+
+ hw/xwin: Remove the long-broken -silent-dup-error option
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 24042b4e367803dd64f3fcdc1bef7b2bf36c4145
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Mon Dec 21 17:54:08 2015 +0900
@@ -1352,9 +10686,8 @@ Date: Mon Dec 21 17:54:08 2015 +0900
allow them to properly take effect.
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 24042b4e367803dd64f3fcdc1bef7b2bf36c4145)
-commit aa8770bf546a58e534ad2d0e0180f7e1013e24e9
+commit b04767c84deafc44993723add4b1c5163fc11711
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Oct 21 18:33:46 2015 +0900
@@ -1370,9 +10703,8 @@ Date: Wed Oct 21 18:33:46 2015 +0900
cursor again once none of those conditions are true anymore.
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit b04767c84deafc44993723add4b1c5163fc11711)
-commit 870d4e2e6b40f911049a5286d605814d2401741d
+commit a4ffa8721debb34bd36fd4624890d9c26886c618
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 24 12:56:03 2015 +0900
@@ -1386,9 +10718,8 @@ Date: Thu Dec 24 12:56:03 2015 +0900
latter is TRUE for rotation as well, which we handle correctly.
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit a4ffa8721debb34bd36fd4624890d9c26886c618)
-commit af87ab62878334ee9d4e75c472fc80178329b4dd
+commit c3e4e9fc5d84bfc17b3ed63f67488ea25ba150ce
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 24 16:20:49 2015 +0900
@@ -1399,9 +10730,8 @@ Date: Thu Dec 24 16:20:49 2015 +0900
v2: No functional change this time.
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit c3e4e9fc5d84bfc17b3ed63f67488ea25ba150ce)
-commit 87c23dc47160d7524b82b60abbc70d285708f7cb
+commit a3e681eafa5355b8bb3b099d47983f14f0d5e197
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Feb 23 17:19:03 2016 +0900
@@ -1415,9 +10745,8 @@ Date: Tue Feb 23 17:19:03 2016 +0900
Reviewed-by: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94246
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit a3e681eafa5355b8bb3b099d47983f14f0d5e197)
-commit 0220275531552a5400c22b56105257586f390260
+commit b05ae79ee3bebef9790c97eedc033d1ffb3ec39a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Feb 23 17:19:02 2016 +0900
@@ -1428,9 +10757,8 @@ Date: Tue Feb 23 17:19:02 2016 +0900
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit b05ae79ee3bebef9790c97eedc033d1ffb3ec39a)
-commit 79985270f1d63a8b186640b81d0eb142ac532e6e
+commit 947e94a341fa153258e9e86060b83af95934672b
Author: Hans de Goede <hdegoede@redhat.com>
Date: Wed Feb 10 16:40:43 2016 +0100
@@ -1442,9 +10770,8 @@ Date: Wed Feb 10 16:40:43 2016 +0100
Adjust src_y accordingly when rendering.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 947e94a341fa153258e9e86060b83af95934672b)
-commit ddca8e1647d3b79f803f4080be648e5475055fe8
+commit 40a164b8f4e720b0d6ebf228ee175eb397ffeec2
Author: Rui Matos <tiagomatos@gmail.com>
Date: Fri Mar 4 16:24:48 2016 +0100
@@ -1457,9 +10784,8 @@ Date: Fri Mar 4 16:24:48 2016 +0100
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
- (cherry picked from commit 40a164b8f4e720b0d6ebf228ee175eb397ffeec2)
-commit 7680f558e1584a191554658ff7b3b75c75d35e06
+commit 2be527b1d4ce2b0412c4484539a8c9607645ec6d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:34 2016 +0100
@@ -1470,9 +10796,8 @@ Date: Mon Mar 7 23:20:34 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 2be527b1d4ce2b0412c4484539a8c9607645ec6d)
-commit b7e1f25005f7b552870fe782fc927c9dc97f5ed0
+commit 4217db89ecd480fda2ee74fecba06c6713c2a0f0
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:33 2016 +0100
@@ -1482,9 +10807,8 @@ Date: Mon Mar 7 23:20:33 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 4217db89ecd480fda2ee74fecba06c6713c2a0f0)
-commit 518a0c179f99e9ea33e9cd56ce215661d27cabb6
+commit 054f80717812d4781741cd05393623fe6f6c627f
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:32 2016 +0100
@@ -1492,9 +10816,8 @@ Date: Mon Mar 7 23:20:32 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 054f80717812d4781741cd05393623fe6f6c627f)
-commit dae9c195a9db4d210855a16efce2037f3af454e1
+commit d0c1a5bc61a3d151f2234aa3820862f16c0f00c7
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:31 2016 +0100
@@ -1504,9 +10827,8 @@ Date: Mon Mar 7 23:20:31 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit d0c1a5bc61a3d151f2234aa3820862f16c0f00c7)
-commit 4bbaffc8134a72d4e2dd21d4def1afc9ad29e815
+commit acf263df81ad6813e0233033610fb44521cab1b4
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:30 2016 +0100
@@ -1517,9 +10839,8 @@ Date: Mon Mar 7 23:20:30 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit acf263df81ad6813e0233033610fb44521cab1b4)
-commit 8616bd95de43aa63c959b0c978f1001ac38c0222
+commit 164753f158e78f615f903467bfd234d7c58244ef
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:29 2016 +0100
@@ -1527,9 +10848,8 @@ Date: Mon Mar 7 23:20:29 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 164753f158e78f615f903467bfd234d7c58244ef)
-commit dcbf88aea74a00a8e09ffdc4de2b555911eb90fb
+commit 59b9c3d5e4bf05aeaaac2ee4ea12c301a67aae2c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:28 2016 +0100
@@ -1540,9 +10860,17 @@ Date: Mon Mar 7 23:20:28 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 59b9c3d5e4bf05aeaaac2ee4ea12c301a67aae2c)
-commit ab197ee9478a0e4e7a276c03645657b4f22ae9c0
+commit ac97fb2b804809c39b12fe0032d96fb076657258
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Mar 7 23:20:27 2016 +0100
+
+ dri3: return an error if AddResource fails
+
+ Reviewed-by: Rémi Cardona <remi@gentoo.org>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 119d5c0e2f800737c949ef760c5fe25d963200bf
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 7 23:20:26 2016 +0100
@@ -1550,9 +10878,8 @@ Date: Mon Mar 7 23:20:26 2016 +0100
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 119d5c0e2f800737c949ef760c5fe25d963200bf)
-commit bd022f03143723ac326b39d6e67853650aa1bf1d
+commit a2c3c34b44b866440a152511e682c98879ee13b7
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Tue Mar 8 20:05:33 2016 +0800
@@ -1564,9 +10891,8 @@ Date: Tue Mar 8 20:05:33 2016 +0800
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit a2c3c34b44b866440a152511e682c98879ee13b7)
-commit 23d9b2a566cdaeff71deae9c3a221ebf0cb5f550
+commit 939ce0bae68b682b57675f65c901653c1a094ebb
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Mar 1 21:39:01 2016 +0100
@@ -1578,9 +10904,8 @@ Date: Tue Mar 1 21:39:01 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 939ce0bae68b682b57675f65c901653c1a094ebb)
-commit 90b854b2acc58a9936e9810f58b0bd1973697210
+commit 05e1bcf56e1c511a1ef539acfe11e37727e1179e
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 1 14:09:30 2016 -0500
@@ -1588,9 +10913,8 @@ Date: Tue Mar 1 14:09:30 2016 -0500
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit 05e1bcf56e1c511a1ef539acfe11e37727e1179e)
-commit 0e3cc3d042a2da1ed781f6691dd7aca72d87046b
+commit 093f9505c12565cc19bdf6e33b263f31d104c3ef
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Mar 1 14:09:29 2016 -0500
@@ -1598,9 +10922,8 @@ Date: Tue Mar 1 14:09:29 2016 -0500
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 093f9505c12565cc19bdf6e33b263f31d104c3ef)
-commit 3d7bfe02cc3ad0f16403a073f1182d7019c98be3
+commit ac4d8c7cee13947b688ebb26035f06f7744db201
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Mar 1 17:03:44 2016 +0100
@@ -1618,9 +10941,104 @@ Date: Tue Mar 1 17:03:44 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit ac4d8c7cee13947b688ebb26035f06f7744db201)
-commit a49e7b9c2ebeb2e2ccb922265798234a8ce9d242
+commit 9c88cb9b059111e0531852f3fa8fa571c0306f57
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Thu Feb 25 16:37:57 2016 -0300
+
+ kdrive/ephyr: map host X server's keymap into Xephyr, if supported
+
+ Currently Xephyr doesn't inherit host X server's keymap, which
+ may lead to keymap mismatches when using a non-US keyboard in a
+ window inside Xephyr. This patch makes Xephyr change its keymap
+ to match host X server's one (unless XKB support is disabled),
+ using xcb-xkb to retrieve the needed XKB controls.
+ This implementation is analogous to Xnest one at commit 83fef4235.
+
+ Supersedes: https://patchwork.freedesktop.org/patch/67504
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit daa6d2d58f65b9301b1b1f3c6df07719ecb5c03d
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Feb 12 14:18:02 2016 -0200
+
+ config/udev: distinguish between real keyboards and other key devices
+
+ This patch introduces a new flag ATTR_KEY for hotplugged input devices,
+ so we can better distinguish between real keyboards (i.e. devices with
+ udev property ID_INPUT_KEYBOARD="1") and other key input devices like
+ lid switches, power buttons, etc.
+
+ All supported hotplug backends (udev, hal, and wscons) will set both
+ flags ATTR_KEY and ATTR_KEYBOARD for real keyboards, but udev backend
+ will set ATTR_KEY, but not ATTR_KEYBOARD, for non-keyboard key input
+ devices (hal and wscons will set both flags in any case). With this
+ distinction, kdrive input hotplugging mechanism will be allowed to only
+ grab real keyboards, as other key input devices are currently not
+ supported.
+
+ In order to don't break current behaviour, this patch will replace all
+ ATTR_KEYBOARD occurrences with ATTR_KEY in hw/xfree86/common/xf86Xinput.c.
+
+ [ajax: Just add ATTR_KEY, don't re-number the other attributes]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 851ff9ec04b73412c7dbad7b4911a1feac21f354
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Feb 12 14:18:01 2016 -0200
+
+ ephyr: enable option -sw-cursor by default in multi-seat mode
+
+ Option -seat passed to Xephyr requires -sw-cursor to be passed as well,
+ otherwise the mouse cursor will remain invisible for the given seat.
+ This patch takes care of enabling -sw-cursor if -seat is passed.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 40e32e9fc9f3a1bd8287ee03dd399d8161cb98dd
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Feb 12 14:18:00 2016 -0200
+
+ kdrive: add options to set default XKB properties
+
+ This patch introduces convenient command-line options -xkb-rules,
+ -xkb-model, -xkb-layout, -xkb-variant, and -xkb-options, to set default
+ values for these properties.
+
+ These options can be handful for cases in which compile-time default
+ values don't match user locale, since kdrive doesn't support InputClass
+ matching rules yet and not all Linux distros provide default rules to
+ store these values in udev properties (which by the way is a discouraged
+ practice).
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 0cf3d72be6bd99cd2c66b7885339322c7e5bf73d
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Feb 12 14:17:59 2016 -0200
+
+ kdrive: introduce input hot-plugging support for udev and hal backends (#33140)
+
+ This patch introduces input hot-plugging support for kdrive-based
+ applications in multi-seat context. This feature is enabled by passing
+ -seat option with desired seat name. All keyboard/mouse devices assigned
+ to that seat will be automatically grabbed by kdrive.
+
+ It supports udev and hal backends for input hot-plugging support.
+ Another patches may be required for wscons backend.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=33140
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 2116f03be04240e961649ca750a7aa5438b8446c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Feb 8 17:48:26 2016 +0100
@@ -1648,9 +11066,8 @@ Date: Mon Feb 8 17:48:26 2016 +0100
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
- (cherry picked from commit 2116f03be04240e961649ca750a7aa5438b8446c)
-commit c7735f102aa9daa604f304f2e8a2131fcdd652e8
+commit 1bee4e254ca0305cb23e574b4c8b250d276ee998
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 18 17:33:19 2016 +0900
@@ -1669,9 +11086,8 @@ Date: Thu Feb 18 17:33:19 2016 +0900
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
- (cherry picked from commit 1bee4e254ca0305cb23e574b4c8b250d276ee998)
-commit 05d9de4e9ac515176f41f9fd649935ae990d8fb3
+commit 4611e902c291b8a789f374cff3300f74645bc2b2
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 18 17:20:45 2016 +0900
@@ -1689,9 +11105,8 @@ Date: Thu Feb 18 17:20:45 2016 +0900
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 4611e902c291b8a789f374cff3300f74645bc2b2)
-commit 49b2a0fb0e6ae0793171b5dbfe517fe06647c06d
+commit 72328e5eb98a3f27e1f0a0e17beae6db447bd87c
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Feb 18 18:23:47 2016 +0900
@@ -1718,9 +11133,8 @@ Date: Thu Feb 18 18:23:47 2016 +0900
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
- (cherry picked from commit 72328e5eb98a3f27e1f0a0e17beae6db447bd87c)
-commit d5b8bc69e2652d8b9b13065b6528d2e8b8188b57
+commit 43eb5b6047c9b35c337e553ec054f08bdc835abb
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Dec 8 12:52:17 2015 +0900
@@ -1734,9 +11148,8 @@ Date: Tue Dec 8 12:52:17 2015 +0900
v2: Return BadMatch instead of BadRequest (Keith Packard)
Reviewed-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 43eb5b6047c9b35c337e553ec054f08bdc835abb)
-commit 15454c5d26b00931b2099ccc6da356a1e5b6f88c
+commit 6070a749d953951bacbfb149c5c36451293aad35
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Feb 10 09:35:39 2016 +0100
@@ -1752,9 +11165,8 @@ Date: Wed Feb 10 09:35:39 2016 +0100
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 6070a749d953951bacbfb149c5c36451293aad35)
-commit f2b346f9ba86ba304baac5ed29f8caf3fefbdba0
+commit b430f53bb753f9b064ab62d014820c1c3c76a841
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:25 2016 +0100
@@ -1768,9 +11180,8 @@ Date: Fri Feb 5 09:48:25 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit b430f53bb753f9b064ab62d014820c1c3c76a841)
-commit d381d59e44f675d01ca9ecab5a58c4864ae56c29
+commit 48fccde2bfb60efdbf45a96fa53bcd9a6570bf89
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:24 2016 +0100
@@ -1783,9 +11194,8 @@ Date: Fri Feb 5 09:48:24 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 48fccde2bfb60efdbf45a96fa53bcd9a6570bf89)
-commit 349b71a37e4a87e3650b5c0df9651b2ce967293e
+commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Wed Feb 10 09:34:34 2016 +0100
@@ -1802,9 +11212,8 @@ Date: Wed Feb 10 09:34:34 2016 +0100
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit f175cf45aebcdda53f3ae49c0eaf27da1f194e92)
-commit 860669b1867178fe46df9da98591ea5a47f427f1
+commit 17097e083b2392c8989474f6e0da8cc234329e9c
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:22 2016 +0100
@@ -1814,9 +11223,8 @@ Date: Fri Feb 5 09:48:22 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 17097e083b2392c8989474f6e0da8cc234329e9c)
-commit 64053645cfd950bb0b6c3fda8deb60e1e540ce69
+commit ddfb8c009ac651209eb0087aaf86b54e1446e8b2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:21 2016 +0100
@@ -1827,9 +11235,8 @@ Date: Fri Feb 5 09:48:21 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit ddfb8c009ac651209eb0087aaf86b54e1446e8b2)
-commit 227b533bf414e03e9a73d0d9e47a761fc597c360
+commit e29a64de662112b8ebcd3f20c89df0e8c51890ef
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:20 2016 +0100
@@ -1845,9 +11252,8 @@ Date: Fri Feb 5 09:48:20 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit e29a64de662112b8ebcd3f20c89df0e8c51890ef)
-commit 9824faaa58efe55a372d7dd0f6c5cbf84e77af61
+commit b7962ade5265a21ac7c60da6cc07ece15ef7e648
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:19 2016 +0100
@@ -1861,9 +11267,8 @@ Date: Fri Feb 5 09:48:19 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit b7962ade5265a21ac7c60da6cc07ece15ef7e648)
-commit 3b52aee6dddc2cd2780f729e9389a1515c544c61
+commit 12f714fd95dc9d912c0bf2524005a73ec6e8ee4f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:18 2016 +0100
@@ -1878,9 +11283,8 @@ Date: Fri Feb 5 09:48:18 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 12f714fd95dc9d912c0bf2524005a73ec6e8ee4f)
-commit b241fd6413775f76a5faaea0f685a8294322e2fc
+commit f6f7e21133c13c34f306a191137d566e83b40929
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:17 2016 +0100
@@ -1892,9 +11296,8 @@ Date: Fri Feb 5 09:48:17 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit f6f7e21133c13c34f306a191137d566e83b40929)
-commit 2028b9066ddbbeaf585e154d19c2672cccdda9bb
+commit 6e898ef080df93e885ead9d6fee8854b34e0216f
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:16 2016 +0100
@@ -1906,9 +11309,8 @@ Date: Fri Feb 5 09:48:16 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 6e898ef080df93e885ead9d6fee8854b34e0216f)
-commit cb3a8768db1b7b2f98f62e3075aa0dd2a46edd9d
+commit 341f3bccafde71754a9ed2303df9908e509c6d31
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri Feb 5 09:48:15 2016 +0100
@@ -1922,9 +11324,8 @@ Date: Fri Feb 5 09:48:15 2016 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 341f3bccafde71754a9ed2303df9908e509c6d31)
-commit 45d17e6bb0ee35662913cd6ce378460aa7e461cc
+commit d8882954570aba656d5a7be7d357feaba21cb099
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 12 11:59:53 2016 +0000
@@ -1941,9 +11342,8 @@ Date: Fri Feb 12 11:59:53 2016 +0000
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
- (cherry picked from commit d8882954570aba656d5a7be7d357feaba21cb099)
-commit 204e85786f24c1ab734ab9ee015efbb790dee130
+commit bc3634010c096dffd1935c0c6cf8ba37534ae3d8
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 12 11:59:52 2016 +0000
@@ -1954,9 +11354,17 @@ Date: Fri Feb 12 11:59:52 2016 +0000
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
- (cherry picked from commit bc3634010c096dffd1935c0c6cf8ba37534ae3d8)
-commit c06a4b4a2422e937eda36a4ec10bdafc71001be7
+commit 9fecc4cd571641f8920f25473ce5abb3fdca8b40
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Jan 12 16:18:35 2016 +0000
+
+ xwin: Remove unhelpful debug about WM message queue size
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit f7d1e5acdf5ed4ab4ed5c18727aa6f3d379ef560
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Aug 11 15:45:57 2015 +0100
@@ -1964,9 +11372,8 @@ Date: Tue Aug 11 15:45:57 2015 +0100
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit f7d1e5acdf5ed4ab4ed5c18727aa6f3d379ef560)
-commit 6f099c7bd59039834c7b45289310b003b81cb3e3
+commit e7f87f8f76e5ac9479a71e3daf2cfdefd4b5f684
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jul 2 19:21:11 2015 +0100
@@ -1978,9 +11385,24 @@ Date: Thu Jul 2 19:21:11 2015 +0100
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit e7f87f8f76e5ac9479a71e3daf2cfdefd4b5f684)
-commit 41cbb7da4e9337d4136d378f5fa45365f41f02e4
+commit 856a28f63739bffe32f5a8156fd2680e5c5259a1
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Thu Jul 2 13:32:40 2015 +0100
+
+ xwin: Factor out MessageName() debug helper
+
+ Factor out the MessageName() debug helper for message id -> text, and
+ use it on message queue and dequeue.
+
+ Reorder in numerical order to match winwindow.h
+
+ Add missing WM_WM_ICON_EVENT
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit 8c2006ddc5abbd4ac374dabf1cfdd3df8fc88779
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon Feb 22 17:41:14 2016 +0000
@@ -1998,9 +11420,8 @@ Date: Mon Feb 22 17:41:14 2016 +0000
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit 8c2006ddc5abbd4ac374dabf1cfdd3df8fc88779)
-commit da7745065ee27d62cc2eba4e860118459917dad9
+commit 8c97a0078e7fe22e6159fa53490dfca2f4d267a9
Author: Colin Harrison <colin.harrison@virgin.net>
Date: Wed Nov 19 22:33:39 2014 +0000
@@ -2008,9 +11429,8 @@ Date: Wed Nov 19 22:33:39 2014 +0000
Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
- (cherry picked from commit 8c97a0078e7fe22e6159fa53490dfca2f4d267a9)
-commit c1eb12f89c2391cd99a834da6b342f104da1eb5c
+commit a4d8a64c4ba467964476c4a1486da698bd6aed9e
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Tue Feb 10 14:36:37 2015 +0000
@@ -2047,9 +11467,8 @@ Date: Tue Feb 10 14:36:37 2015 +0000
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit a4d8a64c4ba467964476c4a1486da698bd6aed9e)
-commit 771a668188793e7261ae2cbf7d7289b8a133316a
+commit 008efebda801b9b80e2ab3f2c95aeef8c82102ee
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat Oct 18 17:31:57 2014 +0100
@@ -2061,9 +11480,8 @@ Date: Sat Oct 18 17:31:57 2014 +0100
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit 008efebda801b9b80e2ab3f2c95aeef8c82102ee)
-commit 00199e8c822fcf6a933637410e44e08ac659f682
+commit de7f1fd6f8f10f07b366ae5428a8c65a224bda98
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed Jul 9 14:26:54 2014 +0100
@@ -2074,9 +11492,8 @@ Date: Wed Jul 9 14:26:54 2014 +0100
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit de7f1fd6f8f10f07b366ae5428a8c65a224bda98)
-commit 0fb47bd27919a7f1e47db3bd3f97fd9a07ccc517
+commit a9e73131b6453e0fa2da5360e84af7a2eae3b205
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu May 8 11:40:39 2014 +0100
@@ -2084,9 +11501,8 @@ Date: Thu May 8 11:40:39 2014 +0100
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit a9e73131b6453e0fa2da5360e84af7a2eae3b205)
-commit 1e143cff16835dd69559ca5646f313dad3db75ab
+commit d7cef6fbe23381b31c163468f349feee2f1b1eba
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Mar 13 18:04:17 2014 +0000
@@ -2101,9 +11517,8 @@ Date: Thu Mar 13 18:04:17 2014 +0000
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit d7cef6fbe23381b31c163468f349feee2f1b1eba)
-commit f0c2a3527797cf2bfbfa4697c294ae087c1e4423
+commit f75404be3ad94c8da493688397712c65ea66cb90
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Fri Mar 28 16:57:48 2014 +0000
@@ -2114,9 +11529,20 @@ Date: Fri Mar 28 16:57:48 2014 +0000
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
- (cherry picked from commit f75404be3ad94c8da493688397712c65ea66cb90)
-commit e457e93e5d33cbec387e40051fbabf6cf76d6af3
+commit 9dc32746f2cd161b512cce8f39c95287bdf1a3a3
+Author: Jon Turney <jon.turney@dronecode.org.uk>
+Date: Tue Nov 10 10:27:07 2015 +0000
+
+ xwin: Fix format warnings when ./configured --enable-debug --enable-windowswm
+
+ Fix format warnings (mainly pointer format fixes) which show up when
+ ./configured --enable-debug --enable-windowswm
+
+ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
+
+commit b4ac7b142fa3c536e9b283cfd34b94d82c03aac6
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 24 16:52:59 2016 +0900
@@ -2134,9 +11560,8 @@ Date: Wed Feb 24 16:52:59 2016 +0900
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit b4ac7b142fa3c536e9b283cfd34b94d82c03aac6)
-commit eb5108b87017128f394ae31b5b7cd85dd8819bca
+commit e7a35b9e16aa12970908f5d55371bb1b862f8f24
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 24 16:52:58 2016 +0900
@@ -2152,9 +11577,8 @@ Date: Wed Feb 24 16:52:58 2016 +0900
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit e7a35b9e16aa12970908f5d55371bb1b862f8f24)
-commit cf30b7cfd6d91da16c762332617fc165d82f17d2
+commit 1a9f8c4623c4e6b6955cb6d5f44d29c244dfd32a
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Wed Feb 24 16:52:57 2016 +0900
@@ -2165,9 +11589,8 @@ Date: Wed Feb 24 16:52:57 2016 +0900
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 1a9f8c4623c4e6b6955cb6d5f44d29c244dfd32a)
-commit 8869f45a965a7b12bb7fe03ba226167e1f821c1e
+commit 0461bca0cb2f7918c77ed45d2cbc756cf65021be
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Mon Feb 22 16:04:12 2016 -0300
@@ -2182,9 +11605,8 @@ Date: Mon Feb 22 16:04:12 2016 -0300
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
- (cherry picked from commit 0461bca0cb2f7918c77ed45d2cbc756cf65021be)
-commit 05f3cf659be44caf00e801a5bcd9362a1a87aa46
+commit 30b7d7995ef70b7473e0fb170eb8ae23b8d1f4a7
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Mon Feb 22 16:20:00 2016 +0000
@@ -2213,9 +11635,8 @@ Date: Mon Feb 22 16:20:00 2016 +0000
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
- (cherry picked from commit 30b7d7995ef70b7473e0fb170eb8ae23b8d1f4a7)
-commit 10e46504711427ed5280fdeb974a08b888f47034
+commit 544b4149268561d3d794aa540172831fa7550a20
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Fri Feb 19 15:08:12 2016 +0800
@@ -2228,9 +11649,8 @@ Date: Fri Feb 19 15:08:12 2016 +0800
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
- (cherry picked from commit 544b4149268561d3d794aa540172831fa7550a20)
-commit de7f91c079d7168c107bb8b8dbe651eebd8e9a12
+commit 5627708e5f447d0e360bbc9eb8d1c4e58c5046d0
Author: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Date: Fri Feb 12 22:52:07 2016 +0100
@@ -2241,9 +11661,8 @@ Date: Fri Feb 12 22:52:07 2016 +0100
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 5627708e5f447d0e360bbc9eb8d1c4e58c5046d0)
-commit 16573a4c35cb71f204b37ad1c3b3d115e84b2cd8
+commit e957a2e5dd288f515f3e93724823542c20333f6a
Author: Daniel Stone <daniels@collabora.com>
Date: Fri Feb 12 16:36:59 2016 +0000
@@ -2271,9 +11690,8 @@ Date: Fri Feb 12 16:36:59 2016 +0000
Signed-off-by: Daniel Stone <daniels@collabora.com>
Tested-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit e957a2e5dd288f515f3e93724823542c20333f6a)
-commit 29d1c5a8e4127d5fd1a0d41f8e1474e9dfdb9638
+commit dbe8d03c42f01332b3dc41fe9290aed142f1436f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Feb 16 20:03:57 2016 -0800
@@ -2284,9 +11702,8 @@ Date: Tue Feb 16 20:03:57 2016 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit dbe8d03c42f01332b3dc41fe9290aed142f1436f)
-commit fc3eef6024355206ea429eb5e2d36001fa47a884
+commit eddf848c44349c7ebc7da9957bffb3630f3faaa9
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Feb 10 11:13:04 2016 -0500
@@ -2309,9 +11726,20 @@ Date: Wed Feb 10 11:13:04 2016 -0500
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit eddf848c44349c7ebc7da9957bffb3630f3faaa9)
-commit 9db37e05a96d1488b7cb30b7e1ccd4c73b38d915
+commit b3e9c534e2b0dc2c9acd2fe9b942e1fc5227339b
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Feb 8 17:36:03 2016 -0500
+
+ os: unifdef STREAMSCONN
+
+ Removed from xtrans in 2012, and never wired up in the modular build
+ anyway.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e43abdce964f5ed9689cf908af8c305b39a5dd36
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 3 09:54:46 2016 +0000
@@ -2328,9 +11756,8 @@ Date: Wed Feb 3 09:54:46 2016 +0000
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
- (cherry picked from commit e43abdce964f5ed9689cf908af8c305b39a5dd36)
-commit 7be0e08cd91ed4be18eefb04018be36dcf0f427e
+commit a722d617a092f08f69086630f5cfb598d4a21cc7
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Dec 9 09:10:13 2015 -0500
@@ -2343,9 +11770,8 @@ Date: Wed Dec 9 09:10:13 2015 -0500
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit a722d617a092f08f69086630f5cfb598d4a21cc7)
-commit c388b2d52177eb7f66a63a8454cee1990b4813d9
+commit 7bb64d8c1de9659f11da7917772919b071e9db82
Author: Jan Burgmeier <jan.burgmeier@unicon-software.com>
Date: Thu Feb 4 14:06:43 2016 +0100
@@ -2358,9 +11784,8 @@ Date: Thu Feb 4 14:06:43 2016 +0100
Bugzilla: https://bugs.freedesktop.org/92313
Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 7bb64d8c1de9659f11da7917772919b071e9db82)
-commit 18155405875608f3a46db465aa9753d66b099f8e
+commit 87d5534f701242d7c23aa20545a6292a0779c89c
Author: Rui Matos <tiagomatos@gmail.com>
Date: Wed Feb 3 16:14:09 2016 +0100
@@ -2376,9 +11801,8 @@ Date: Wed Feb 3 16:14:09 2016 +0100
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
- (cherry picked from commit 87d5534f701242d7c23aa20545a6292a0779c89c)
-commit eac170e469cb66a7e5a47d00c56ddc53c63cca85
+commit b7d392931a309d0fe754869efb456ccd0385f3aa
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed Feb 3 09:54:43 2016 +0000
@@ -2393,9 +11817,77 @@ Date: Wed Feb 3 09:54:43 2016 +0000
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
- (cherry picked from commit b7d392931a309d0fe754869efb456ccd0385f3aa)
-commit 2fc1752ac39a9325dbc5f8e700fc566ea6f8240f
+commit da69f2f15a9917c3ed04e305061683c41338126e
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Dec 11 11:43:14 2015 -0200
+
+ ephyr: don't load ephyr input driver if -seat option is passed
+
+ When used for single-GPU multi-seat purposes, there's no need to enable
+ ephyr virtual input devices, since Xephyr is supposed to handle its own
+ hardware devices.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 7213e99cbc38a60f0076bc2115b144798ea4c3ba
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Dec 11 11:43:13 2015 -0200
+
+ ephyr: ignore Xorg multiseat command line options
+
+ Multi-seat-capable display managers commonly pass command-line options
+ like "-novtswitch", "-sharevts", or "-layout seatXXXX" to Xorg server,
+ but Xephyr currently refuses to start if these options are passed to it,
+ which may break Xephyr-based single-GPU multiseat setups.
+
+ [ajax: shortened summary]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit edd443f69ea385a957b8eae0b066ad8e77fb947b
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Dec 11 11:43:11 2015 -0200
+
+ kdrive: don't let evdev driver overwrite existing device names
+
+ KDrive evdev driver deliberately name grabbed devices as "Evdev mouse"
+ or "Evdev keyboard". This patch will make it skip this step if grabbed
+ devices are already named (i.e. from udev).
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 0b80da0d18713df4712c05973388b6226bb0227f
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Dec 11 11:43:07 2015 -0200
+
+ kdrive: set "evdev" driver for input devices automatically, if available.
+
+ If kdrive input driver "evdev" is available, no other driver was
+ explicitly set for a given input device, and its kernel device node is
+ /dev/input/event*, this patch will make kdrive set "evdev" driver
+ automatically for such device.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 6d6fd688ecf95f2e84f2af276d681ff42f9d5610
+Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+Date: Fri Dec 11 11:43:06 2015 -0200
+
+ kdrive: fix up NewInputDeviceRequest() implementation
+
+ This patch simplifies NewInputDeviceRequest() implementation in
+ kinput.c, making use of improved KdParseKbdOptions() /
+ KdParsePointerOptions() and merging several "if (ki)"/"if (pi)" clauses.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
+
+commit 2c3e8768443caa66d78775ea79bb16a5faae3a3c
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:26:16 2016 -0800
@@ -2404,9 +11896,8 @@ Date: Wed Jan 27 11:26:16 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 2c3e8768443caa66d78775ea79bb16a5faae3a3c)
-commit 4acebf257e37e075a14b3acecce27d050b18bba8
+commit e82c8c81df80de487aa795d69e874a0811c537ea
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:21:05 2016 -0800
@@ -2424,9 +11915,8 @@ Date: Wed Jan 27 11:21:05 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit e82c8c81df80de487aa795d69e874a0811c537ea)
-commit d1c0873228a115ee0ebf46afaf335b8b97a5bbdc
+commit 2c3273861cdf874b165ce5a1953102187f71b48e
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:15:27 2016 -0800
@@ -2435,9 +11925,8 @@ Date: Wed Jan 27 11:15:27 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 2c3273861cdf874b165ce5a1953102187f71b48e)
-commit b0b160aafc151b1fdf1840134bc344e3ce2f3e85
+commit 990a8ee01324332ee9b4a4bb124ce8f73be24349
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:10:14 2016 -0800
@@ -2449,9 +11938,8 @@ Date: Wed Jan 27 11:10:14 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 990a8ee01324332ee9b4a4bb124ce8f73be24349)
-commit 12e4e3ac31b05b501df74c4fa37274830e30662a
+commit 20cb5b2d65ce63ea7934b77f1520387550c778a8
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 10:24:17 2016 -0800
@@ -2463,9 +11951,8 @@ Date: Wed Jan 27 10:24:17 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 20cb5b2d65ce63ea7934b77f1520387550c778a8)
-commit d5c9c541c5d325453ddb9ebcdcf36bc6ef0af4aa
+commit 07f0d90e4a8b05ef968b1ef47acda7c9f4580340
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 17:29:48 2016 -0800
@@ -2478,9 +11965,8 @@ Date: Tue Jan 26 17:29:48 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 07f0d90e4a8b05ef968b1ef47acda7c9f4580340)
-commit 68bd172432de069aa242d21b3af505867417ae45
+commit 0dbce65b08f4812dcaa4b77cd37aebac334c47a2
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:56:27 2016 -0800
@@ -2491,9 +11977,8 @@ Date: Tue Jan 26 15:56:27 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 0dbce65b08f4812dcaa4b77cd37aebac334c47a2)
-commit 6a71251b3985d6dd7c1ab1fa6e13f1edaa33a5c5
+commit 9b676786de32f06aedf9d4c9535c10fda247335a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:47:01 2016 -0800
@@ -2505,9 +11990,8 @@ Date: Tue Jan 26 15:47:01 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 9b676786de32f06aedf9d4c9535c10fda247335a)
-commit 2db5bf7a1297a84e516ce87b24dd3982e7674bb2
+commit 03f34f85563c81e1655626e10f75fd7e21393c92
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:19:50 2016 -0800
@@ -2521,9 +12005,8 @@ Date: Tue Jan 26 15:19:50 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 03f34f85563c81e1655626e10f75fd7e21393c92)
-commit 9be8478467fc4827ca8edc035f0a6d1cca78fbe0
+commit f368a0ba3aa58e5260d839d11d2f3aef75feaeaf
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 14:52:08 2016 -0800
@@ -2538,9 +12021,8 @@ Date: Tue Jan 26 14:52:08 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit f368a0ba3aa58e5260d839d11d2f3aef75feaeaf)
-commit d23fe3229c17cb0dfb4210041efbdc36fc365dad
+commit 294e45b60d99cf7d11c657288bbe2670b56775f3
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 14:18:48 2016 -0800
@@ -2551,9 +12033,8 @@ Date: Tue Jan 26 14:18:48 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 294e45b60d99cf7d11c657288bbe2670b56775f3)
-commit ef993dbbed24f1fe68fd4c66f0035e6c74cde10d
+commit 5d7bef2eedfd965359dd4eebb6ab806cdad5b83f
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 13:39:18 2016 -0800
@@ -2565,9 +12046,8 @@ Date: Tue Jan 26 13:39:18 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 5d7bef2eedfd965359dd4eebb6ab806cdad5b83f)
-commit f031c5edbf36a029800d0f8574aea226a4b5b82f
+commit 4494a450405cf539743cbcfe6907bf5bdd2d80cb
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 15:08:17 2016 -0800
@@ -2578,9 +12058,8 @@ Date: Tue Jan 26 15:08:17 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 4494a450405cf539743cbcfe6907bf5bdd2d80cb)
-commit f1a03379c44c467b92753748165380e33e2e28c8
+commit f7c24e6ac345aab91df5fc959f239a33f37113b1
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 13:34:00 2016 -0800
@@ -2589,9 +12068,8 @@ Date: Tue Jan 26 13:34:00 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit f7c24e6ac345aab91df5fc959f239a33f37113b1)
-commit 83395e6a99c0665490948c92da9bd768954f8c9e
+commit 1fcb6f4cbf3d6514716435a0e79c0e6d53c31a3a
Author: Eric Anholt <eric@anholt.net>
Date: Tue Jan 26 13:31:59 2016 -0800
@@ -2603,9 +12081,8 @@ Date: Tue Jan 26 13:31:59 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 1fcb6f4cbf3d6514716435a0e79c0e6d53c31a3a)
-commit 558ea399664b767c3f9c1acc18f4b2d341d6929c
+commit 9ef11f13af7f552dadb4a90c248e525a257e0a2c
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 21 16:01:14 2016 -0800
@@ -2614,9 +12091,8 @@ Date: Thu Jan 21 16:01:14 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 9ef11f13af7f552dadb4a90c248e525a257e0a2c)
-commit 7c63e80e3f9de3d1b8132a40be6f932e772e0d69
+commit b8229cc5f5298a37a4735dd002b0e0ebfc8bc75a
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 11:35:03 2016 -0800
@@ -2628,9 +12104,8 @@ Date: Wed Jan 27 11:35:03 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit b8229cc5f5298a37a4735dd002b0e0ebfc8bc75a)
-commit 14e2b6f9d87921b39c0874e1a74dff2f9e396f78
+commit 68f236ebd4b268a9e525d623986999d230feb453
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 27 16:11:17 2016 -0800
@@ -2641,9 +12116,20 @@ Date: Wed Jan 27 16:11:17 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
- (cherry picked from commit 68f236ebd4b268a9e525d623986999d230feb453)
-commit cd9ae6d1a259f3229df4c110903658d1bede8554
+commit 623ff251dd025929f5bb6174ca86580c5e707261
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Dec 8 17:41:38 2015 -0500
+
+ xephyr: Remove DRI1
+
+ This only worked if the backend server supported DRI1, which is
+ stunningly unlikely these days.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit 953b71270cf12c59c8a836c9be403d07fb01fa22
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 17:41:37 2015 -0500
@@ -2655,9 +12141,17 @@ Date: Tue Dec 8 17:41:37 2015 -0500
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 953b71270cf12c59c8a836c9be403d07fb01fa22)
-commit 3da08902dd5961ea6f70431fce813f294d0f8547
+commit 1a48a5863e4bceee6b99c1feda1b2c584ff3657c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Dec 8 17:41:36 2015 -0500
+
+ xfree86: Remove ancient DRI build instructions
+
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit d8ecbe563991cc689e95a8cb9d510e920eaceea0
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Jan 27 16:46:06 2016 -0800
@@ -2667,9 +12161,31 @@ Date: Wed Jan 27 16:46:06 2016 -0800
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit d8ecbe563991cc689e95a8cb9d510e920eaceea0)
-commit 4c6ca0aae5a301140eadc97313be954bd6a5fe18
+commit 50ca286d79f6304b972ea74487308e7794a170fb
+Author: Timo Aaltonen <tjaalton@ubuntu.com>
+Date: Wed Jan 27 14:18:50 2016 +0200
+
+ dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
+
+ Adds Skylake, Kabylake and Broxton allowing them to use
+ modesetting + glamor with dri2.
+
+ Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
+ Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
+
+commit bf23db42a4e5943129501223a47b48884cdeb62f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 27 11:50:13 2016 -0500
+
+ modesetting: Require sufficiently new libdrm
+
+ Bugzilla: https://bugs.freedesktop.org/93883
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 6978c8ee666a9224213173e7680e2d71b1094bab
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 19 08:06:25 2016 +1000
@@ -2683,9 +12199,8 @@ Date: Tue Jan 19 08:06:25 2016 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit 6978c8ee666a9224213173e7680e2d71b1094bab)
-commit b0fa782081f933e84f068228ca35fa5c25c9a4b3
+commit 79c3925532bc0d098c9a4da6d5117bdada56e0af
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 19 07:59:59 2016 +1000
@@ -2696,9 +12211,8 @@ Date: Tue Jan 19 07:59:59 2016 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit 79c3925532bc0d098c9a4da6d5117bdada56e0af)
-commit 181ea41e71934a0c575322a8be9234f2e64ef8db
+commit 98c3504dcfcec227b9c7798a0bd287941cec0691
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 19:05:08 2014 -0700
@@ -2714,9 +12228,8 @@ Date: Wed Sep 10 19:05:08 2014 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit 98c3504dcfcec227b9c7798a0bd287941cec0691)
-commit d7f03d57454de989025de2a2ef644d43eead9ddf
+commit 564d9f0f8c17bb3c13aa3ca36da7825454dc5de3
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 11 14:00:35 2016 +1000
@@ -2733,9 +12246,8 @@ Date: Mon Jan 11 14:00:35 2016 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit 564d9f0f8c17bb3c13aa3ca36da7825454dc5de3)
-commit 0cd5b9525a8f661c6b2545c21ce1ba21577c009e
+commit e6754dcb59ee21abb42421a28f4e467295584f67
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 19:02:55 2014 -0700
@@ -2754,49 +12266,8 @@ Date: Wed Sep 10 19:02:55 2014 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit e6754dcb59ee21abb42421a28f4e467295584f67)
-commit 7bd0f79c38cac71d433b1ec7e56a6ff7c2550bcc
-Author: Eric Anholt <eric@anholt.net>
-Date: Thu Jun 18 11:14:41 2015 -0700
-
- glamor: Delay making pixmaps shareable until we need to.
-
- If a pixmap isn't getting exported as a dmabuf, then we don't need to
- make an EGLImage/GBM bo for it. This should reduce normal pixmap
- allocation overhead, and also lets the driver choose non-scanout
- formats which may be much higher performance.
-
- On Raspberry Pi, where scanout isn't usable as a texture source, this
- improves x11perf -copypixwin100 from about 4300/sec to 5780/sec under
- xcompmgr -a, because we no longer need to upload our x11perf window to
- a tiled temporary in order to render it to the screen.
-
- v2: Just use pixmap->usage_hint instead of a new field. Drop the
- changes that started storing gbm_bos in the pixmap priv due to
- lifetime issues.
- v3: Fix a missing gbm_bo_destroy() on the pixmap-from-fd success path.
-
- [ajax: Restore glamor_egl_create_argb8888_based_texture for ABI reasons.
- I'm not aware of any driver using it directly, but.]
-
- Signed-off-by: Eric Anholt <eric@anholt.net>
- Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 51984dddfcc7133ed3c1f20d03514aa98c9a7831)
-
-commit ec9b79c8d497522f87697e434f55086f185e65e7
-Author: Eric Anholt <eric@anholt.net>
-Date: Thu Jun 18 11:26:46 2015 -0700
-
- glamor: Simplify DRI3 pixmap-from-fd, using GBM.
-
- This GBM import path was introduced in 10.2, which we already require.
-
- Signed-off-by: Eric Anholt <eric@anholt.net>
- Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 6be33fd044949330e0b2b4185882c9664d2f90b4)
-
-commit fba0d8a3c9deff557f8a9735fc907556e4e861aa
+commit 5042b0652b9fe5fed57a233880c3429ba390d86d
Author: Eric Anholt <eric@anholt.net>
Date: Wed Jan 20 12:33:25 2016 -0800
@@ -2807,9 +12278,21 @@ Date: Wed Jan 20 12:33:25 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 5042b0652b9fe5fed57a233880c3429ba390d86d)
-commit 389761e592184d78969469914d1aba5d281824fd
+commit 1fd82c764d5b24107e60f2173e30e5d24a2f2667
+Author: Dave Airlie <airlied@redhat.com>
+Date: Tue Jan 19 02:01:09 2016 +0000
+
+ glamor: don't do copy if we have 0 boxes to copy.
+
+ This happens if you run twm + mplayer + xclock and drag
+ the clock over the mplayer. If we don't catch it, we cause
+ an illegal draw elements command to be passed to GL.
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+ Reviewed-by: Eric Anholt <eric@anholt.net>
+
+commit e7308b6c77561df44c04f81509f8ada678705d94
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 12 18:13:46 2016 +1000
@@ -2830,9 +12313,8 @@ Date: Tue Jan 12 18:13:46 2016 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit e7308b6c77561df44c04f81509f8ada678705d94)
-commit 2e79da2dce15b25534ea83eb453cb9b762a2e29f
+commit cab14a9a08ff06bc4cbef79c7be8f1d07c07ebf9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jan 21 12:01:02 2016 -0800
@@ -2845,9 +12327,46 @@ Date: Thu Jan 21 12:01:02 2016 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit cab14a9a08ff06bc4cbef79c7be8f1d07c07ebf9)
-commit aad8e4714a2bdeada5c7ae42d2047cf6a4720d19
+commit 510c8605641803f1f5b5d2de6d3bb422b148e0e7
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jan 21 11:30:15 2016 -0800
+
+ glamor: Fix copy-like Render operations between 15 and 16 depth.
+
+ Reading and writing to 16-depth pixmaps using PICT_x1r5g5b5 ends up
+ failing, unless you're doing a straight copy at the same bpp where the
+ misinterpretation matches on both sides.
+
+ Fixes rendercheck/blend/over and renderhceck/blend/src in piglit.
+
+ Please cherry-pick this to active stable branches.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Dave Airlie <airlied@redhat.com>
+
+commit bc415fb1e0031ad23bda6e9c3f4664532876a0e5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jan 20 15:43:10 2016 -0500
+
+ glx: Fix GLX_EXT_create_context_es2_profile support
+
+ As of v4 of this extension, any GLES version number may be requested (to
+ enable GLES3 and later). To comply with this, simply remove the API
+ version checks and leave it to the DRI driver to validate. This happens
+ to also enable using GLES1 in direct contexts, so if that's the dire
+ situation you find yourself in, your client driver at least stands a
+ chance of working.
+
+ v4 also specifies that both extension strings should be advertised for
+ compatibility with clients written against v1 of the extension spec, so
+ add the es_profile bit to the extension list and enable it whenever we
+ would enable es2_profile.
+
+ Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 49aa5e3ea4eecea0562c05a4e52962985a56e510
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 10 16:17:52 2014 -0700
@@ -2859,9 +12378,8 @@ Date: Wed Sep 10 16:17:52 2014 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 49aa5e3ea4eecea0562c05a4e52962985a56e510)
-commit 6691f523332a5993d3e90e16d8edff7f3b85c4ae
+commit d99204fb5e09ce7be36485d4226f7ad6d6eb24cc
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 19 10:34:14 2016 +1000
@@ -2877,9 +12395,8 @@ Date: Tue Jan 19 10:34:14 2016 +1000
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit d99204fb5e09ce7be36485d4226f7ad6d6eb24cc)
-commit eabe0e0b3685b5ab38c3597f238e92a3e4598441
+commit 5582ad1b9b29934498cf3fef305d3a988130cd52
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 11 14:00:04 2016 +1000
@@ -2890,96 +12407,8 @@ Date: Mon Jan 11 14:00:04 2016 +1000
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 5582ad1b9b29934498cf3fef305d3a988130cd52)
-
-commit 23e60f917a5af652cd83b8a3a9951c79838721b3
-Author: Adam Jackson <ajax@redhat.com>
-Date: Mon Feb 8 18:32:57 2016 -0500
-
- xserver 1.18.1
-
- Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-commit a0d49b1c660f2453d07ce23bf86b0ef717f3d2c8
-Author: Timo Aaltonen <tjaalton@ubuntu.com>
-Date: Wed Jan 27 14:18:50 2016 +0200
-
- dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
-
- Adds Skylake, Kabylake and Broxton allowing them to use
- modesetting + glamor with dri2.
-
- Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
- Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
- (cherry picked from commit 50ca286d79f6304b972ea74487308e7794a170fb)
-
-commit bc4b234d6f4b7b211f7a9750a97524e9652d0e6e
-Author: Adam Jackson <ajax@redhat.com>
-Date: Wed Jan 27 11:50:13 2016 -0500
-
- modesetting: Require sufficiently new libdrm
-
- Bugzilla: https://bugs.freedesktop.org/93883
- Signed-off-by: Adam Jackson <ajax@redhat.com>
- Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
- Reviewed-by: Julien Cristau <jcristau@debian.org>
- (cherry picked from commit bf23db42a4e5943129501223a47b48884cdeb62f)
-
-commit 0b95625cecc7dc2cb6aff61edbc8366e8ffd516f
-Author: Dave Airlie <airlied@redhat.com>
-Date: Tue Jan 19 02:01:09 2016 +0000
-
- glamor: don't do copy if we have 0 boxes to copy.
-
- This happens if you run twm + mplayer + xclock and drag
- the clock over the mplayer. If we don't catch it, we cause
- an illegal draw elements command to be passed to GL.
-
- Signed-off-by: Dave Airlie <airlied@redhat.com>
- Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit 1fd82c764d5b24107e60f2173e30e5d24a2f2667)
-
-commit 71be56c426bd9b66cbc5ab23923f4564e066cd75
-Author: Eric Anholt <eric@anholt.net>
-Date: Thu Jan 21 11:30:15 2016 -0800
-
- glamor: Fix copy-like Render operations between 15 and 16 depth.
-
- Reading and writing to 16-depth pixmaps using PICT_x1r5g5b5 ends up
- failing, unless you're doing a straight copy at the same bpp where the
- misinterpretation matches on both sides.
-
- Fixes rendercheck/blend/over and renderhceck/blend/src in piglit.
-
- Please cherry-pick this to active stable branches.
-
- Signed-off-by: Eric Anholt <eric@anholt.net>
- Reviewed-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 510c8605641803f1f5b5d2de6d3bb422b148e0e7)
-
-commit 6a4f771c5da99d5f723d61e1a780390a5e6b161b
-Author: Adam Jackson <ajax@redhat.com>
-Date: Wed Jan 20 15:43:10 2016 -0500
- glx: Fix GLX_EXT_create_context_es2_profile support
-
- As of v4 of this extension, any GLES version number may be requested (to
- enable GLES3 and later). To comply with this, simply remove the API
- version checks and leave it to the DRI driver to validate. This happens
- to also enable using GLES1 in direct contexts, so if that's the dire
- situation you find yourself in, your client driver at least stands a
- chance of working.
-
- v4 also specifies that both extension strings should be advertised for
- compatibility with clients written against v1 of the extension spec, so
- add the es_profile bit to the extension list and enable it whenever we
- would enable es2_profile.
-
- Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
- Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit bc415fb1e0031ad23bda6e9c3f4664532876a0e5)
-
-commit ff562c9f98bbce91b61b06dfc51aa30c14180cdd
+commit 25eca80265654cfbf8768024e027426fedeb0918
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Fri Jan 15 18:22:21 2016 +0900
@@ -3008,9 +12437,8 @@ Date: Fri Jan 15 18:22:21 2016 +0900
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
- (cherry picked from commit 25eca80265654cfbf8768024e027426fedeb0918)
-commit 9505783c2270b6da13cc5691b94f48ff72d7b625
+commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Jan 12 15:42:47 2016 +0900
@@ -3027,9 +12455,8 @@ Date: Tue Jan 12 15:42:47 2016 +0900
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
- (cherry picked from commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b)
-commit 9e45b28e998a4e0aacd1224b5d4f479ee453fdb9
+commit 8116fd8a760b5935645def1b2c3b155c05927850
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jan 12 14:19:24 2016 +1000
@@ -3048,9 +12475,8 @@ Date: Tue Jan 12 14:19:24 2016 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 8116fd8a760b5935645def1b2c3b155c05927850)
-commit f673c6cffb033286bf4f31fbb64f0863dfbe77f6
+commit 64081d0eacf3e53a029b8e8b63096cc153e98549
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jan 11 17:02:57 2016 +1000
@@ -3064,9 +12490,8 @@ Date: Mon Jan 11 17:02:57 2016 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 64081d0eacf3e53a029b8e8b63096cc153e98549)
-commit f7da9e4cd8237795cea4c0cf82148bdd18ec0f92
+commit 6dcb73375e0ce389315d55587623eb84e9d13543
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jan 6 10:03:23 2016 -0500
@@ -3074,9 +12499,8 @@ Date: Wed Jan 6 10:03:23 2016 -0500
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- (cherry picked from commit 6dcb73375e0ce389315d55587623eb84e9d13543)
-commit 4dfb05aaae9dc7a45294f60ebd3ad454a4707966
+commit 862cbf4c870c9ed913206c6ef4988bdb470e1c39
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Wed Nov 11 13:32:05 2015 +0100
@@ -3084,9 +12508,8 @@ Date: Wed Nov 11 13:32:05 2015 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
- (cherry picked from commit 862cbf4c870c9ed913206c6ef4988bdb470e1c39)
-commit 88f2aa2940b6fb9deea0a1b53d05df02912dc17c
+commit 63f83d1b7f496d05b409352749cdb6674d71cf80
Author: Thomas Klausner <wiz@NetBSD.org>
Date: Tue Jan 5 12:51:41 2016 -0500
@@ -3099,9 +12522,26 @@ Date: Tue Jan 5 12:51:41 2016 -0500
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 63f83d1b7f496d05b409352749cdb6674d71cf80)
-commit 320b169c225fa05d83928bad438c4b15481cea1f
+commit ba71b69f94f00a6f6910597185610668e79c10be
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jan 1 17:34:41 2016 -0800
+
+ Avoid segfault in CloseWellKnownConnections when using -displayfd
+
+ When -displayfd is looping through the possible display ids to use,
+ if it can't open all the listening sockets for one (say when :0 is
+ already in use), it calls CloseWellKnownConnections to close all
+ the ListenTransConns entries before the point that ListenTransFds
+ was allocated & initialized, so CloseWellKnownConnections would
+ segfault trying to read entries from a NULL ListenTransFds pointer.
+
+ Introduced by commit 7b02f0b8
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit edcb6426f20c3be5dd5f50b76a686754aef2f64e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 1 18:11:14 2016 -0800
@@ -3116,9 +12556,8 @@ Date: Fri Jan 1 18:11:14 2016 -0800
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- (cherry picked from commit edcb6426f20c3be5dd5f50b76a686754aef2f64e)
-commit a32b85bf192bd15e9585e4c13a24407634478b05
+commit fe8562f5316d8c74ca074ad145295c65ddff5fc2
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Jan 1 18:10:08 2016 -0800
@@ -3140,9 +12579,90 @@ Date: Fri Jan 1 18:10:08 2016 -0800
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- (cherry picked from commit fe8562f5316d8c74ca074ad145295c65ddff5fc2)
-commit 4457fd45efef85b567d4a0ac085d252ffe49020d
+commit 792176417f7e62a99c4f07801f74f804d6080de2
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 5 12:03:54 2016 -0500
+
+ Revert "Fix uninitialized variable warnings reported by clang"
+
+ Crashes at startup:
+
+ dmt:~/git/xserver% ./hw/kdrive/ephyr/Xephyr :1
+ (EE) Backtrace:
+ (EE) 0: ./hw/kdrive/ephyr/Xephyr (OsSigHandler+0x29) [0x47c8f9]
+ (EE) 1: /lib64/libc.so.6 (__restore_rt+0x0) [0x7f38d4de6b1f]
+ (EE) 2: ./hw/kdrive/ephyr/Xephyr (InitNotifyFds+0x17) [0x478697]
+ (EE) 3: ./hw/kdrive/ephyr/Xephyr (OsInit+0x1e) [0x47c99e]
+ (EE) 4: ./hw/kdrive/ephyr/Xephyr (dix_main+0x11c) [0x446efc]
+ (EE) 5: /lib64/libc.so.6 (__libc_start_main+0xf0) [0x7f38d4dd2580]
+ (EE) 6: ./hw/kdrive/ephyr/Xephyr (_start+0x29) [0x427099]
+ (EE) 7: ? (?+0x29) [0x29]
+ (EE)
+ (EE) Segmentation fault at address 0x0
+
+ This reverts commit a221d4737c167589da44595c795d54f2c36b439a.
+
+commit a221d4737c167589da44595c795d54f2c36b439a
+Author: Thomas Klausner <wiz@NetBSD.org>
+Date: Wed Dec 16 08:36:24 2015 +0100
+
+ Fix uninitialized variable warnings reported by clang
+
+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
+ Acked-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit f3593918a0507cc080875788b2776ebe4f57c694
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Dec 16 09:21:39 2015 +1000
+
+ xfree86: move check for driver->PreInit up
+
+ No real change, but if the driver is broken and doesn't provide a PreInit
+ function, then we don't need to worry about logind.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit fc4fbe8224fdc8d7774120b6e978c652a70a50ee
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Dec 11 09:31:30 2015 +1000
+
+ xfree86: add NoMatchFoo directives for InputClass sections
+
+ InputClass sections use various MatchFoo directives to decide which device to
+ apply to. This usually works fine for specific snippets but has drawbacks for
+ snippets that apply more generally to a multitude of devices.
+
+ This patch adds a NoMatchFoo directive to negate a match, thus allowing
+ snippets that only apply if a given condition is not set. Specifically, this
+ allows for more flexible fallback driver matching, it is now possible to use a
+ snippet that says "assign driver foo, but only if driver bar wasn't already
+ assigned to it". For example:
+
+ Section "InputClass"
+ Identifier "libinput for tablets"
+ MatchIsTablet "true"
+ NoMatchDriver "wacom"
+ Driver "libinput"
+ EndSection
+
+ The above only assigns libinput to tablet devices if wacom isn't already
+ assigned to this device, making it possible to select a specific driver by
+ installing/uninstalling it.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
+
+commit eb671b804e902011ba901d0833a215799177bad0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Dec 11 07:26:02 2015 +1000
+
+ xfree86: whitespace fix
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3d68d1f26709ecb5ce22a9baa0d3d8162574ed6a
Author: Siim Põder <siim@p6drad-teel.net>
Date: Mon Jun 8 22:14:12 2015 +0000
@@ -3161,9 +12681,30 @@ Date: Mon Jun 8 22:14:12 2015 +0000
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Michal Srb <msrb@suse.com>
Signed-off-by: Siim Põder <siim@p6drad-teel.net>
- (cherry picked from commit 3d68d1f26709ecb5ce22a9baa0d3d8162574ed6a)
-commit 5a89a6336d6b70781101e6395c276649956b9d80
+commit e98b36bc69d805ab52aba95b070a614427d46e05
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Dec 8 16:22:16 2015 -0500
+
+ randr: Silence unused variable warning
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 8c49c883dc196ea57e3f64425c2a5b0a8ce3ba75
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Dec 8 15:08:34 2015 -0500
+
+ sync: Don't allow creating a system counter before sync is initialized
+
+ It probably doesn't work very well since there's other extension setup
+ we're not doing on this path, and in any event it's not a thing that
+ happens currently.
+
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit b5f04a79df8b5aab8b558461261d14721f0b3e41
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 15:56:17 2015 -0500
@@ -3171,9 +12712,8 @@ Date: Tue Dec 8 15:56:17 2015 -0500
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit b5f04a79df8b5aab8b558461261d14721f0b3e41)
-commit c10def69e1d92741ab79eee0b26ae80d143c93fb
+commit 18729a211a5fdd4f733e44eded754a0e6210b687
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 15:53:35 2015 -0500
@@ -3181,9 +12721,8 @@ Date: Tue Dec 8 15:53:35 2015 -0500
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 18729a211a5fdd4f733e44eded754a0e6210b687)
-commit e36834cee865152dee5fbe1e8d480b7010466f75
+commit bc996fa4e3c06f65eafe0a88ef491dbf01f31422
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 16:04:44 2015 -0500
@@ -3194,9 +12733,8 @@ Date: Tue Dec 8 16:04:44 2015 -0500
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit bc996fa4e3c06f65eafe0a88ef491dbf01f31422)
-commit bb9bdb213250dbd28a61f91dba2145d20ef5f569
+commit a55e0bc56fd8f9da8f066dc344af19535dd092ca
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 16:00:19 2015 -0500
@@ -3204,9 +12742,8 @@ Date: Tue Dec 8 16:00:19 2015 -0500
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit a55e0bc56fd8f9da8f066dc344af19535dd092ca)
-commit 1f5afbba4513c0e0d2d8827f3bbbbc383fd918f0
+commit 2730ccb803c55af74dbdd1bfd982fc23e643554d
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Dec 8 15:37:12 2015 -0500
@@ -3214,9 +12751,8 @@ Date: Tue Dec 8 15:37:12 2015 -0500
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 2730ccb803c55af74dbdd1bfd982fc23e643554d)
-commit b63a8cc4f24012267b0cb88bc358e68ab3ceb427
+commit 718223d27452862eedcf1bee6278eae6040d45ea
Author: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Date: Thu Dec 3 08:05:59 2015 -0200
@@ -3227,9 +12763,8 @@ Date: Thu Dec 3 08:05:59 2015 -0200
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 718223d27452862eedcf1bee6278eae6040d45ea)
-commit a8b746948db1871c0b28663b99fa839582693087
+commit 7c0ba32ddd5f1d5c65279365fa307dec3433caf3
Author: Bob Ham <bob.ham@collabora.com>
Date: Fri Dec 4 12:30:47 2015 +0000
@@ -3257,9 +12792,8 @@ Date: Fri Dec 4 12:30:47 2015 +0000
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Bob Ham <bob.ham@collabora.com>
- (cherry picked from commit 7c0ba32ddd5f1d5c65279365fa307dec3433caf3)
-commit b564cc9121bade2fee22eb14edd360036b7ba0b9
+commit 530d3e5ca0a02039b04ec6a677bbb4e05b78e5f4
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu Dec 3 17:04:09 2015 +0900
@@ -3270,9 +12804,8 @@ Date: Thu Dec 3 17:04:09 2015 +0900
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
- (cherry picked from commit 530d3e5ca0a02039b04ec6a677bbb4e05b78e5f4)
-commit 00f65597c80d01e1c0759527ed1c72bc5af46c29
+commit 2a52c06e235bd79f91851121f53f7c1808fde321
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 7 17:03:02 2015 -0500
@@ -3282,9 +12815,8 @@ Date: Mon Dec 7 17:03:02 2015 -0500
patch.
Signed-off-by: Adam Jackson <ajax@redhat.com>
- (cherry picked from commit 2a52c06e235bd79f91851121f53f7c1808fde321)
-commit 4415b0cd6f1ddd75f2dc8b2096a89716baa38405
+commit 59b618227ebd024e57720aaaea17596953f5b80e
Author: Julian Pidancet <julian.pidancet@gmail.com>
Date: Sun Jul 1 18:49:25 2012 +0100
@@ -3327,9 +12859,8 @@ Date: Sun Jul 1 18:49:25 2012 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julian Pidancet <julian.pidancet@gmail.com>
- (cherry picked from commit 59b618227ebd024e57720aaaea17596953f5b80e)
-commit cc0cefed4f098ce6e933f2142a4fee93df5f652d
+commit 72f0724cdc65dc9abbbf70b9feb6cce7c2b9f8a0
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Feb 8 09:47:42 2015 +0000
@@ -3347,9 +12878,8 @@ Date: Sun Feb 8 09:47:42 2015 +0000
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 72f0724cdc65dc9abbbf70b9feb6cce7c2b9f8a0)
-commit cfeea6382b5aaac0dcf59d88f7735b0703c9929f
+commit 180b09912c0d2c4a43b5a08678bcad4b818924c7
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Feb 8 09:47:41 2015 +0000
@@ -3363,9 +12893,8 @@ Date: Sun Feb 8 09:47:41 2015 +0000
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 180b09912c0d2c4a43b5a08678bcad4b818924c7)
-commit 4d48ceb8a15fcf521e8be3dba2756b69e54f20cc
+commit b2d55338f6b8f43ebcb49994abad123a797248cf
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Feb 8 09:47:40 2015 +0000
@@ -3377,9 +12906,8 @@ Date: Sun Feb 8 09:47:40 2015 +0000
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit b2d55338f6b8f43ebcb49994abad123a797248cf)
-commit 54c74aa952ac7eecaeeb3f3cba6d2fe8a98cf450
+commit 548a3d5fd69bb059bbaf26ededdc94c212712cd7
Author: Dave Airlie <airlied@gmail.com>
Date: Mon Nov 16 09:05:27 2015 +1000
@@ -3395,9 +12923,8 @@ Date: Mon Nov 16 09:05:27 2015 +1000
Reported-by: Mark Kettenis <mark.kettenis@xs4all.nl>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 548a3d5fd69bb059bbaf26ededdc94c212712cd7)
-commit d94118fa1b75ea773857b7bbeda96ac181feb994
+commit 771016f0705909c908917b4ccaeafc950ba93c05
Author: Dave Airlie <airlied@gmail.com>
Date: Mon Nov 16 09:05:26 2015 +1000
@@ -3407,9 +12934,8 @@ Date: Mon Nov 16 09:05:26 2015 +1000
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
- (cherry picked from commit 771016f0705909c908917b4ccaeafc950ba93c05)
-commit 067c4dd5ce06c2f17d54c3b89e23efbc0822a194
+commit 19b0249a5e07b9fc008e5d8709d7e489874415de
Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon Nov 16 11:06:57 2015 +0100
@@ -3423,9 +12949,310 @@ Date: Mon Nov 16 11:06:57 2015 +0100
Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 19b0249a5e07b9fc008e5d8709d7e489874415de)
-commit 8f41c32bb5f3b962d4db105f96d47d8b74f5af79
+commit 5bccde749db93296b7784e4cdc5e54c4443656c1
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed Dec 2 18:21:12 2015 +0900
+
+ randr: Stop dirty tracking for shared pixmap being destroyed
+
+ Otherwise, we leave a dangling reference to the destroyed pixmap in the
+ master screen's pixmap_dirty_list.
+
+ Fixes regression from commit cf5d6414 ("randr: Factor out shared pixmap
+ destruction").
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 2e3d9623ae3f562f81e513cb183ca1b1b68f279c
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Dec 2 10:42:36 2015 -0500
+
+ Revert "hw/xfree86: Use NotifyFd for device and other input fd wakeups"
+
+ Reported to break libinput:
+
+ http://lists.freedesktop.org/archives/xorg-devel/2015-December/048091.html
+
+ This reverts commit 1df07dc36ca145c59f51176d9ab2651112506d75.
+
+commit 7b02f0b87ec2fa0cc5a65307a1fd55c671cec884
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:17 2015 -0800
+
+ os: Use NotifyFd interface for listen descriptors
+
+ Replace the custom path for dealing with new incoming connections with
+ the general-purpose NotifyFd API.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 1df07dc36ca145c59f51176d9ab2651112506d75
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:16 2015 -0800
+
+ hw/xfree86: Use NotifyFd for device and other input fd wakeups
+
+ Remove code in xf86Wakeup for dealing with device and other input and
+ switch to using the new NotifyFd interface.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e51ea53b26bd9ec05b9209825960af28d0b6bbe1
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:15 2015 -0800
+
+ render: Use OsTimer for animated cursor timing
+
+ This replaces the block/wakeup handlers with an OsTimer. This also
+ avoids problems with performing rendering during the wakeup handler.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 49c0f2413d32fdfe36e45861fcb32aaeab633094
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:14 2015 -0800
+
+ os/xdmcp: Replace xdmcp block/wakeup handlers with timer and NotifyFd
+
+ This removes the block and wakeup handlers and replaces them with a
+ combination of a NotifyFd callback and timers.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 6a121f55381ecbb9cdaaef36ba6135890f3e006f
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:13 2015 -0800
+
+ Xext/xselinux: Use NotifyFd interface
+
+ Replace block/wakeup handlers with SetNotifyFd. Much nicer now.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit f933a1b38ed1c65cc39fce1ee37aa18e3022c3f0
+Author: Keith Packard <keithp@keithp.com>
+Date: Mon Nov 23 17:36:53 2015 -0800
+
+ hw/xwayland: Use NotifyFd handler to monitor wayland socket
+
+ Replace the block/wakeup handler with a NotifyFd callback instead.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8543d4d8bc0526d1c910913b76259e5dee108e74
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:11 2015 -0800
+
+ modesetting: Use NotifyFd for drm event monitoring
+
+ Replace the block/wakeup handlers with a NotifyFd callback.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 58354fcf472cefc35b9c19cf84bf079cadfa2e1d
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:10 2015 -0800
+
+ kdrive/ephyr: Use NotifyFd for XCB connection input [v2]
+
+ Eliminates polling every 20ms for device input.
+
+ v2: rename ephyrPoll to ephyrXcbNotify and fix the API so it can be
+ used directly for SetNotifyFd. Thanks to Daniel Martin
+ <consume.noise@gmail.com>
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ Cc: Daniel Martin <consume.noise@gmail.com>
+
+commit 483c2a1adf044ba1da844687b908c1c802060d2d
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:09 2015 -0800
+
+ hw/kdrive: Use NotifyFd for kdrive input devices
+
+ This switches the kdrive code to use FD notification for input
+ devices, rather than the block and wakeup handlers.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 21c1680e83865a52d88cf8c80fb236d212931e5c
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:08 2015 -0800
+
+ hw/kdrive: Use NotifyFd interface for kdrive/linux APM monitoring
+
+ Replace the block/wakeup handlers with a NotifyFd callback
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 8c8f3567fe4b4e372e22420810443c43e008da2c
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:07 2015 -0800
+
+ config: Use NotifyFd interface for udev
+
+ This uses the NotifyFd interface to monitor the udev file descriptor
+ rather than adding another block/wakeup handler
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit bf920b2390dc27947f87dd0b228518290a5ed85d
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:06 2015 -0800
+
+ config: Use NotifyFd for dbus interface
+
+ This uses the NotifyFd interface to monitor the dbus socket rather
+ than a block/wakeup handler.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 91ea0965dd4dfeba0a914c47ad4a64768e983b1b
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:04 2015 -0800
+
+ dix: Move InitFonts up above screen initialization
+
+ Font initialization was split into two stages, the first was to set up
+ font privates with a call to ResetFontPrivateIndex, then much later
+ the call to InitFonts to set up all of the FPEs. Doing the full font
+ initialization before initializing the video drivers means that we can
+ move the call to ResetFontPrivateIndex inside InitFonts.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 4020aacd1fc5b9c63369f011aeb9120af9c55218
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:03 2015 -0800
+
+ os: Implement support for NotifyFd X_NOTIFY_WRITE
+
+ This adds the ability to be notified when a file descriptor is
+ available for writing.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit 0c41b7af4ab0c8d22b88f201293f59524d1e7317
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:02 2015 -0800
+
+ os: Add NotifyFd interfaces
+
+ This provides a callback-based interface to monitor file
+ descriptors beyond the usual client and device interfaces.
+
+ Modules within the server using file descriptors for reading and/or
+ writing can call
+
+ Bool SetNotifyFd(int fd, NotifyFdProcPtr notify_fd, int mask, void *data);
+
+ mask can be any combination of X_NOTIFY_READ and X_NOTIFY_WRITE.
+
+ When 'fd' becomes readable or writable, the notify_fd function will be
+ called with the 'fd', the ready conditions and 'data' values as arguments,
+
+ When the module no longer needs to monitor the fd, it will call
+
+ void RemoveNotifyFd(int fd);
+
+ RemoveNotifyFd may be called from the notify function.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit e10ba9e4b52269b2ac75c4802dce4ca47d169657
+Author: Keith Packard <keithp@keithp.com>
+Date: Wed Nov 11 22:02:01 2015 -0800
+
+ Remove non-smart scheduler. Don't require setitimer.
+
+ This allows the server to call GetTimeInMillis() after each request is
+ processed to avoid needing setitimer. -dumbSched now turns off the
+ setitimer.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit c7f4aef8f45e500c900d59f68c653477148907ea
+Author: agoins <agoins@nvidia.com>
+Date: Wed Nov 25 18:39:31 2015 -0800
+
+ randr: Cleanup rrSetupPixmapSharing()
+
+ protopix is completely redundant with mscreenpix. Get rid of it.
+
+ We don't need rrScrPriv, so remove it.
+
+ [ajax: also squash an unused variable in RRCrtcDetachScanoutPixmap,
+ though it'll come back when the rest of this series lands]
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit 8d3f0e964e399dcfa8eb5e85d405217fdc5dbcd4
+Author: agoins <agoins@nvidia.com>
+Date: Wed Nov 25 18:39:27 2015 -0800
+
+ xf86: Bump ABI version to 21
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit 7006b4e7ff759c899d5391b7d12db889cbc0b535
+Author: agoins <agoins@nvidia.com>
+Date: Wed Nov 25 18:39:26 2015 -0800
+
+ randr: Factor out shared pixmap creation
+
+ The old version of rrCreateSharedPixmap(), in addition to actually creating
+ a shared pixmap with scanout, also set up pixmap tracking on the source
+ driver.
+
+ I will be needing to create multiple shared pixmaps for PRIME double
+ buffering, so factor the part that does shared pixmap creation into its own
+ function, the new rrCreateSharedPixmap(). Rename the old
+ rrCreateSharedPixmap() to rrSetupPixmapSharing(), a function that
+ replicates the old functionality of rrCreateSharedPixmap() using the new
+ rrCreateSharedPixmap().
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit cf5d6414e0c21140f763d618bde1e91ad2b1cb49
+Author: agoins <agoins@nvidia.com>
+Date: Wed Nov 25 18:39:25 2015 -0800
+
+ randr: Factor out shared pixmap destruction
+
+ Shared pixmap destruction is done by unrefing the master pixmap twice: once
+ for the original reference, and once for the reference implicitly added by
+ PixmapShareToSlave. Then, unrefing the slave pixmap once.
+
+ When I add PRIME double buffering and synchronization, I will need to do
+ this in multiple places. To avoid duplication of code and comments
+ explaining it everywhere, factor it out into its own function and use that
+ in place of where it was before.
+
+ Reviewed-by: Adam Jackson <ajax@redhat.com>
+ Signed-off-by: Alex Goins <agoins@nvidia.com>
+
+commit ab9837cc6a11f46b9df780f131b69de3822c3dd9
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue Dec 1 17:16:03 2015 +0100
@@ -3441,9 +13268,8 @@ Date: Tue Dec 1 17:16:03 2015 +0100
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92914
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
- (cherry picked from commit ab9837cc6a11f46b9df780f131b69de3822c3dd9)
-commit 2b356cb50139601dcd5393646aad30552fa778a1
+commit 07941a50a547f2ca094e242588298695f48903ed
Author: Jonas Ådahl <jadahl@gmail.com>
Date: Wed Oct 7 12:01:53 2015 +0800
@@ -3470,9 +13296,8 @@ Date: Wed Oct 7 12:01:53 2015 +0800
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
- (cherry picked from commit 07941a50a547f2ca094e242588298695f48903ed)
-commit 74354c4b0086ea1a952b5591846803719e3e3e91
+commit 51a4399b94f9adfac5f7718d4cbf73f793dcca56
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Nov 23 08:51:48 2015 +0100
@@ -3488,9 +13313,8 @@ Date: Mon Nov 23 08:51:48 2015 +0100
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93045
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Tested-by: Marek Chalupa <mchqwerty@gmail.com>
- (cherry picked from commit 51a4399b94f9adfac5f7718d4cbf73f793dcca56)
-commit 0a500c3cc74e39a01be24053e152dd52469dd908
+commit 5b2ca3413203210d112a08a4e20d14382abae437
Author: Marek Chalupa <mchqwerty@gmail.com>
Date: Fri Nov 27 14:27:46 2015 +0100
@@ -3502,9 +13326,8 @@ Date: Fri Nov 27 14:27:46 2015 +0100
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 5b2ca3413203210d112a08a4e20d14382abae437)
-commit c2e6eddb1bfc5106596729bc3f0a6a381f5be9f4
+commit 646ebea456b4c5251ae997eab8d9b971f97de836
Author: Marek Chalupa <mchqwerty@gmail.com>
Date: Fri Nov 27 14:59:27 2015 +0100
@@ -3517,9 +13340,20 @@ Date: Fri Nov 27 14:59:27 2015 +0100
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 646ebea456b4c5251ae997eab8d9b971f97de836)
-commit 68168c764662c0ce4ac8193d293b8befd934f666
+commit e6b106715f24112d1dc7a84c6e37df4b5debb2d0
+Author: Richard PALO <richard@NetBSD.org>
+Date: Tue Nov 17 07:02:07 2015 +0100
+
+ Replace 'sun' with '__sun'
+
+ Globally replace #ifdef and #if defined usage of 'sun' with '__sun'
+ such that strict ISO compiler modes such as -ansi or -std=c99 can be used.
+
+ Signed-off-by: Richard PALO <richard@NetBSD.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 44d0fd435a4eaf45e252b4f00409152a6d599dfc
Author: Egbert Eich <eich@suse.de>
Date: Tue Nov 24 17:37:36 2015 +0100
@@ -3540,9 +13374,19 @@ Date: Tue Nov 24 17:37:36 2015 +0100
Signed-off-by: Egbert Eich <eich@suse.de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit 44d0fd435a4eaf45e252b4f00409152a6d599dfc)
-commit 84fbfa8a7d40553c5129a667b532ea3a8b63bfb3
+commit eb36924ead40564325aa56d54a973dc8fb4eae83
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Nov 24 08:31:21 2015 -0500
+
+ dix: Remove redundant ChangeWindowProperty
+
+ Use dixChangeWindowProperty(serverClient, ...) instead.
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 4affa75a90d2455c81087b930126ad7adfd019f0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 19 12:21:08 2015 -0500
@@ -3564,9 +13408,70 @@ Date: Thu Nov 19 12:21:08 2015 -0500
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
- (cherry picked from commit 4affa75a90d2455c81087b930126ad7adfd019f0)
-commit 115913d9ec8f7961e9a5789972aeb33da9cfd1e4
+commit fee0827a9a695600765f3d04376fc9babe497401
+Author: Daniel Stone <daniels@collabora.com>
+Date: Fri Nov 20 15:37:31 2015 +0000
+
+ XWayland: Use FocusIn events for keyboard enter
+
+ wl_keyboard::enter is the equivalent of FocusIn + KeymapNotify: it
+ notifies us that the surface/window has now received the focus, and
+ provides us a set of keys which are currently down.
+
+ We should use these keys to update the current state, but not to send
+ any events to clients.
+
+ Signed-off-by: Daniel Stone <daniels@collabora.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 816015648ffe660ddaa0f7d4d192e555b723c372
+Author: Daniel Stone <daniels@collabora.com>
+Date: Fri Nov 20 15:37:30 2015 +0000
+
+ Input: Add focus-in event source
+
+ Add a new event source type for keypress events synthesised from focus
+ notifications (e.g. KeymapNotify from the parent server, when running
+ nested). This is used to keep the keys-down array in sync with the host
+ server's, without sending actual keypress events to clients.
+
+ Signed-off-by: Daniel Stone <daniels@collabora.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit c3788394e9190130a8eed44c5c93eeb93c2a9893
+Author: Daniel Stone <daniels@collabora.com>
+Date: Fri Nov 20 15:37:29 2015 +0000
+
+ Input: Add DeviceEventSource enum
+
+ Add a flag to DeviceEvents, giving the source of the event. Currently
+ this only supports a 'normal' flag, but will be used later to add a
+ 'focus-in' flag, noting events synthesised from key/button arrays on
+ focus-in notifications.
+
+ Signed-off-by: Daniel Stone <daniels@collabora.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 2e61901e46d28ce2f436219ad1a495aa0dcd0fba
+Author: Daniel Stone <daniels@collabora.com>
+Date: Fri Nov 20 15:37:28 2015 +0000
+
+ XKB: Split filter execution into a separate function
+
+ Move the giant state machine which maps from a key action to actually
+ running the filters into a separate function, to be used when adding
+ KeyFocusIn.
+
+ Signed-off-by: Daniel Stone <daniels@collabora.com>
+ Tested-by: Giulio Camuffo <giuliocamuffo@gmail.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 71ba82690158f46d50a455e69a83ee0d685bb274
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Nov 23 07:59:24 2015 +1000
@@ -3576,9 +13481,129 @@ Date: Mon Nov 23 07:59:24 2015 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
- (cherry picked from commit 71ba82690158f46d50a455e69a83ee0d685bb274)
-commit c9bd60790c6636a7911ca479e0f9439bc118d74c
+commit 51984dddfcc7133ed3c1f20d03514aa98c9a7831
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 18 11:14:41 2015 -0700
+
+ glamor: Delay making pixmaps shareable until we need to.
+
+ If a pixmap isn't getting exported as a dmabuf, then we don't need to
+ make an EGLImage/GBM bo for it. This should reduce normal pixmap
+ allocation overhead, and also lets the driver choose non-scanout
+ formats which may be much higher performance.
+
+ On Raspberry Pi, where scanout isn't usable as a texture source, this
+ improves x11perf -copypixwin100 from about 4300/sec to 5780/sec under
+ xcompmgr -a, because we no longer need to upload our x11perf window to
+ a tiled temporary in order to render it to the screen.
+
+ v2: Just use pixmap->usage_hint instead of a new field. Drop the
+ changes that started storing gbm_bos in the pixmap priv due to
+ lifetime issues.
+ v3: Fix a missing gbm_bo_destroy() on the pixmap-from-fd success path.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 7cd495a88807698b4ebaf9c1fb3db6edf31dd7e6
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Oct 15 13:25:12 2015 -0700
+
+ glamor: Make glamor_get_name_from_bo static.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 6be33fd044949330e0b2b4185882c9664d2f90b4
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 18 11:26:46 2015 -0700
+
+ glamor: Simplify DRI3 pixmap-from-fd, using GBM.
+
+ This GBM import path was introduced in 10.2, which we already require.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 1b8f16d8e659fb483453e1123a9fa876adb758ff
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 18 11:21:10 2015 -0700
+
+ glamor: Use real types for glamor_egl's public gbm functions.
+
+ I think void * was just used to avoid needing to #include gbm.h, but
+ we can just forward-declare the structs and be fine.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit f80758f32a7b922baf8fbf3ac6d8c9aae5fea1c4
+Author: Eric Anholt <eric@anholt.net>
+Date: Thu Jun 18 11:15:40 2015 -0700
+
+ glamor: Use the GBM function for getting an FD from a GBM BO.
+
+ We were rolling ioctl calls ourselves, when there's a nice interface
+ for it.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit ff2850424c99652506d0d6bc43506b4c16bf2ad5
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Oct 18 19:26:14 2015 -0700
+
+ glamor: Hook up EGL DestroyPixmap through the normal wrap chain.
+
+ One less layering violation (EGL should call glamor, if anything, not
+ the other way around).
+
+ v2: Move glamor.c's DestroyPixmap wrapping up above the
+ glamor_egl_screen_init() call, since glamor.c's DestroyPixmap
+ needs to be the bottom of the stack (it calls fb directly and
+ doesn't wrap). Caught by Michel.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit e91fd30049ba9ebfb6ee8aded74eebe006af3f57
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Oct 18 21:34:45 2015 -0700
+
+ glamor: Unexport glamor_destroy_textured_pixmap().
+
+ This is just a bit of the DestroyPixmap chain.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 3dd202933fd94615aeeaec7e4cfd05a68954a3f3
+Author: Eric Anholt <eric@anholt.net>
+Date: Sun Oct 18 21:28:19 2015 -0700
+
+ glamor: Remove glamor_egl_destroy_textured_pixmap().
+
+ The DestroyPixmap chain and CloseScreen chain all do pixmap teardown
+ already, and calling it manually would be redundant.
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 9d2b76652f0bca5680b9e3ae2aacd508d5525684
+Author: Eric Anholt <eric@anholt.net>
+Date: Fri Jun 19 15:56:13 2015 -0700
+
+ modesetting: No need to free the EGLImage just before freeing the pixmap.
+
+ DestroyPixmap handles that just fine. This also lets us drop our use
+ of the manual image destruction function (Note that the radeon driver
+ still uses it in a similar fashion, though).
+
+ Signed-off-by: Eric Anholt <eric@anholt.net>
+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 98a1993536add730b7ec29a9e37f62b1cd70ad31
Author: Eric Anholt <eric@anholt.net>
Date: Sun Oct 18 19:16:20 2015 -0700
@@ -3592,9 +13617,8 @@ Date: Sun Oct 18 19:16:20 2015 -0700
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 98a1993536add730b7ec29a9e37f62b1cd70ad31)
-commit 9379c6a3f6109fe2cca3bf2dc45dc92fcf1e302f
+commit 9a5972801f7789833062e5711e77483b643eef92
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 16:35:56 2015 -0800
@@ -3617,9 +13641,8 @@ Date: Thu Nov 5 16:35:56 2015 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit 9a5972801f7789833062e5711e77483b643eef92)
-commit 6bb58ea2a9c1931f4e04075f19ed22bb50b1d709
+commit e7aa4d3c7420d45cca2b7e1e69e22cebc64d5b74
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 16:03:14 2015 -0800
@@ -3630,9 +13653,8 @@ Date: Thu Nov 5 16:03:14 2015 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit e7aa4d3c7420d45cca2b7e1e69e22cebc64d5b74)
-commit ade2ed4f8bb66127ad46df22b12d201dad318c3d
+commit ff8ef975df9cd99ec6f0b8b8047445091bf35ef0
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 15:13:55 2015 -0800
@@ -3640,9 +13662,8 @@ Date: Thu Nov 5 15:13:55 2015 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit ff8ef975df9cd99ec6f0b8b8047445091bf35ef0)
-commit 90fe7266ab67aa3e45a0a68c71987c70c0496504
+commit a6b05d10da2fe476f46e6dc4ad8a603964735905
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 15:05:11 2015 -0800
@@ -3653,9 +13674,8 @@ Date: Thu Nov 5 15:05:11 2015 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit a6b05d10da2fe476f46e6dc4ad8a603964735905)
-commit 701b4347aca1a9b81492b05cf3ae35fe0499325c
+commit de959ec939b262cb1cb4c0b6146826e3092843f9
Author: Eric Anholt <eric@anholt.net>
Date: Thu Nov 5 14:47:42 2015 -0800
@@ -3668,9 +13688,8 @@ Date: Thu Nov 5 14:47:42 2015 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
- (cherry picked from commit de959ec939b262cb1cb4c0b6146826e3092843f9)
-commit 73799de77f551c22308af1e7ef0b2f83ae49b0e0
+commit 74be466d40080545117628c376cb59b696db33bc
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 9 15:47:05 2015 -0800
@@ -3682,9 +13701,8 @@ Date: Mon Nov 9 15:47:05 2015 -0800
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
- (cherry picked from commit 74be466d40080545117628c376cb59b696db33bc)
-commit 7727e433459675f80cb38857a6c82ebb29393072
+commit a6cddb8c04ddc3c48aae3f3611ad9f336fecb09d
Author: Michael Stapelberg <stapelberg@google.com>
Date: Tue Nov 3 03:51:48 2015 -0800
@@ -3693,7 +13711,14 @@ Date: Tue Nov 3 03:51:48 2015 -0800
Signed-off-by: Michael Stapelberg <stapelberg@google.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
- (cherry picked from commit a6cddb8c04ddc3c48aae3f3611ad9f336fecb09d)
+
+commit f2ceb683c2da1ec08c8e07d7ec146f14864f2386
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Nov 9 16:22:12 2015 -0500
+
+ Post-release version bump for 1.19
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd
Author: Adam Jackson <ajax@redhat.com>
@@ -4079,7 +14104,7 @@ Date: Mon Sep 21 07:16:12 2015 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 5b582a4a0350c253d729efb31b710851ae9a958e
-Merge: 1d4aa67 27ad212
+Merge: 1d4aa67242 27ad21254f
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Oct 19 12:23:22 2015 -0400
@@ -4690,7 +14715,7 @@ Date: Fri Sep 25 14:04:34 2015 +0100
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
commit dca5770af9e20bb1148374ebfd60931a81b148a2
-Merge: a31bbc4 21f384b
+Merge: a31bbc450a 21f384b7b8
Author: Adam Jackson <ajax@redhat.com>
Date: Fri Sep 25 10:23:28 2015 -0400
@@ -5324,7 +15349,7 @@ Date: Mon Sep 21 15:23:23 2015 -0400
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit b25f7d0c165c4d32c73fbdf9080012503d319ba1
-Merge: db1089e 1ba4fde
+Merge: db1089eafc 1ba4fde101
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Sep 21 17:34:48 2015 -0400
@@ -5947,7 +15972,7 @@ Date: Tue Jul 7 18:19:50 2015 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ecdfbf0af3547295b245efa754123db65cabb43
-Merge: bca4f4b a0b4f30
+Merge: bca4f4b56c a0b4f30b1f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 17 18:53:25 2015 -0700
@@ -6194,7 +16219,7 @@ Date: Thu Jul 16 15:12:52 2015 -0700
Signed-off-by: Eric Anholt <eric@anholt.net>
commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc
-Merge: cb695b0 7b0f940
+Merge: cb695b0f3b 7b0f940625
Author: Eric Anholt <eric@anholt.net>
Date: Fri Jul 17 10:15:01 2015 -0700
@@ -6801,7 +16826,7 @@ Date: Tue Jun 30 14:54:42 2015 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 991712f1e8deeb6289ee0abd9910e279d6396246
-Merge: 0cd2280 3c85911
+Merge: 0cd228073a 3c859112d3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 8 10:43:31 2015 -0700
@@ -7353,28 +17378,28 @@ Date: Tue May 12 14:19:15 2015 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8a8d51358cea782147bb9b5b2e0902b1e47fcf4a
-Merge: b22534d 13c7d53
+Merge: b22534d8e6 13c7d53df8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 21:04:53 2015 -0700
Merge remote-tracking branch 'airlied/for-keithp'
commit b22534d8e653575196180970292eaade33c090a8
-Merge: 0a625ad 780a69a
+Merge: 0a625adeec 780a69aff0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 21:04:11 2015 -0700
Merge remote-tracking branch 'jwrdecoede/for-keith'
commit 0a625adeec465d6c7dcdb8622c53157b4e932bb0
-Merge: 84128c1 790311c
+Merge: 84128c10bb 790311cec3
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 21:01:34 2015 -0700
Merge remote-tracking branch 'anholt/glamor-next'
commit 84128c10bb6d34f78f7a4148b3c640748efe58e1
-Merge: 9003a3e 8c86dd5
+Merge: 9003a3e5c5 8c86dd5160
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 29 20:59:31 2015 -0700
@@ -8011,13 +18036,13 @@ Date: Mon Jan 12 17:10:02 2015 +0000
backtrace.c: In function 'xorg_backtrace':
backtrace.c:90:20: error: cast to pointer from integer of different size
[-Werror=int-to-pointer-cast]
- if (dladdr((void *)(pip.start_ip + off), &dlinfo) &&
+ if (dladdr((void *)(pip.start_ip + off), &dlinfo) &&
dlinfo.dli_fname &&
- ^
+ ^
backtrace.c:98:13: error: cast to pointer from integer of different size
[-Werror=int-to-pointer-cast]
- (void *)(pip.start_ip + off));
- ^
+ (void *)(pip.start_ip + off));
+ ^
cc1: some warnings being treated as errors
make[2]: *** [backtrace.lo] Error 1
make[2]: *** Waiting for unfinished jobs....
@@ -8398,14 +18423,14 @@ Date: Tue Mar 17 10:21:12 2015 +0900
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0409b6e6d63e9cfb5dc71bb27de4b1ed0152dd9b
-Merge: c39c3a9 23702dd
+Merge: c39c3a9750 23702dd268
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 16:50:43 2015 -0700
Merge remote-tracking branch 'evelikov/master'
commit c39c3a97508dc384c0757a0990c07b5d7b2fe97a
-Merge: 6b65e96 7470578
+Merge: 6b65e96189 7470578520
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 16:34:48 2015 -0700
@@ -8424,7 +18449,7 @@ Date: Wed May 6 15:07:21 2015 +1200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d7091a21d90cf463ae39ec5e8741123218ec5686
-Merge: c3ce9d8 8fb8bbb
+Merge: c3ce9d8fd4 8fb8bbb306
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 15:49:34 2015 -0700
@@ -8492,7 +18517,7 @@ Date: Sat Apr 25 21:19:25 2015 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b
-Merge: 28ff661 c7b49bd
+Merge: 28ff661e73 c7b49bdbb9
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 11 15:36:53 2015 -0700
@@ -9156,7 +19181,7 @@ Date: Tue Dec 30 09:13:15 2014 -0800
Acked-by: Alex Deucher <alexander.deucher@amd.com>
commit e608f3521eaaab972a3eea62aa04a65958351c1c
-Merge: d3b9c47 5de1383
+Merge: d3b9c47c84 5de1383070
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 31 09:06:08 2015 -0700
@@ -9228,7 +19253,7 @@ Date: Tue Mar 31 11:18:44 2015 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 7088816fee0ca7d609c7bca41ef8c3fc938556f5
-Merge: 95e83ff e977b40
+Merge: 95e83ff87a e977b404d7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 27 06:45:56 2015 -0700
@@ -10717,7 +20742,7 @@ Date: Thu Jan 15 22:03:18 2015 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5f2e8ac51ccbf7c02f25c8cb7617df0238418cd1
-Merge: 4e12d7b 4301479
+Merge: 4e12d7b6f4 4301479508
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jan 10 14:51:57 2015 +1300
@@ -10801,7 +20826,7 @@ Date: Sun Jan 4 19:13:35 2015 -0800
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 1c01633877caa4239f901f02fbe113926318d030
-Merge: 3573855 e774663
+Merge: 3573855514 e774663fa5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 4 17:02:25 2015 -0800
@@ -10917,9 +20942,9 @@ Date: Thu Dec 11 19:09:48 2014 -0800
attributions in place before copying that. To get this list of names I
went through:
- git log -- os/xsha1.c
+ git log -- os/xsha1.c
and:
- git log -- render/glyph.c
+ git log -- render/glyph.c
Signed-off-by: Keith Packard <keithp@keithp.com>
@@ -11544,7 +21569,7 @@ Date: Mon Dec 1 16:06:17 2014 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6704bb0ed7a10dabe8ef3bb3adf8b8a7f29a78f0
-Merge: 8aa23f2 1559a94
+Merge: 8aa23f27c7 1559a94395
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 9 11:47:11 2014 -0800
@@ -12142,14 +22167,14 @@ Date: Fri Jan 17 18:54:03 2014 -0800
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3e7218a6c23354d66f508b18164cac98a346b3ee
-Merge: 6f4c398 bc71081
+Merge: 6f4c398a0e bc71081f0e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 8 18:07:55 2014 -0800
Merge remote-tracking branch 'jturney/indirect-glx-fixes'
commit 6f4c398a0e632b0c92e3cb8ee03ca7f5b5cc018e
-Merge: aae6460 5920433
+Merge: aae6460694 5920433c3a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 8 18:04:08 2014 -0800
@@ -12467,7 +22492,7 @@ Date: Tue Nov 11 12:30:07 2014 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ec0ac8970b508adcbc3d104b14a127118e4979d0
-Merge: 65cc098 0f88d4e
+Merge: 65cc0982af 0f88d4e793
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 24 15:39:51 2014 -0800
@@ -12824,11 +22849,11 @@ Date: Wed Oct 29 16:59:27 2014 +0100
include/gcstruct.h header which wasn't included by the source file, only
gc.h was. That caused the following build failure:
- CC xvmain.lo
- Xext/xvmain.c: In function 'XvFillColorKey':
- Xext/xvmain.c:1114:13: error: dereferencing pointer to incomplete type
- (*gc->ops->PolyFillRect) (pDraw, gc, nbox, rects);
- ^
+ CC xvmain.lo
+ Xext/xvmain.c: In function 'XvFillColorKey':
+ Xext/xvmain.c:1114:13: error: dereferencing pointer to incomplete type
+ (*gc->ops->PolyFillRect) (pDraw, gc, nbox, rects);
+ ^
Fix this by including the correct header file.
@@ -13013,14 +23038,14 @@ Date: Tue Oct 21 15:03:55 2014 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3a123fbdda56b24dc01a2308137144dc960e0d61
-Merge: 9b29fa9 7ea4a21
+Merge: 9b29fa957a 7ea4a21fee
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 27 15:39:26 2014 -0700
Merge remote-tracking branch 'jturney/master'
Conflicts:
- hw/xwin/winpixmap.c
+ hw/xwin/winpixmap.c
Adam removed a pile of windows code, including this file.
@@ -13056,7 +23081,7 @@ Date: Mon Oct 27 15:28:14 2014 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 59b12c454d9c4b5a26c6ad87c53abc671b15ce37
-Merge: 5574a0a cac4b06
+Merge: 5574a0a07e cac4b064f9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 27 14:48:55 2014 -0700
@@ -13534,7 +23559,7 @@ Date: Thu Oct 9 09:58:06 2014 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit de55aafa8f6a9e0dec364bec920d6f91ef2b39f0
-Merge: 462bf87 c79f824
+Merge: 462bf87c4d c79f824bf6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 23 17:28:24 2014 -0700
@@ -13773,21 +23798,21 @@ Date: Thu Oct 9 15:17:17 2014 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d634ecdf82f244ff8ce75d351fc175792d254e5c
-Merge: 6622f0c 7ebf480
+Merge: 6622f0cb17 7ebf480f5e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 15:08:31 2014 +0200
Merge remote-tracking branch 'ajax/dead-code'
commit 6622f0cb1761501f3287ffa8d3cbca3fd30f9f0c
-Merge: f12e7f4 5ecd786
+Merge: f12e7f4980 5ecd7866f7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 15:05:26 2014 +0200
Merge remote-tracking branch 'ajax/mi-cleanup'
commit f12e7f4980416b74988052a04d0f2487b2c4a7e9
-Merge: da88772 aaf5e2d
+Merge: da887726ee aaf5e2d643
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 9 14:21:19 2014 +0200
@@ -14165,7 +24190,7 @@ Date: Thu Oct 2 10:26:53 2014 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e9651e3dbc32650fcaf90888b4cbef81da77cfcd
-Merge: 9bc01df 4433bc6
+Merge: 9bc01dfc70 4433bc6d53
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 2 10:24:33 2014 -0700
@@ -14237,7 +24262,7 @@ Date: Thu Sep 25 15:27:22 2014 +0900
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 78c27d12e1f4857bfcfc92afbb69d5dd989232b9
-Merge: 6e50bfa 1d6334d
+Merge: 6e50bfa706 1d6334dd0c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 29 13:04:49 2014 -0700
@@ -14471,12 +24496,12 @@ Date: Wed Aug 6 12:58:38 2014 -0700
I can't find any performance benefit to using the GL path and the code
renders this trapezoid incorrectly:
- top: FIXED 29.50
- bottom: FIXED 30.00
- left top: POINT 0.00, 29.50
- left bottom: POINT 0.00, 30.50
- right top: POINT -127.50, 29.50
- right bottom: POINT 52.50, 30.00
+ top: FIXED 29.50
+ bottom: FIXED 30.00
+ left top: POINT 0.00, 29.50
+ left bottom: POINT 0.00, 30.50
+ right top: POINT -127.50, 29.50
+ right bottom: POINT 52.50, 30.00
This should render a solid line from 0,30 to 52,30 but draws nothing.
@@ -14694,7 +24719,7 @@ Date: Wed Sep 17 07:41:27 2014 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit eaee6572beefca240c42791f9a3a6e547bedd410
-Merge: e3aa13b b84d25f
+Merge: e3aa13b8d6 b84d25fd53
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 17 15:49:24 2014 -0700
@@ -15381,7 +25406,7 @@ Date: Wed Sep 10 16:20:45 2014 +0900
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 54a1d4db825be90fb7be138e3267a15922d62f03
-Merge: 8f8dcfe f92df22
+Merge: 8f8dcfee20 f92df22a03
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 11 18:27:41 2014 -0700
@@ -15680,7 +25705,7 @@ Date: Fri Jun 13 16:16:51 2014 +0100
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 35dc7c75150733dbcef8a18b6796f49a7c48ebee
-Merge: 3a51418 5f3485b
+Merge: 3a51418b2d 5f3485b06e
Author: Eric Anholt <eric@anholt.net>
Date: Mon Aug 25 15:52:58 2014 -0700
@@ -15891,7 +25916,7 @@ Date: Mon Aug 11 15:23:02 2014 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d09c9ddb866dea31e2adf82be329d5d3489718f5
-Merge: 606b701 ab32ee3
+Merge: 606b701c56 ab32ee3589
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 12 16:34:24 2014 -0700
@@ -16898,7 +26923,7 @@ Date: Tue Jul 22 17:55:25 2014 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 556cdf8fe870bc23e0393c0eed15c86f49a0b9f8
-Merge: 83701c4 1faa766
+Merge: 83701c4ee8 1faa766705
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 24 16:51:00 2014 -0700
@@ -17129,14 +27154,14 @@ Date: Fri Jul 18 09:13:54 2014 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5c2e9fa3d6c4bdf626fededce866056ba8eca502
-Merge: e678b49 6d49548
+Merge: e678b4971b 6d49548849
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 17 20:06:21 2014 -0700
Merge remote-tracking branch 'anholt/glamor-next'
commit 6d4954884908ea9894fcfe9836db1ba7bb45be61
-Merge: 9ddcb20 55f5bfb
+Merge: 9ddcb20f47 55f5bfb578
Author: Eric Anholt <eric@anholt.net>
Date: Thu Jul 17 18:00:44 2014 -0700
@@ -17326,11 +27351,11 @@ Date: Wed Jul 16 16:03:23 2014 -0700
drawable as x_dest, y_dest. The protocol coordinates now exist solely to
'pin' the three objects together.
- extents->x1,y1 Screen origin of clipped operation
+ extents->x1,y1 Screen origin of clipped operation
width,height Extents of the clipped operation
- x_dest,y_dest Unclipped destination-relative operation coordinate
- x_source,y_source Unclipped source-relative operation coordinate
- x_mask,y_mask Unclipped mask-relative operation coordinate
+ x_dest,y_dest Unclipped destination-relative operation coordinate
+ x_source,y_source Unclipped source-relative operation coordinate
+ x_mask,y_mask Unclipped mask-relative operation coordinate
One thing we want to know is what the offset is from the original
operation origin to the clipped origin
@@ -17668,7 +27693,7 @@ Date: Mon Jul 7 08:27:44 2014 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3
-Merge: 9308eaf a549987
+Merge: 9308eafb7d a5499870e2
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 7 16:53:07 2014 -0700
@@ -17726,11 +27751,11 @@ Date: Thu Feb 13 13:42:05 2014 +0100
to load for non-PCI output devices. DDX modules can ship an xorg.conf.d
snippet (e.g. in /usr/share/X11/xorg.conf.d) that looks like this:
- Section "OutputClass"
- Identifer "NVIDIA Tegra open-source driver"
- MatchDriver "tegra"
- Driver "opentegra"
- EndSection
+ Section "OutputClass"
+ Identifer "NVIDIA Tegra open-source driver"
+ MatchDriver "tegra"
+ Driver "opentegra"
+ EndSection
This will cause any device that's driven by the kernel driver named
"tegra" to use the "opentegra" DDX module.
@@ -17919,7 +27944,7 @@ Date: Mon Jun 16 08:06:53 2014 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 736bed2aaf4bb672b6c7b33146fe84700baf22bd
-Merge: ce581ac d90b5f8
+Merge: ce581ac3fa d90b5f8301
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 23 14:18:03 2014 -0700
@@ -17958,7 +27983,7 @@ Date: Mon Feb 24 11:36:54 2014 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ea47341792cf06eda5bbdf0aca48aacc024a5be0
-Merge: 334faab a11bbd8
+Merge: 334faabe68 a11bbd875f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 23 13:50:54 2014 -0700
@@ -18689,7 +28714,7 @@ Date: Wed May 28 08:13:59 2014 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b5526141f78df15bc5df2497bc4b4a17f1a6368d
-Merge: dc8d068 a205ec3
+Merge: dc8d068847 a205ec3ab7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 2 13:08:23 2014 -0700
@@ -18706,7 +28731,7 @@ Date: Mon Jun 2 01:17:31 2014 +0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a6ffdc69c4ac45bc39924159c7fab5f02f720f1f
-Merge: 63c48de 1c10b37
+Merge: 63c48de63b 1c10b37380
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 2 11:30:24 2014 -0700
@@ -18731,7 +28756,7 @@ Date: Fri May 30 16:50:35 2014 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab47ec9636b21a7f542d2e8612834915e7c8cc64
-Merge: 0df871c cfaf2ab
+Merge: 0df871cf34 cfaf2abbac
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jun 2 11:22:48 2014 -0700
@@ -19111,7 +29136,7 @@ Date: Wed Apr 30 10:55:26 2014 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d60724b752613ce2ad11c6ae102bf4513f9768ff
-Merge: a5b9757 15460ea
+Merge: a5b9757142 15460eaed2
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 8 12:58:41 2014 -0700
@@ -19323,7 +29348,7 @@ Date: Thu Apr 24 13:38:28 2014 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6bd7ad914470322ddd02b50078e159234ebec643
-Merge: b92a928 e06fbe4
+Merge: b92a9289fe e06fbe4dc8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 29 09:37:37 2014 -0700
@@ -19974,17 +29999,17 @@ Date: Fri Apr 11 17:44:59 2014 -0400
int screen;
xcb_connection_t *c = xcb_connect(NULL, &screen);
if (!c || xcb_connection_has_error(c)) {
- fprintf(stderr, "Cannot open default display \"%s\"\n", getenv("DISPLAY"));
- return EXIT_FAILURE;
+ fprintf(stderr, "Cannot open default display \"%s\"\n", getenv("DISPLAY"));
+ return EXIT_FAILURE;
}
// Find root window and depth
const xcb_setup_t *setup = xcb_get_setup(c);
if (screen >= setup->roots_len)
- screen = 0;
+ screen = 0;
xcb_screen_iterator_t si = xcb_setup_roots_iterator(setup);
for (int i=0; i < screen; i++)
- xcb_screen_next(&si);
+ xcb_screen_next(&si);
xcb_window_t root = si.data->root;
uint8_t depth = si.data->root_depth;
xcb_visualid_t visual = si.data->root_visual;
@@ -19993,8 +30018,8 @@ Date: Fri Apr 11 17:44:59 2014 -0400
xcb_render_query_pict_formats_reply_t *qpf;
qpf = xcb_render_query_pict_formats_reply(c, xcb_render_query_pict_formats(c), NULL);
if (!qpf) {
- fprintf(stderr, "Cannot query RENDER picture formats\n");
- return EXIT_FAILURE;
+ fprintf(stderr, "Cannot query RENDER picture formats\n");
+ return EXIT_FAILURE;
}
xcb_render_pictformat_t fmt_a8 = 0;
xcb_render_pictforminfo_iterator_t pfi =
@@ -20010,8 +30035,8 @@ Date: Fri Apr 11 17:44:59 2014 -0400
xcb_render_pictforminfo_next(&pfi);
}
if (!fmt_a8) {
- fprintf(stderr, "Cannot find a8 RENDER picture format\n");
- return EXIT_FAILURE;
+ fprintf(stderr, "Cannot find a8 RENDER picture format\n");
+ return EXIT_FAILURE;
}
xcb_render_pictformat_t fmt_visual = 0;
@@ -20036,8 +30061,8 @@ Date: Fri Apr 11 17:44:59 2014 -0400
}
found_visual:
if (!fmt_visual) {
- fprintf(stderr, "Cannot find visual RENDER picture format\n");
- return EXIT_FAILURE;
+ fprintf(stderr, "Cannot find visual RENDER picture format\n");
+ return EXIT_FAILURE;
}
xcb_render_glyphset_t glyphset = xcb_generate_id(c);
@@ -20050,8 +30075,8 @@ Date: Fri Apr 11 17:44:59 2014 -0400
xcb_window_t window = xcb_generate_id(c);
uint32_t list[] = { si.data->black_pixel, XCB_EVENT_MASK_EXPOSURE };
xcb_create_window(c, XCB_COPY_FROM_PARENT, window, root, 0, 0, WIN_SIZE, WIN_SIZE,
- 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
- XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK, list);
+ 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
+ XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK, list);
xcb_map_window(c, window);
xcb_render_picture_t winpic = xcb_generate_id(c);
xcb_render_create_picture(c, winpic, window, fmt_visual, 0, NULL);
@@ -20066,9 +30091,9 @@ Date: Fri Apr 11 17:44:59 2014 -0400
xcb_flush(c);
for (xcb_generic_event_t *ev = xcb_wait_for_event(c); ev; ev = xcb_wait_for_event(c)) {
- int type = ev->response_type;
- free(ev);
- if (type == XCB_EXPOSE) {
+ int type = ev->response_type;
+ free(ev);
+ if (type == XCB_EXPOSE) {
xcb_clear_area(c, 0, window, 0, 0, 0, 0);
xcb_render_composite_glyphs_8(c, XCB_RENDER_PICT_OP_SRC, pixpic, winpic, fmt_a8,
glyphset, 0, 0, sizeof(elt), (uint8_t *)&elt);
@@ -20106,7 +30131,7 @@ Date: Mon Apr 21 16:30:49 2014 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba5c2b6c876a15fe18bc1ff1ab4e773c46bc9009
-Merge: 9c86d5f 66b6024
+Merge: 9c86d5f4f6 66b6024740
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 21 14:59:51 2014 -0700
@@ -20526,7 +30551,7 @@ Date: Tue Apr 8 01:01:28 2014 -0700
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2
-Merge: bd3de10 ec6007e
+Merge: bd3de10f86 ec6007e6f7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 9 21:59:17 2014 -0700
@@ -20620,7 +30645,7 @@ Date: Thu Apr 3 18:22:50 2014 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b4d0bec22c15930abf13a7fb9d684208ccd56b1d
-Merge: 3c34dd3 6e539d8
+Merge: 3c34dd3603 6e539d8817
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 3 15:35:01 2014 -0700
@@ -20889,7 +30914,7 @@ Date: Fri Mar 21 13:13:27 2014 -0700
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 84f977467b514af88019ab2791bf7a74530b54df
-Merge: 9d20d18 9892471
+Merge: 9d20d18fb9 98924719d5
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 3 10:44:28 2014 -0700
@@ -21050,7 +31075,7 @@ Date: Wed Mar 26 12:24:49 2014 +0100
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3
-Merge: 8468e24 bc348bd
+Merge: 8468e24430 bc348bd2c4
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 31 23:24:56 2014 -0700
@@ -21573,7 +31598,7 @@ Date: Tue Mar 25 13:48:52 2014 -0400
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bda6fdc71c25b0c3f3747f445103a1995a5713f4
-Merge: e46820f 78167a9
+Merge: e46820fb89 78167a98a8
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 25 16:06:03 2014 -0700
@@ -21692,7 +31717,7 @@ Date: Sat Mar 22 14:30:04 2014 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9fdae5f4a648a10653e18dbc602646f3e22e522
-Merge: 99bee6c 0e5d299
+Merge: 99bee6c054 0e5d2996ac
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 22 14:09:00 2014 -0700
@@ -21726,7 +31751,7 @@ Date: Fri Jan 17 09:54:01 2014 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1782316744866a181ed92486bb4dca6ac46d40bd
-Merge: 4fb31e4 2b77b20
+Merge: 4fb31e4824 2b77b208da
Author: Keith Packard <keithp@keithp.com>
Date: Sat Mar 22 13:46:15 2014 -0700
@@ -21960,7 +31985,7 @@ Date: Wed Mar 19 10:27:39 2014 -0700
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4fb31e4824d46edc80bb49b4065152899faa5ac6
-Merge: d18d3f6 0e531fb
+Merge: d18d3f6d18 0e531fbb97
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 19 06:43:14 2014 -0700
@@ -21976,7 +32001,7 @@ Date: Wed Mar 12 16:31:25 2014 +1000
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
commit d18d3f6d18aa7827748f7ba14efd405b525883d0
-Merge: 81a4952 6649d00
+Merge: 81a4952d3d 6649d0059e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 17 17:29:56 2014 -0700
@@ -22635,7 +32660,7 @@ Date: Fri Mar 7 14:32:28 2014 -0800
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4
-Merge: 96a28e9 7950664
+Merge: 96a28e9c91 795066477e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Mar 11 22:04:36 2014 -0700
@@ -22995,7 +33020,7 @@ Date: Mon Mar 10 08:58:37 2014 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1c61d38528a573caadee2468ee59ea558c822e09
-Merge: 5350ae1 bf35437
+Merge: 5350ae1d38 bf3543739d
Author: Keith Packard <keithp@keithp.com>
Date: Fri Mar 7 22:07:19 2014 -0800
@@ -23534,7 +33559,7 @@ Date: Sun Feb 9 11:20:59 2014 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1940508a4af33d44a7a8ef24bbdcd1e31e228dab
-Merge: c85ea92 ddeca92
+Merge: c85ea92af1 ddeca92749
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 24 16:27:52 2014 -0800
@@ -23549,7 +33574,7 @@ Date: Mon Feb 24 09:51:39 2014 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0840a303c47b9b10ba8e24e62956da0f1675e963
-Merge: 0f10cfd 3d71df4
+Merge: 0f10cfd4b9 3d71df48e7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 24 09:40:23 2014 -0800
@@ -23597,7 +33622,7 @@ Date: Wed Feb 19 13:48:06 2014 -0500
LDADD is for libraries and not for source code.
- Introduced in commit: ccb3e78124fb05defd0c9b438746b79d84dfc3ae
+ Introduced in commit: ccb3e78124fb05defd0c9b438746b79d84dfc3ae
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -23613,8 +33638,8 @@ Date: Wed Feb 19 17:16:48 2014 +0100
the field (rather than the field's address). The correct way to do it
would have been (note the &'s):
- assert(((void *) &v->axisVal - (void *) v) % sizeof(double) == 0);
- assert(((void *) &v->axes - (void *) v) % sizeof(double) == 0);
+ assert(((void *) &v->axisVal - (void *) v) % sizeof(double) == 0);
+ assert(((void *) &v->axes - (void *) v) % sizeof(double) == 0);
That's essentially what the offsetof() macro does. Using offsetof() has
the added benefit of not using void pointer arithmetic and therefore
@@ -23915,7 +33940,7 @@ Date: Sun Feb 9 16:56:40 2014 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5300212ce8e9364ba26497605f3edc089af20130
-Merge: ae796d4 0b193b3
+Merge: ae796d43c9 0b193b3ac9
Author: Keith Packard <keithp@keithp.com>
Date: Sun Feb 9 16:05:42 2014 -0800
@@ -23999,9 +34024,9 @@ Date: Mon Feb 3 17:38:24 2014 -0800
Fixes Solaris Studio compiler warning & error:
"glxext.c", line 557: warning: assignment type mismatch:
- pointer to void "=" pointer to function(void) returning void
+ pointer to void "=" pointer to function(void) returning void
"glxext.c", line 559: error: operands have incompatible types:
- pointer to void ":" pointer to function(void) returning void
+ pointer to void ":" pointer to function(void) returning void
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
@@ -24478,21 +34503,21 @@ Date: Tue Jan 28 20:27:49 2014 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit da1660deeb9032ecca61f4bcdc9fc2eec2ada445
-Merge: 0fbb3d7 9fc1916
+Merge: 0fbb3d711e 9fc19168e7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 27 19:02:15 2014 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 0fbb3d711efec5222a57b45a70d28fc98380f3a1
-Merge: 7ddef4f b98e493
+Merge: 7ddef4f703 b98e49379c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 27 14:11:09 2014 -0800
Merge remote-tracking branch 'anholt/glamor-reformat'
Conflicts:
- Makefile.am
+ Makefile.am
Conflict caused by adding PSEUDORAMIX and GLAMOR directory defines in
separate branches
@@ -24973,14 +34998,14 @@ Date: Wed Dec 11 11:55:37 2013 -0800
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 25ebb9dbc9df659dec2bf6c27654a5bad2d11f94
-Merge: 409e8e2 71baa46
+Merge: 409e8e29fb 71baa466b1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:33:53 2014 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 409e8e29fbe16122ba5a4249256fc56e2e68ea93
-Merge: 457bc83 d6c8d75
+Merge: 457bc83549 d6c8d75097
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:32:35 2014 -0800
@@ -25008,21 +35033,21 @@ Date: Sat Jan 4 00:09:45 2014 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 044a6ef2ff5f2c83a80b11e747f62f48830b526b
-Merge: 0b932cf 77df653
+Merge: 0b932cf47a 77df653ae3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:28:54 2014 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit 0b932cf47a4df8ea0f7488e285d218fe7c10dd77
-Merge: 1d76b02 295d41f
+Merge: 1d76b02fac 295d41fa2a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:27:36 2014 -0800
Merge remote-tracking branch 'anholt/xserver-unifdef'
commit 1d76b02fac79c0360ae201e4d1a8ba0e9a00e810
-Merge: 771f390 4dd62d7
+Merge: 771f390efd 4dd62d7807
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 22 11:22:35 2014 -0800
@@ -25957,7 +35982,7 @@ Date: Thu Dec 19 14:31:07 2013 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0
-Merge: 4d62646 929795d
+Merge: 4d62646142 929795d50d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 19 14:14:59 2013 -0800
@@ -27886,9 +37911,9 @@ Date: Fri Apr 6 17:01:57 2012 +0800
are not frequenly used in real application. We simply
fallback them currently.
- PictOpAtop: s*mask*dst.a + (1 - s.a*mask)*dst
- PictOpAtopReverse: s*mask*(1 - dst.a) + dst *s.a*mask
- PictOpXor: s*mask*(1 - dst.a) + dst * (1 - s.a*mask)
+ PictOpAtop: s*mask*dst.a + (1 - s.a*mask)*dst
+ PictOpAtopReverse: s*mask*(1 - dst.a) + dst *s.a*mask
+ PictOpXor: s*mask*(1 - dst.a) + dst * (1 - s.a*mask)
The two oprands in the above three ops are all reated to dst and
the blend factors are not constant (0 or 1), it's hardly to
@@ -29232,7 +39257,7 @@ Date: Wed Nov 2 13:44:50 2011 +0800
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
commit 2dbbe2565052cc024ce0e98918ed34c1239b780a
-Merge: 4d62646 7982eca
+Merge: 4d62646142 7982eca622
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 18 11:21:07 2013 -0800
@@ -29250,7 +39275,7 @@ Date: Wed Dec 18 11:16:15 2013 -0800
support code outside of glamor for now.
commit 4d62646142718024b0981eb4f1fd0131e829161f
-Merge: f4bfb14 81ba89d
+Merge: f4bfb14f53 81ba89d670
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 16 09:27:57 2013 -0800
@@ -29873,14 +39898,14 @@ Date: Fri Nov 29 12:26:43 2013 +0000
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1822,6 +1822,9 @@ if test "x$XORG" = xyes; then
- > if test "x$CONFIG_UDEV_KMS" = xyes; then
- > AC_MSG_ERROR([Platform device enumeration requires libpciaccess])
- > fi
- > + if test "x$INT10" != xstub; then
- > + AC_MSG_ERROR([Cannot build int10 without libpciaccess])
- > + fi
- > fi
- > AC_MSG_RESULT([$PCI])
+ > if test "x$CONFIG_UDEV_KMS" = xyes; then
+ > AC_MSG_ERROR([Platform device enumeration requires libpciaccess])
+ > fi
+ > + if test "x$INT10" != xstub; then
+ > + AC_MSG_ERROR([Cannot build int10 without libpciaccess])
+ > + fi
+ > fi
+ > AC_MSG_RESULT([$PCI])
>
This causes my build to fail where --disable-int10-module --disable-pciaccess
@@ -30248,11 +40273,11 @@ Date: Sat Nov 9 12:36:47 2013 -0800
Change check to vblank->window == NULL in:
- present_flip_notify
+ present_flip_notify
Add check for vblank->window == NULL in:
- present_vblank_notify
- present_execute
+ present_vblank_notify
+ present_execute
present_flip_notify was also using vblank->window->drawable.pScreen,
so stop doing that and use vblank->screen instead.
@@ -30317,7 +40342,7 @@ Date: Fri Nov 15 13:26:36 2013 +0900
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a
-Merge: 0492deb 8ff7e32
+Merge: 0492deb8f8 8ff7e32c3e
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 14 17:02:04 2013 +0900
@@ -30581,7 +40606,7 @@ Date: Thu Nov 7 15:18:28 2013 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a239e6faf3fce848ac0d10c48f8e817db68a493c
-Merge: 43e5a43 f70a8bf
+Merge: 43e5a43fa8 f70a8bf371
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 11 15:26:12 2013 -0800
@@ -30644,8 +40669,8 @@ Date: Sun Nov 3 13:12:40 2013 -0800
v3: Also catch errors in ShmCreateSegment
Conflicts:
- include/dix-config.h.in
- include/xorg-config.h.in
+ include/dix-config.h.in
+ include/xorg-config.h.in
commit 719e880d7698d92f9b854b217ef9680aaa446f2e
Author: Keith Packard <keithp@keithp.com>
@@ -30818,7 +40843,7 @@ Date: Fri Nov 1 01:43:59 2013 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3
-Merge: 66c5ee0 f36f5a6
+Merge: 66c5ee0ff4 f36f5a65f6
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 1 00:34:18 2013 -0700
@@ -31017,7 +41042,7 @@ Date: Tue Oct 8 17:45:40 2013 -0400
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 95bf478b78e466002c382bcde7d4d62591e9215d
-Merge: abf5d5a bb745f2
+Merge: abf5d5ac12 bb745f2b45
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 31 18:18:19 2013 -0700
@@ -31039,7 +41064,7 @@ Date: Thu Oct 31 08:57:56 2013 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e4636072949a76477fe7c9d54662a0b3536b1372
-Merge: 17ed7ac 5c5c1b7
+Merge: 17ed7ac1fe 5c5c1b7798
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 31 17:05:48 2013 -0700
@@ -31112,17 +41137,17 @@ Date: Thu Jan 17 13:43:02 2013 -0800
void SetReqFds(ClientPtr client, int req_fds)
- Marks the number of file descriptors expected for this
- request. Call this before any request processing so that
- any un-retrieved file descriptors will be closed
- automatically.
+ Marks the number of file descriptors expected for this
+ request. Call this before any request processing so that
+ any un-retrieved file descriptors will be closed
+ automatically.
int ReadFdFromClient(ClientPtr client)
- Reads the next queued file descriptor from the connection. If
- this request is not expecting any more file descriptors, or
- if there are no more file descriptors available from the
- connection, then this will return -1.
+ Reads the next queued file descriptor from the connection. If
+ this request is not expecting any more file descriptors, or
+ if there are no more file descriptors available from the
+ connection, then this will return -1.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
@@ -31303,7 +41328,7 @@ Date: Wed Oct 30 13:33:49 2013 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f
-Merge: 04ab07c 9f4afe7
+Merge: 04ab07ca19 9f4afe7e83
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 29 21:00:13 2013 -0700
@@ -31351,7 +41376,7 @@ Date: Thu Oct 17 18:26:28 2013 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b32a4c91ccd479638c2bd2c0143b6ea170c717d1
-Merge: be66809 c671e93
+Merge: be6680967a c671e935e7
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 29 09:37:30 2013 -0700
@@ -31455,7 +41480,7 @@ Date: Sat Aug 3 09:47:55 2013 -0400
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Mar 21 11:59:29 2011 -0400
- glx: Reimplement context tags
+ glx: Reimplement context tags
In that, I changed the glx client state to not explicitly track the list
of current contexts for the client (since that was what we were deriving
@@ -31625,7 +41650,7 @@ Date: Fri Oct 18 17:31:01 2013 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e3220d7bae4548bf64e5879c981ad070ac1f78f7
-Merge: 73b2660 2523a44
+Merge: 73b2660d72 2523a445a0
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 18 17:22:52 2013 -0700
@@ -31635,7 +41660,7 @@ Date: Fri Oct 18 17:22:52 2013 -0700
also merging in the spurious merge at the top of that branch.
commit f8662a133690773692dfa392ecfa3b8b56af8fa9
-Merge: 7cf1b59 2523a44
+Merge: 7cf1b595c8 2523a445a0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 18 16:50:12 2013 +1000
@@ -32018,7 +42043,7 @@ Date: Sun Oct 6 16:45:52 2013 +0100
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 6a9bd103cb993e873cb82664b677ceed73c0bd85
-Merge: ea3b7db 8aae28e
+Merge: ea3b7db4b7 8aae28e3cb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 7 17:29:38 2013 -0700
@@ -32207,7 +42232,7 @@ Date: Sat Sep 28 15:26:33 2013 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f3b529bf25db2700addbafc7aa4fc5b126ba9929
-Merge: 4399bd3 abc2bfc
+Merge: 4399bd3832 abc2bfca16
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 14:04:48 2013 -0700
@@ -32224,14 +42249,14 @@ Date: Mon Sep 30 13:30:46 2013 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9ccb4a63982942fdce19609d2cadbd8e51708462
-Merge: 5d2ec69 da5e201
+Merge: 5d2ec6933f da5e20127a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 13:54:55 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 5d2ec6933f6bb5116666ca1bfb07f0f20bf2a0b5
-Merge: 7d3d4ae 6ee4d9f
+Merge: 7d3d4ae55d 6ee4d9f94a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 4 13:50:04 2013 -0700
@@ -32889,7 +42914,7 @@ Date: Wed Aug 21 14:12:52 2013 -0400
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 47ff382d1fce25a8b097d45b79489e891f1f1228
-Merge: 6f89ae3 3752a81
+Merge: 6f89ae3e64 3752a81580
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 9 15:13:42 2013 -0700
@@ -33820,7 +43845,7 @@ Date: Sat Aug 17 12:17:36 2013 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f67d022523c59a27f3bf8791aa9ca6624318b1fd
-Merge: 5a36cdd 9680f6a
+Merge: 5a36cdd915 9680f6a12d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Aug 6 07:12:12 2013 +0200
@@ -33945,7 +43970,7 @@ Date: Wed Jul 31 11:24:48 2013 +1000
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449
-Merge: bdd1e22 4360514
+Merge: bdd1e22cbd 4360514d1c
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 25 22:50:27 2013 -0700
@@ -34248,7 +44273,7 @@ Date: Mon Sep 3 15:19:43 2012 +0100
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit d5ebe20f9ba9569351c4a41449866679fd60ba45
-Merge: 21ea7eb 33f7e60
+Merge: 21ea7ebb6a 33f7e60785
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 22 20:34:41 2013 -0700
@@ -34597,7 +44622,7 @@ Date: Mon Jun 17 15:51:19 2013 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 227015d6544115258b74c31b700f9bd163540e24
-Merge: d9005d5 80054fc
+Merge: d9005d58c0 80054fcafb
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 18 10:53:08 2013 -0700
@@ -34772,21 +44797,21 @@ Date: Mon May 27 13:46:49 2013 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cb3018d8a15add48efb3335e1f79b66378166008
-Merge: c76a1b3 6589f3b
+Merge: c76a1b343d 6589f3b55e
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 23 19:58:46 2013 -0600
Merge remote-tracking branch 'whot/unreviewed'
commit c76a1b343d6a56aa9529e87f0eda8d61355d562b
-Merge: 891123c 9a5ad65
+Merge: 891123ce9d 9a5ad65330
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 23 19:58:36 2013 -0600
Merge remote-tracking branch 'whot/touch-grab-race-condition-56578-v3'
commit 891123ce9dac5e52685b9a921b33d8279ba52956
-Merge: 7e97166 49521ed
+Merge: 7e97166c4f 49521edaf8
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 23 10:30:15 2013 -0600
@@ -35559,14 +45584,14 @@ Date: Fri Feb 15 11:19:10 2013 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 2746c681639f9512e6e45fb8d0151b996b6aff7f
-Merge: 1e6cf8e 9878e09
+Merge: 1e6cf8ec20 9878e097a7
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 6 10:52:40 2013 -0700
Merge remote-tracking branch 'alanc/master'
commit 1e6cf8ec20d07b73a11116564aba71b4e4291dcd
-Merge: dbfeaf7 5860408a
+Merge: dbfeaf7062 5860408a19
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 6 10:20:21 2013 -0700
@@ -35933,21 +45958,21 @@ Date: Sun Feb 10 10:24:59 2013 -0800
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 7ab98bafc9a3426fd40f8ae693430491333ba4fc
-Merge: 53da26a 5ab2603
+Merge: 53da26afb7 5ab260317a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 14:14:45 2013 -0700
Merge remote-tracking branch 'geertu/master'
commit 53da26afb76bcce70b91c5df23d25e7e85c010cf
-Merge: 5ece86e d8d3c78
+Merge: 5ece86e921 d8d3c78b6e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 10:27:19 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 5ece86e921a1df457a9baab6a2357ccda4ad6957
-Merge: ef0a726 22cab8a
+Merge: ef0a726bc8 22cab8a28a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 24 10:23:51 2013 -0700
@@ -36667,7 +46692,7 @@ Date: Sat Feb 23 13:14:45 2013 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c2ede8f92f0d6f15b1b2a04889cb54cd1728780b
-Merge: 190b032 7050aae
+Merge: 190b032151 7050aae69c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 18 11:26:24 2013 -0700
@@ -36691,7 +46716,7 @@ Date: Thu Feb 14 15:06:57 2013 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 116f020102fd6c2a603069a639b113dfa31b48b7
-Merge: cf89aa5 0f537da
+Merge: cf89aa5374 0f537da72d
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 18 11:18:58 2013 -0700
@@ -36960,7 +46985,7 @@ Date: Tue Mar 5 10:14:29 2013 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 604169af8b67afc74a292cdb9070a3a1f2d7c536
-Merge: 8f4640b 6ea59dc
+Merge: 8f4640bdb9 6ea59dc2d8
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 4 21:09:59 2013 -0800
@@ -37159,7 +47184,7 @@ Date: Mon Feb 27 16:43:10 2012 +1000
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 88517ced1fa2e621be2d05a319b522b3111da516
-Merge: 82425c6 73974dd
+Merge: 82425c66e7 73974dd7ea
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 15 11:58:52 2013 +1000
@@ -37282,7 +47307,7 @@ Date: Thu Feb 14 10:02:02 2013 +1000
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e
-Merge: 9a35d42 eda7dbf
+Merge: 9a35d4240e eda7dbff5a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 14 11:05:48 2013 -0800
@@ -37518,7 +47543,7 @@ Date: Fri Jan 25 11:47:32 2013 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 0d5bb882600ee7734af034fbea935a79d21d1e70
-Merge: b33fcb1 61a99af
+Merge: b33fcb1497 61a99aff9d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Feb 8 14:10:52 2013 +1000
@@ -37950,14 +47975,14 @@ Date: Tue Jan 22 07:39:53 2013 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362
-Merge: 591c062 d6dcde7
+Merge: 591c06277b d6dcde7a03
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 20 15:58:38 2013 -0800
Merge remote-tracking branch 'jturney/xserver-next'
commit 591c06277bb120ab9615633f2d28addbd3a2aa5f
-Merge: 6703a7c fa6ab7d
+Merge: 6703a7c7cf fa6ab7d9b2
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jan 20 15:52:26 2013 -0800
@@ -38140,7 +48165,7 @@ Date: Wed Oct 26 17:03:25 2011 -0500
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit fa6ab7d9b2d7fd8184f1e068360607845f5c33ab
-Merge: adde4e6 0e1ab43
+Merge: adde4e6448 0e1ab433f4
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 11 14:58:17 2013 +1000
@@ -38557,14 +48582,14 @@ Date: Wed Dec 19 12:47:35 2012 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2a0b544f5c09f79e4ab04ea8103a5ecf59ee2e7b
-Merge: 0eb1559 ba4bb3b
+Merge: 0eb1559eb2 ba4bb3bc1b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:26:00 2012 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit 0eb1559eb29d11e63c2b33e317590a88d86fe313
-Merge: 386e4d7 ea1d76d
+Merge: 386e4d76ba ea1d76d1b6
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:21:31 2012 -0800
@@ -38574,25 +48599,25 @@ Date: Wed Dec 19 12:21:31 2012 -0800
whitespace.
commit 386e4d76baaffe226d2d561ff936509454eb0ac2
-Merge: 014a5c8 9ff2e83
+Merge: 014a5c8a9d 9ff2e83151
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:17:59 2012 -0800
Merge remote-tracking branch 'alanc/master'
commit 014a5c8a9d86f2f992183bff9106354fac2c3b0e
-Merge: f793b5f 2eefa5d
+Merge: f793b5fd3e 2eefa5d6e8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 19 12:09:31 2012 -0800
Merge remote-tracking branch 'whot/barriers'
Conflicts:
- Xi/xichangehierarchy.c
+ Xi/xichangehierarchy.c
Small conflict with the patch from
- Xi: don't use devices after removing them
+ Xi: don't use devices after removing them
Was easily resolved by hand.
@@ -38743,7 +48768,7 @@ Date: Wed Dec 12 11:02:19 2012 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d508b81857edaed03c7ee06410434ea56d9b701
-Merge: d982d87 bb6f351
+Merge: d982d87743 bb6f3514ca
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 17 11:45:45 2012 -0800
@@ -38753,7 +48778,7 @@ Date: Mon Dec 17 11:45:45 2012 -0800
reviewed them...
commit d982d877436377597b8ed04bca1438d2edaf53ee
-Merge: da3eaf6 6b4aa8a
+Merge: da3eaf6bdb 6b4aa8a359
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 17 10:56:12 2012 -0800
@@ -39103,14 +49128,14 @@ Date: Thu Nov 1 14:14:13 2012 -0400
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bb6f3514ca17d993c1af380e8d4480d61e5bbcae
-Merge: f961c3a 08da994
+Merge: f961c3a3b9 08da994a08
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 12 17:25:28 2012 +1000
Merge branch 'stack-smash-on-touchpoint' into for-keith
commit f961c3a3b9dfbe1201da317c24797ba7f979731e
-Merge: 36740d0 39f19b3
+Merge: 36740d02b9 39f19b3f3b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Dec 12 17:25:23 2012 +1000
@@ -39311,7 +49336,7 @@ Date: Tue Dec 4 15:03:37 2012 +1000
Tested-by: Frank Roscher <Frank-Roscher@gmx.net>
commit b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3
-Merge: e9ea96d ce6b652
+Merge: e9ea96d6a8 ce6b652929
Author: Keith Packard <keithp@keithp.com>
Date: Fri Nov 30 09:31:46 2012 -0800
@@ -39333,7 +49358,7 @@ Date: Fri Nov 30 20:54:38 2012 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ce6b6529290f7d42717aad3fd8a83aaaaf8962de
-Merge: 6e18599 3b9f1c7
+Merge: 6e18599d69 3b9f1c7017
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 29 14:49:22 2012 +1000
@@ -39446,7 +49471,7 @@ Date: Thu Nov 8 14:28:09 2012 +0100
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 1712a45422a63f11b2146541279616fcfda09ec6
-Merge: e54f71a 338bec3
+Merge: e54f71a2c7 338bec3005
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 28 07:54:13 2012 -0800
@@ -39579,7 +49604,7 @@ Date: Wed Oct 17 12:06:47 2012 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d50a94568e06a06df682a0028579d37a7b209d15
-Merge: 87b60ef cf05db8
+Merge: 87b60efb85 cf05db8dde
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 27 15:14:26 2012 -0800
@@ -39984,7 +50009,7 @@ Date: Sat Oct 13 22:43:26 2012 -0400
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea
-Merge: 14c9e24 6f14508
+Merge: 14c9e245ba 6f145084d5
Author: Keith Packard <keithp@keithp.com>
Date: Sun Nov 18 21:50:20 2012 -0800
@@ -40094,7 +50119,7 @@ Date: Sat Nov 17 11:52:10 2012 -0500
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
commit 011f8458805e443ac9130865d2840a929a00cabf
-Merge: 54ba26c b4e44b2
+Merge: 54ba26cb1f b4e44b285e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 5 17:16:07 2012 -0800
@@ -40421,7 +50446,7 @@ Date: Wed Oct 24 23:57:11 2012 -0500
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 04f980ead5e9af066143a921e0a0e98f26f28ee5
-Merge: a194630 a4941ce
+Merge: a194630f7f a4941ce496
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 5 08:45:21 2012 -0800
@@ -40471,7 +50496,7 @@ Date: Tue Sep 4 17:28:16 2012 +0100
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit a194630f7f7b287cb4ea4a459df0745f4c0d4c1a
-Merge: 74a3130 d511a30
+Merge: 74a3130426 d511a3016a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Nov 1 13:38:54 2012 -0700
@@ -40506,7 +50531,7 @@ Date: Thu Oct 25 15:03:50 2012 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 74a3130426d7e1b456e45daa517769cd3e4b58c0
-Merge: 1ca096d f32ad6d
+Merge: 1ca096d5e0 f32ad6dd31
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 29 09:09:16 2012 -0700
@@ -40660,14 +50685,14 @@ Date: Sun Oct 14 23:38:20 2012 -0500
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit 53830281b4da096f9c13107d73ec9c76ff1d14cc
-Merge: abc2ef5 9cbcb5b
+Merge: abc2ef590c 9cbcb5bd6a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 26 18:04:34 2012 -0700
Merge remote-tracking branch 'sandmann/for-keithp'
commit abc2ef590c7cb33ebe21726f83b7347406975f95
-Merge: 0e85e5e c5396ec
+Merge: 0e85e5e628 c5396ec05a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Oct 26 17:11:58 2012 -0700
@@ -41455,14 +51480,14 @@ Date: Thu Oct 4 14:42:37 2012 -0700
In commit:
- commit 092c57ab173c8b71056f6feb3b9d04d063a46579
- Author: Adam Jackson <ajax@redhat.com>
- Date: Fri Jun 17 14:03:01 2011 -0400
+ commit 092c57ab173c8b71056f6feb3b9d04d063a46579
+ Author: Adam Jackson <ajax@redhat.com>
+ Date: Fri Jun 17 14:03:01 2011 -0400
- os: Hide the Connection{In,Out}put implementation details
+ os: Hide the Connection{In,Out}put implementation details
- Reviewed-by: Daniel Stone <daniel@fooishbar.org>
- Signed-off-by: Adam Jackson <ajax@redhat.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
the check for an empty output buffer was moved from one calling
location into the FlushClient implementation itself. However, this
@@ -41478,7 +51503,7 @@ Date: Thu Oct 4 14:42:37 2012 -0700
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 8367dd9736d74eca971da345c2bf559ce5bbf649
-Merge: 36c18bb 7998e26
+Merge: 36c18bb81b 7998e26159
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 4 13:08:35 2012 -0700
@@ -41542,7 +51567,7 @@ Date: Thu Oct 4 11:42:22 2012 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f179b13b91c8891254d31345ee04e773839e6b87
-Merge: 4dd5989 3d2b768
+Merge: 4dd5989d15 3d2b768efa
Author: Keith Packard <keithp@keithp.com>
Date: Thu Oct 4 11:39:46 2012 -0700
@@ -41694,7 +51719,7 @@ Date: Fri Sep 7 18:10:35 2012 +0100
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
commit 4dd5989d15465f3f3480b521d4e36673972fa24a
-Merge: 0b02150 506e343
+Merge: 0b02150c27 506e3437c7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 24 11:43:01 2012 -0700
@@ -41730,7 +51755,7 @@ Date: Mon Sep 24 14:03:31 2012 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7722bcbab2507d263c7685b15cccbfdd52fc3a24
-Merge: 4dc2a76 f54987d
+Merge: 4dc2a76740 f54987de97
Author: Keith Packard <keithp@keithp.com>
Date: Sun Sep 23 16:04:13 2012 -0700
@@ -41976,7 +52001,7 @@ Date: Thu Jun 16 17:40:24 2011 -0400
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit d01921ec18c21f21d377b60626cc2d3418b84a7c
-Merge: 70e5766 245e7e0
+Merge: 70e5766874 245e7e0361
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 20 17:26:48 2012 +0200
@@ -42163,7 +52188,7 @@ Date: Wed Sep 5 14:45:08 2012 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 856f80c8d7f22b979c72d9c70b70187df6004a03
-Merge: 0db936a b8ab93d
+Merge: 0db936a5b7 b8ab93dfbc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 5 11:02:58 2012 -0700
@@ -42308,7 +52333,7 @@ Date: Mon Aug 27 17:15:19 2012 -0700
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a557edca6152ad09c685a00e01534c35a1f00f2e
-Merge: 6619f5c 24ffcfc
+Merge: 6619f5c0e1 24ffcfcded
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 27 08:06:09 2012 -0700
@@ -42500,7 +52525,7 @@ Date: Thu Jul 19 22:15:10 2012 +0000
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734
-Merge: 16d8da5 99b94af
+Merge: 16d8da5ca9 99b94af1ff
Author: Keith Packard <keithp@keithp.com>
Date: Wed Aug 15 13:29:17 2012 -0700
@@ -42641,21 +52666,21 @@ Date: Sat Jul 14 16:07:51 2012 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 02f94b2d446f6700f791f318c551ac835af8445a
-Merge: 360fa77 7f09126
+Merge: 360fa7736b 7f09126e06
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 16:52:12 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 360fa7736b214cae3ccd39feb4dc87b9e7e9734c
-Merge: 2100e72 ac09a4a
+Merge: 2100e72388 ac09a4a091
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 16:42:34 2012 -0700
Merge remote-tracking branch 'airlied/for-keithp'
commit 2100e72388a3dc174093d80c9723f021b4614d17
-Merge: 4a6f42d c37c650
+Merge: 4a6f42dda0 c37c65052f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 16:40:54 2012 -0700
@@ -42871,21 +52896,21 @@ Date: Tue Jul 10 23:29:53 2012 -0700
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 94b514d5e4b376d05e106eb3853da511256e8545
-Merge: 7d87545 7328900
+Merge: 7d87545ba7 7328900042
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 15:13:17 2012 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 7d87545ba7395ade507cca7bdca7052b26ed18d8
-Merge: ad707a7 988d7ac
+Merge: ad707a7dcc 988d7ace19
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 15:11:13 2012 -0700
Merge remote-tracking branch 'jturney/master'
commit ad707a7dcc65c30e030c7600b54f734090e56a91
-Merge: 5a51cb8 884f51e
+Merge: 5a51cb86f3 884f51e977
Author: Keith Packard <keithp@keithp.com>
Date: Mon Aug 6 15:08:01 2012 -0700
@@ -43356,7 +53381,7 @@ Date: Thu Jul 19 15:00:03 2012 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 20b4d90f32b3ca5def5be2fdf04a91ae6c47f125
-Merge: 83df169 fd228d3
+Merge: 83df169538 fd228d3184
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 25 13:52:35 2012 -0700
@@ -43451,14 +53476,14 @@ Date: Tue Jul 17 15:47:39 2012 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit beeea70495a8d5c4afc1b1eb2cc06a24ab1a986d
-Merge: 6e438a0 6910280
+Merge: 6e438a0e18 6910280297
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 12:17:39 2012 -0700
Merge remote-tracking branch 'alanc/master'
commit 6e438a0e183f5a6c22070746c038af53d5b935ca
-Merge: 5884e7d 75966a4
+Merge: 5884e7dede 75966a4186
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 17 12:12:53 2012 -0700
@@ -43823,7 +53848,7 @@ Date: Fri Jul 13 00:47:24 2012 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 746193a7f10f11cccae05c98b933aadf58fc7375
-Merge: a2d0829 2b74949
+Merge: a2d0829531 2b74949ad0
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 12 15:10:51 2012 -0700
@@ -43875,7 +53900,7 @@ Date: Thu Jul 12 00:36:43 2012 +0100
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 656e5fea6c9ca15f932889edcc590dd01c881945
-Merge: 8b820f2 1720cd9
+Merge: 8b820f221a 1720cd9bad
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 12 08:26:35 2012 -0700
@@ -44048,11 +54073,11 @@ Date: Tue Jul 10 15:58:48 2012 -0700
In:
- commit d792ac125a0462a04a930af543cbc732f8cdab7d
- Author: Alan Coopersmith <alan.coopersmith@oracle.com>
- Date: Mon Jul 9 19:12:43 2012 -0700
+ commit d792ac125a0462a04a930af543cbc732f8cdab7d
+ Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Date: Mon Jul 9 19:12:43 2012 -0700
- Use C99 designated initializers in dix Replies
+ Use C99 designated initializers in dix Replies
the initializer for the .length element of the xGetPointerMappingReply
structure uses the value of rep.nElts, but that won't be set until
@@ -44061,7 +54086,7 @@ Date: Tue Jul 10 15:58:48 2012 -0700
Easy to verify:
- $ xmodmap -pp
+ $ xmodmap -pp
Fixed by creating a local nElts variable and using that.
@@ -44077,7 +54102,7 @@ Date: Tue Jul 10 01:14:13 2012 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e12cb147da58bd12a158807b2cd5afac32ae70f
-Merge: 532fbc2 0231279
+Merge: 532fbc29c9 023127915e
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 10 00:52:11 2012 -0700
@@ -45760,7 +55785,7 @@ Date: Thu Jul 5 21:11:16 2012 +0100
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4d24192bd24fb20d16d0054d77bffda883faeb79
-Merge: 7c9d8cb 74b786f
+Merge: 7c9d8cbd36 74b786f7ce
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 6 12:17:17 2012 -0700
@@ -46080,10 +56105,10 @@ Date: Tue Jul 3 15:45:09 2012 -0700
The objects which support screen-specific privates are:
- Windows
- Pixmaps
- GCs
- Pictures
+ Windows
+ Pixmaps
+ GCs
+ Pictures
Extending this list to include Colormaps would be possible, but
require slightly more work as the default colormap is created before
@@ -46292,14 +56317,14 @@ Date: Thu Jun 28 17:17:12 2012 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d84f0f823eeeecdf0498aadd3fbb1d11dabc0837
-Merge: 12bfb4c d04dfe3
+Merge: 12bfb4cf1b d04dfe3f75
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 4 21:23:48 2012 +1000
Merge branch 'sigio-vt-switch-issues' into for-keith
Conflicts:
- test/Makefile.am
+ test/Makefile.am
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -46410,7 +56435,7 @@ Date: Fri Jun 22 13:02:40 2012 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 24525d96a3b9dba67eb75042500b2f208a2cc246
-Merge: 4cd91bd 35e3d22
+Merge: 4cd91bd4c6 35e3d22915
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jul 2 22:35:39 2012 -0700
@@ -46730,14 +56755,14 @@ Date: Thu Jun 28 12:07:11 2012 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b4f0a4fdd6c15f49458bc3a8c3135b8c389240d
-Merge: 59294a2 d642e71
+Merge: 59294a2179 d642e71287
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 10:38:26 2012 -0700
Merge remote-tracking branch 'jturney/master'
commit 59294a2179bd5bb996693af004b470932df00ac6
-Merge: 855003c 191b630
+Merge: 855003c333 191b630656
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 28 10:11:44 2012 -0700
@@ -46969,7 +56994,7 @@ Date: Fri Jun 24 13:32:10 2011 +0100
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 3ef3ce069d52dcfa932c90ccd30854a8d9daa15a
-Merge: a0c8716 ff541e0
+Merge: a0c8716cdc ff541e0a1f
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 21 08:52:34 2012 -0700
@@ -47108,14 +57133,14 @@ Date: Thu Jun 7 16:52:20 2012 +1000
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 8dc70acbf3d82611ac9ec1ec2a52edcc01934850
-Merge: ffb47a1 b59adc9
+Merge: ffb47a123d b59adc9c24
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 14 13:04:29 2012 -0700
Merge remote-tracking branch 'alanc/master'
commit ffb47a123ddd1233fb4229cf23483652065c5e82
-Merge: db9d2b8 b840ba5
+Merge: db9d2b8a50 b840ba5f54
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 14 13:01:17 2012 -0700
@@ -47134,7 +57159,7 @@ Date: Thu Jun 7 15:01:59 2012 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6d86b64dbaef5a16712fd1fdc3157f716d238877
-Merge: 812786f 4c68f5d
+Merge: 812786f4d4 4c68f5d395
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 14 11:05:22 2012 -0700
@@ -47771,7 +57796,7 @@ Date: Fri Apr 6 12:44:07 2012 -0700
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3476eb38063473a7a5fcd78e2095e284118de839
-Merge: 78f0d9c 42ae2e8
+Merge: 78f0d9cdc4 42ae2e8199
Author: Keith Packard <keithp@keithp.com>
Date: Sun Jun 3 20:24:24 2012 -0700
@@ -48082,7 +58107,7 @@ Date: Tue May 22 21:19:40 2012 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 457fc77691b2df66f6dd3ba10ce7c1b61b9b42a3
-Merge: 2e237c8 5a3a98f
+Merge: 2e237c838f 5a3a98fcb7
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 22 10:32:29 2012 -0700
@@ -48302,7 +58327,7 @@ Date: Thu Jan 26 15:44:40 2012 -0800
Reviewed-by: Dave Airlie <airlied@redhat.com>
commit ba883a0f3435d5da82a8134e696c4905eea70f23
-Merge: ae1c48e acdc4f5
+Merge: ae1c48ebc8 acdc4f54ee
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 17 16:49:19 2012 -0700
@@ -48657,7 +58682,7 @@ Date: Tue Apr 24 18:11:16 2012 +0200
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3a94b338aaa48b656aae1bb3a5a9d64300c0a093
-Merge: afc153a c91d00e
+Merge: afc153a5b4 c91d00e0f3
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 9 21:17:16 2012 -0700
@@ -48840,7 +58865,7 @@ Date: Wed Apr 18 17:51:50 2012 +0800
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 97041364a6acb2b66b5cfd06757c90a006ad50e9
-Merge: 1908272 ee542b8
+Merge: 19082726cb ee542b8559
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 2 20:47:25 2012 -0700
@@ -49232,7 +59257,7 @@ Date: Thu Apr 19 16:51:46 2012 -0700
Tested-By: Michal Suchanek <hramrach@gmail.com>
commit d77eb7ee49ef19c2c4c7381d56e9d0f9c3fbc890
-Merge: 31e3c0f c7b1625
+Merge: 31e3c0ff7f c7b1625558
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 19 15:48:34 2012 -0500
@@ -49251,7 +59276,7 @@ Date: Thu Apr 19 15:25:41 2012 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e6308e32fe2b5f74133d4d238ffa512257f6327c
-Merge: 3720aa3 51a8d8d
+Merge: 3720aa33ee 51a8d8dd19
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 19 10:45:07 2012 -0500
@@ -49260,7 +59285,7 @@ Date: Thu Apr 19 10:45:07 2012 -0500
Touch input changes from Chase
commit 51a8d8dd19d7496fe84b37a1f0a7a03658120539
-Merge: ebf2148 00cf1c4
+Merge: ebf214876a 00cf1c40b2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Apr 19 17:03:54 2012 +1000
@@ -49668,7 +59693,7 @@ Date: Tue Apr 17 11:48:03 2012 +0100
cursor: hide cursors on LeaveVT
commit 80fefc42f5e67e6b4a4b440d8991bee7e5f38359
-Merge: 9779b90 12188c8
+Merge: 9779b904c7 12188c8a8a
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 15 21:05:30 2012 -0700
@@ -50037,7 +60062,7 @@ Date: Fri Mar 23 08:20:22 2012 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7f3997b01a8813c1d7055317eb06111aed8572c9
-Merge: 92d50c3 31646d8
+Merge: 92d50c38b2 31646d8fa9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 26 16:41:52 2012 -0700
@@ -50456,7 +60481,7 @@ Date: Fri Mar 23 14:54:05 2012 +0000
modesetting: fix build against older Xext
commit a7eac500e652f30deffd9dc5e623fab701077738
-Merge: bf876c8 d645edd
+Merge: bf876c87a9 d645edd11e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 22 13:13:07 2012 +1000
@@ -50590,7 +60615,7 @@ Date: Wed Mar 14 17:22:18 2012 -0700
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit bf876c87a9099fdfa63ed599f8ed9a954dd023d9
-Merge: 908ab3d c0b0a9b
+Merge: 908ab3d580 c0b0a9bce9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 22 11:34:43 2012 +1000
@@ -50632,7 +60657,7 @@ Date: Mon Mar 5 14:12:52 2012 +1000
s += sprintf(s, "nval: %d ::", (int)THIS->nvaluators);
for (i = 0; i < THIS->nvaluators; i++)
{
- s += sprintf(s, " %d: ", i);
+ s += sprintf(s, " %d: ", i);
if (BitIsSet(mask, i))
s += sprintf(s, "%d", (int)valuators[i]);
}
@@ -50914,13 +60939,13 @@ Date: Wed Mar 21 12:55:09 2012 -0700
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
- -bap
- -psl
- -T PrivatePtr
- -T pmWait
- -T _XFUNCPROTOBEGIN
- -T _XFUNCPROTOEND
- -T _X_EXPORT
+ -bap
+ -psl
+ -T PrivatePtr
+ -T pmWait
+ -T _XFUNCPROTOBEGIN
+ -T _XFUNCPROTOEND
+ -T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
@@ -50936,17 +60961,17 @@ Date: Wed Mar 21 12:55:09 2012 -0700
dir2=$2
for dir in $dir1 $dir2; do
- (cd $dir && find . -name '*.o' | while read file; do
- dir=`dirname $file`
- base=`basename $file .o`
- dump=$dir/$base.dump
- objdump -d $file > $dump
- done)
+ (cd $dir && find . -name '*.o' | while read file; do
+ dir=`dirname $file`
+ base=`basename $file .o`
+ dump=$dir/$base.dump
+ objdump -d $file > $dump
+ done)
done
find $dir1 -name '*.dump' | while read dump; do
- otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
- diff -u $dump $otherdump
+ otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
+ diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
@@ -51222,7 +61247,7 @@ Date: Sun Feb 19 08:34:25 2012 -0500
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 71594746c7da32e1c7986341a0da30f241a7a2be
-Merge: d53235a eaba06a
+Merge: d53235af85 eaba06a27c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 22 18:07:20 2012 +1300
@@ -51467,7 +61492,7 @@ Date: Sat Feb 11 16:13:44 2012 +1300
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 42b6756463ee0476340656707f1088dc6c2fd220
-Merge: 7674d00 ca64912
+Merge: 7674d00b04 ca64912c02
Author: Keith Packard <keithp@keithp.com>
Date: Sat Feb 11 15:36:43 2012 +1300
@@ -52246,14 +62271,14 @@ Date: Thu Jan 12 12:09:34 2012 -0800
ABI change pended for 1.13
commit e722ad6c3efa57b806ca0f2dc13114bd3619a88c
-Merge: e476af4 4e44580
+Merge: e476af417d 4e44580efd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 13:22:28 2012 -0800
Merge remote-tracking branch 'jturney/rpavlik-xwin-fixes'
commit e476af417d83730b11054f4e5b127ab5540bb332
-Merge: f4956fa 1460083
+Merge: f4956faab9 146008358e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 13:17:37 2012 -0800
@@ -52388,21 +62413,21 @@ Date: Fri Jan 6 07:21:37 2012 +0000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b113f7cdf5228dccd51a749a339c8669e3f20ff
-Merge: 0b2c649 777bf90
+Merge: 0b2c6491c5 777bf90abe
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 13:07:25 2012 -0800
Merge commit '777bf90abeac37087a3d0538b847742523d5acf2'
commit 0b2c6491c5e5e1c9ba067299f3de61f5acee263b
-Merge: 1f5587e 6b19436
+Merge: 1f5587e144 6b19436536
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 11:40:23 2012 -0800
Merge remote-tracking branch 'whot/for-keith'
commit 1f5587e14406c083687203030db6a11691ac9d9f
-Merge: a97252d 6269977
+Merge: a97252db24 6269977c91
Author: Keith Packard <keithp@keithp.com>
Date: Mon Jan 9 11:37:59 2012 -0800
@@ -52907,7 +62932,7 @@ Date: Tue Dec 27 14:02:01 2011 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8dedf9831bd80514d800f0085213296a3726dba7
-Merge: cfc4c3d cf96183
+Merge: cfc4c3d7fa cf96183122
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 27 13:13:48 2011 -0800
@@ -52957,7 +62982,7 @@ Date: Thu Dec 22 09:35:51 2011 -0800
The touchid test was using a loop like:
- for(i = 1; i < 0xffffffff; i <<= 1)
+ for(i = 1; i < 0xffffffff; i <<= 1)
When 'i' is a 32-bit variable, this infinite loops as it goes from
0x80000000 to 0. 'i' is declared as 'long', which is 32-bit in 32-bit mode.
@@ -53006,15 +63031,15 @@ Date: Thu Dec 22 10:00:15 2011 +1000
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit e395efc25f9fd60377f32c2bf1a9153d70908236
-Merge: 2bb282c fcda98c
+Merge: 2bb282cd45 fcda98c486
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Dec 22 09:29:59 2011 +1000
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into multitouch
Conflicts:
- configure.ac
- dix/inpututils.c
+ configure.ac
+ dix/inpututils.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -53444,14 +63469,14 @@ Date: Mon Dec 19 14:52:41 2011 +1000
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
commit 2d34b34ed7547b829979756ccfb2cff79368d0a4
-Merge: e4b4d83 1deede3
+Merge: e4b4d83fad 1deede3c48
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 20 00:23:33 2011 -0800
Merge remote-tracking branch 'jeremyhu/master'
commit e4b4d83fad37bb737e25f7226dbcd15b892f9528
-Merge: 4df65d2 d26cb70
+Merge: 4df65d247b d26cb70272
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 19 22:36:31 2011 -0800
@@ -53965,7 +63990,7 @@ Date: Wed Dec 14 10:34:19 2011 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7da7aa96a0acb895e1fe57a9d3f2d093479cf2a2
-Merge: b79de3f 7528a6b
+Merge: b79de3f42f 7528a6b88e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 14 11:40:10 2011 -0800
@@ -53983,7 +64008,7 @@ Date: Wed Dec 14 10:31:23 2011 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c
-Merge: f0de5e3 898d976
+Merge: f0de5e3990 898d976729
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Dec 13 14:19:54 2011 +1000
@@ -54863,7 +64888,7 @@ Date: Thu Dec 8 21:52:07 2011 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 522f8bcc0360d6a117e929a004bc956ab92037e9
-Merge: 6369b59 2abe83d
+Merge: 6369b59668 2abe83df68
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 8 20:57:26 2011 -0800
@@ -55064,14 +65089,14 @@ Date: Thu Dec 1 16:24:32 2011 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3ab8ee32470f7cf1223e04238bb8c5f74ed52fc3
-Merge: 22a666f 98c4a88
+Merge: 22a666f995 98c4a888a4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 7 12:42:17 2011 -0800
Merge remote-tracking branch 'airlied/reviewed-fixes'
commit 22a666f9952feb7248e9bb2faf777edaaac8175f
-Merge: 3824f55 e89b032
+Merge: 3824f558cc e89b0324da
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 7 12:27:23 2011 -0800
@@ -55485,14 +65510,14 @@ Date: Tue Nov 8 10:13:15 2011 -0800
Reviewed-by: Jamey Sharp <jamey@minilop.net>
commit 05f09354a30a4f5edd421220e1aa97be754c71bb
-Merge: 3197b77 08ec4da
+Merge: 3197b773c8 08ec4da6a7
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 1 14:44:52 2011 +0000
Merge remote-tracking branch 'jcristau/for-keith'
commit 3197b773c81e58cd4aa412eccaee49526012ed6f
-Merge: 2dc5ba4 dfcec1d
+Merge: 2dc5ba4a1b dfcec1d3f9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 1 14:36:58 2011 +0000
@@ -55982,7 +66007,7 @@ Date: Sat Oct 29 11:19:44 2011 -0700
LogVMessageVerb: Fix const mismatch warning
"log.c", line 382: warning: assignment type mismatch:
- pointer to char "=" pointer to const char
+ pointer to char "=" pointer to const char
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
@@ -56368,7 +66393,7 @@ Date: Fri Nov 4 23:26:25 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bfa2a1857a1efda7f171f10e855d200ca0dbcc1a
-Merge: f0d50cc e7cb8f8
+Merge: f0d50cc665 e7cb8f802a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 14 09:07:06 2011 -0800
@@ -56531,7 +66556,7 @@ Date: Thu Nov 3 13:18:46 2011 +0000
Not needed in here
commit 548c6fe044068ffba9b5306dc6b11f2ba22782a4
-Merge: 3881b0b ffe8ec8
+Merge: 3881b0bf1c ffe8ec86db
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 2 21:35:31 2011 -0700
@@ -56550,14 +66575,14 @@ Date: Tue Nov 1 07:17:07 2011 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d91aa0e6601bdf3e2cfa57b3412ab14ac486edc4
-Merge: 8df3a9c 401150d
+Merge: 8df3a9ca5a 401150d7dc
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 2 21:20:07 2011 -0700
Merge remote-tracking branch 'whot/two-screen-coordinates'
commit 8df3a9ca5abbd56eb2013fa65250d21a8f18865b
-Merge: 8329afa ef89548
+Merge: 8329afa59d ef895484c8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 2 21:18:16 2011 -0700
@@ -56712,7 +66737,7 @@ Date: Mon Oct 31 15:01:12 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 132545ff576cc69ed63f5a08127151fe550de4c3
-Merge: d0c6732 d7c44a7
+Merge: d0c6732a99 d7c44a7c97
Author: Keith Packard <keithp@keithp.com>
Date: Sun Oct 30 16:57:58 2011 -0700
@@ -56938,7 +66963,7 @@ Date: Tue Oct 25 23:48:16 2011 -0700
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5701ab4a441eb113abd0851b0d71b82d12112854
-Merge: 7d50211 a41214b
+Merge: 7d50211ab5 a41214bc9a
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 24 22:09:00 2011 -0700
@@ -57163,7 +67188,7 @@ Date: Mon Oct 24 18:47:06 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d9d3a01ffca5e2de650d098231e16205781804c5
-Merge: 17416e8 fb55f8f
+Merge: 17416e88dc fb55f8f790
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 24 18:12:23 2011 -0700
@@ -57340,21 +67365,21 @@ Date: Thu Oct 20 14:28:56 2011 -0700
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit ff61592441916b83aeb778c74352bb5b26247f84
-Merge: af3f64f 525d417
+Merge: af3f64fb77 525d4172b2
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 19 19:14:32 2011 -0700
Merge remote-tracking branch 'aplattner/for-master'
commit af3f64fb77c13180e513ee99d1fd9a1b624fd8ea
-Merge: 15bbdc1 df0dd36
+Merge: 15bbdc103b df0dd36dee
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 19 17:33:07 2011 -0700
Merge remote-tracking branch 'hramrach/pull'
commit 15bbdc103b34b6b374815698946e6c409421a644
-Merge: a5266dc 323869f
+Merge: a5266dcb3a 323869f329
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 19 17:26:50 2011 -0700
@@ -57461,7 +67486,7 @@ Date: Tue Aug 23 15:19:59 2011 -0700
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
commit c8413362049cee8c30e0a9d67f78f9ebefe8e71f
-Merge: 64d2d1b b67581c
+Merge: 64d2d1bef1 b67581cf82
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 18 07:45:24 2011 -0700
@@ -57608,14 +67633,14 @@ Date: Fri Sep 30 10:59:47 2011 +1000
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 64d2d1bef14c7ec7156bb3aae64eff69f9f7be54
-Merge: fb84be4 679c84b
+Merge: fb84be47db 679c84bce9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 17 14:36:34 2011 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit fb84be47db7cdaff406792c08e34670e8e0cbda9
-Merge: fae7ed6 32b289e
+Merge: fae7ed62ad 32b289e46c
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 17 13:50:25 2011 -0700
@@ -58377,14 +68402,14 @@ Date: Tue Aug 30 13:37:31 2011 +1000
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 6378d0233d21088b6429755627b4253859892c72
-Merge: 6e965d8 98b2306
+Merge: 6e965d8a18 98b230669f
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 13:56:06 2011 -0700
Merge remote-tracking branch 'herrb/master'
commit 6e965d8a185087a55b2100b817e18f05b3ce5a00
-Merge: 466e4b3 ac5881d
+Merge: 466e4b3f17 ac5881d6d0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 13:47:49 2011 -0700
@@ -58520,14 +68545,14 @@ Date: Mon Sep 26 22:38:44 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 9a55b3661b4172f9a32cd6fefb254e06edb1a88a
-Merge: cf11ca3 84bb020
+Merge: cf11ca360c 84bb0207f6
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 11:49:23 2011 -0700
Merge remote-tracking branch 'alanc/master'
commit cf11ca360c2ded5ca309faa9d039160947387bb8
-Merge: 463dd87 6eae9fa
+Merge: 463dd87062 6eae9fa284
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 11:44:59 2011 -0700
@@ -58550,7 +68575,7 @@ Date: Thu Sep 22 18:38:53 2011 +0300
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f5d50b46ddeb039ab6564141f61261e94ee67637
-Merge: 57cd32e 524e544
+Merge: 57cd32e934 524e5445c0
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 3 11:36:28 2011 -0700
@@ -58686,7 +68711,7 @@ Date: Sun Sep 25 20:44:26 2011 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4c6bc0e76599dbe5ede2e1f48c9936a0e996b638
-Merge: 057cc92 3304bbf
+Merge: 057cc92ebf 3304bbff9b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 30 09:24:56 2011 +1000
@@ -58895,15 +68920,15 @@ Date: Thu Sep 29 11:49:26 2011 +0100
server recycling.
commit 057cc92ebfeebe81b7d01ff2c6aa2c066c8d1a64
-Merge: afb1fe6 52c9b59
+Merge: afb1fe695d 52c9b59a9f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 29 14:18:35 2011 +1000
Merge branch 'raw-events' into next
Conflicts:
- configure.ac
- dix/events.c
+ configure.ac
+ dix/events.c
commit 52c9b59a9fed6abfeca775a7a04133cee18eac0b
Author: Peter Hutterer <peter.hutterer@who-t.net>
@@ -59410,7 +69435,7 @@ Date: Thu Sep 22 18:55:19 2011 -0700
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit afb1fe695d197187a301c19863a128a65389b15c
-Merge: 7fb4bef c7163fd
+Merge: 7fb4bef039 c7163fdd30
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 26 20:24:15 2011 -0700
@@ -61729,21 +71754,21 @@ Date: Thu Sep 1 16:48:37 2011 -0700
Reviewed-by: Matt Dew <marcoz@osource.org>
commit 7fb4bef0394a5d09680985d34bce8252b61493cb
-Merge: 98f4940 c90903b
+Merge: 98f4940093 c90903b4f7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 14:34:27 2011 -0700
Merge remote-tracking branch 'mattst88/for-keith'
commit 98f4940093dc90c3366d3e4d3ddceacbaee299dc
-Merge: b018b81 c8eacae
+Merge: b018b81533 c8eacae4f8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 14:30:19 2011 -0700
Merge remote-tracking branch 'alanc/master'
commit b018b815333b256b5e06dd6251b2e539f09f89fa
-Merge: 03d0329 0f380a5
+Merge: 03d032991d 0f380a5005
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 14:17:14 2011 -0700
@@ -61905,7 +71930,7 @@ Date: Thu Aug 4 15:35:41 2011 -0400
Use internal temp variable for swap macros
Also, fix whitespace, mainly around
- swaps(&rep.sequenceNumber)
+ swaps(&rep.sequenceNumber)
Reviewed-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
@@ -62073,7 +72098,7 @@ Date: Wed Sep 7 17:47:56 2011 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c92c83523ede8bc361526ac93d09d089fbbdae08
-Merge: 4ad271d 24b2b43
+Merge: 4ad271d06c 24b2b43e85
Author: Keith Packard <keithp@keithp.com>
Date: Wed Sep 21 13:32:06 2011 -0700
@@ -62176,11 +72201,11 @@ Date: Sat Jul 10 09:28:47 2010 -0700
Conflicts:
- ChangeLog
- dix/colormap.c
- dix/pixmap.c
- dix/window.c
- include/pixmapstr.h
+ ChangeLog
+ dix/colormap.c
+ dix/pixmap.c
+ dix/window.c
+ include/pixmapstr.h
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
@@ -62215,9 +72240,9 @@ Date: Sun Sep 18 20:47:04 2011 -0500
Alan Coopersmith explains:
- XmuSnprintf() can be replaced by snprintf() now. (It was a
- implementation X provided for it's libraries to use in the days
- before all platforms we cared about had snprintf in libc.)
+ XmuSnprintf() can be replaced by snprintf() now. (It was a
+ implementation X provided for it's libraries to use in the days
+ before all platforms we cared about had snprintf in libc.)
Reported-by: walter harms <wharms@bfs.de>
Signed-off-by: Jamey Sharp <jamey@minilop.net>
@@ -62380,7 +72405,7 @@ Date: Tue Sep 13 14:31:24 2011 -0500
x86emu: There is no NO_INLINE implementation of unaligned access here.
Patch produced with:
- unifdef -UNO_INLINE -B
+ unifdef -UNO_INLINE -B
This change isn't relevant to the similar code in
hw/xfree86/common/compiler.h, because x86emu is expected to someday move
@@ -63070,7 +73095,7 @@ Date: Thu Jul 28 15:17:59 2011 -0700
Conflicts:
- composite/compalloc.c
+ composite/compalloc.c
Signed-off-by: Keith Packard <keithp@keithp.com>
commit e87adcc9e024982fdad974de2876b00cf974dab8
@@ -63123,7 +73148,7 @@ Date: Fri Jul 29 16:12:06 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b8f61c11c94708d4f17720a55945dee4621315a4
-Merge: 5596f10 f51e42f
+Merge: 5596f10cce f51e42f583
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 29 14:58:58 2011 -0700
@@ -63439,7 +73464,7 @@ Date: Wed Jul 13 12:08:03 2011 +0100
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 01dbf2514aa0cc8c40a876a24e3cb0737c41da19
-Merge: 5a801af af0fbc3
+Merge: 5a801af689 af0fbc37e3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 13 11:44:15 2011 -0700
@@ -63605,7 +73630,7 @@ Date: Mon Oct 11 16:21:40 2010 +0100
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
commit d4096abb591353405417e53816e5c46e904e7b25
-Merge: 61f87a7 87d4f90
+Merge: 61f87a75f2 87d4f90bfc
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jul 1 15:45:45 2011 -0700
@@ -63843,14 +73868,14 @@ Date: Tue Jun 7 21:22:15 2011 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 61f87a75f2bcda939a1778d39be8cfa5c886e6d8
-Merge: 0d2153a 72d9143
+Merge: 0d2153a46c 72d914335c
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 29 20:14:51 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit 0d2153a46cc72d5f2e6a9081a3cf153aa3eb7787
-Merge: b631c39 932513e
+Merge: b631c39a21 932513e23b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 29 20:08:32 2011 -0700
@@ -63871,7 +73896,7 @@ Date: Thu Jun 23 13:37:45 2011 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d5ca33ca2dd08e8436439da926d2dedaabc268fa
-Merge: 38d55f0 4edf49d
+Merge: 38d55f06cf 4edf49d032
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 29 18:54:33 2011 -0700
@@ -64034,7 +74059,7 @@ Date: Tue Jun 28 09:33:25 2011 -0700
after 'make clean' causing 'make distcheck' to fail.
commit f968f4ace9410d827fb6b68c4e38ea9516641309
-Merge: 4dbed26 163441f
+Merge: 4dbed26254 163441fe53
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 28 09:10:14 2011 -0700
@@ -64109,7 +74134,7 @@ Date: Tue Jun 14 17:21:48 2011 -0700
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 8ac651552bb70ba36238f430adab2f7a7f24db6e
-Merge: 945b2ff 47b6ba3
+Merge: 945b2ff814 47b6ba3204
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jun 22 11:03:37 2011 -0700
@@ -64684,14 +74709,14 @@ Date: Fri May 27 11:40:56 2011 +1000
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 02d11af01211da55e9d93fe0e1851a0c6fe57472
-Merge: bf9fd0a ab0df72
+Merge: bf9fd0a83e ab0df72cd3
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 7 12:31:15 2011 -0700
Merge remote-tracking branch 'kibi/master'
commit bf9fd0a83eef771ee018438f05e2d9f20b43539b
-Merge: 21eec36 0d14056
+Merge: 21eec367d0 0d140567ba
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jun 7 07:45:22 2011 -0700
@@ -65002,14 +75027,14 @@ Date: Tue May 31 13:01:05 2011 -0700
Fixes regression introduced by b0c665ac0fe6840dda581e4d0d0b76c703d62a7b
- 0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684
- 1 X11.bin 0x00000001001315b0 DoCreateContext + 163
- 2 X11.bin 0x000000010013509f __glXDispatch + 211
- 3 X11.bin 0x00000001000c7dad Dispatch + 785
- 4 X11.bin 0x00000001000b97e5 dix_main + 1022
- 5 X11.bin 0x00000001000122bc server_thread + 50
- 6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331
- 7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13
+ 0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684
+ 1 X11.bin 0x00000001001315b0 DoCreateContext + 163
+ 2 X11.bin 0x000000010013509f __glXDispatch + 211
+ 3 X11.bin 0x00000001000c7dad Dispatch + 785
+ 4 X11.bin 0x00000001000b97e5 dix_main + 1022
+ 5 X11.bin 0x00000001000122bc server_thread + 50
+ 6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331
+ 7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13
http://lists.apple.com/archives/X11-users/2011/May/msg00045.html
@@ -65041,14 +75066,14 @@ Date: Wed Jun 1 11:20:10 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0643c056512d10be8db223d18d6563292d57e916
-Merge: a2e6cfc d45f5b2
+Merge: a2e6cfc18a d45f5b2493
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 31 23:45:07 2011 -0700
Merge remote-tracking branch 'ajax/xserver-next'
commit a2e6cfc18aec1c0027b51572b03ec9f2ab074b56
-Merge: bc04065 8d84fd2
+Merge: bc04065b5c 8d84fd2566
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 31 23:42:52 2011 -0700
@@ -65184,7 +75209,7 @@ Date: Tue May 24 16:02:42 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 4725d6b0dbb6371af4a1b2fbef851dcfe155514a
-Merge: 1b2d177 b5d8287
+Merge: 1b2d17748f b5d828789c
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 25 09:40:51 2011 -0600
@@ -65244,18 +75269,18 @@ Date: Thu May 19 09:39:52 2011 +0300
Usage example (tested on a dual-seat PC):
Section "InputClass"
- Identifier "keyboard-all"
- MatchIsKeyboard "on"
- MatchDevicePath "/dev/input/event*"
- MatchLayout "!GeForce|!Matrox"
- Driver "evdev"
- Option "XkbLayout" "us"
- Option "XkbOptions" "terminate:ctrl_alt_bksp"
+ Identifier "keyboard-all"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ MatchLayout "!GeForce|!Matrox"
+ Driver "evdev"
+ Option "XkbLayout" "us"
+ Option "XkbOptions" "terminate:ctrl_alt_bksp"
EndSection
It disables auto keyboard configuration for layouts "GeForce" and "Matrox".
Note that "" in patterns means "no Layout sections found", e.g.
- MatchLayout "GeForce|"
+ MatchLayout "GeForce|"
is "in layout GeForce or without explicit layout at all".
Signed-off-by: Oleh Nykyforchyn <oleh.nyk@gmail.com>
@@ -65626,21 +75651,21 @@ Date: Fri May 6 18:18:15 2011 +0300
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ba5540221f2a46133371b4ff0d527b1a0a1443b1
-Merge: 6347a0b 728d0bf
+Merge: 6347a0b802 728d0bf20e
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 13:59:36 2011 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 6347a0b802812bb185ada1bf0951add306935184
-Merge: 4d02c53 f144fb7
+Merge: 4d02c53971 f144fb771f
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 13:54:29 2011 -0700
Merge remote-tracking branch 'jeremyhu/master'
commit 4d02c5397114ac4d15e794908f0708427e258261
-Merge: 043c175 eac37f3
+Merge: 043c175865 eac37f32b8
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 13 13:52:18 2011 -0700
@@ -66342,7 +76367,7 @@ Date: Sat Apr 23 18:09:11 2011 -0700
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 5cb31cd0cbf83fff5f17a475e7b0e45246b19bf3
-Merge: 0f284f0 4d8735d
+Merge: 0f284f0f42 4d8735d388
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 29 09:59:49 2011 -0700
@@ -66397,14 +76422,14 @@ Date: Wed Apr 27 22:12:59 2011 -0700
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit f6d4e75ec55ac6812f9dead42ecdffb9614578c7
-Merge: ec9ea40 4318e6a
+Merge: ec9ea40178 4318e6a147
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 27 12:08:51 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit ec9ea4017885cefe5519a4e890b0ff1a5518235a
-Merge: c6cb70b 6f29dbf
+Merge: c6cb70be1e 6f29dbf5e3
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 27 12:01:56 2011 -0700
@@ -67118,7 +77143,7 @@ Date: Mon Mar 28 11:38:11 2011 -0400
Signed-off-by: Søren Sandmann <ssp@redhat.com>
commit 918a9c99cf2ebc73acb34b95f597904b93c690d9
-Merge: 88c4622 5f496bc
+Merge: 88c4622b59 5f496bc919
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 22 11:20:16 2011 -0700
@@ -67148,7 +77173,7 @@ Date: Mon Apr 18 08:23:48 2011 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 302bdc3c9678c028bed71dbe9c5ba04997626b6b
-Merge: 001b6b8 6f97fe5
+Merge: 001b6b8b70 6f97fe5df1
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 22 10:48:37 2011 -0700
@@ -67878,14 +77903,14 @@ Date: Wed Apr 6 14:51:45 2011 -0400
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3085b178626c957854385c7a88a05ec3c7eb74f3
-Merge: c9d89ce 3c45b59
+Merge: c9d89cec14 3c45b59e67
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 6 08:34:10 2011 -0700
Merge remote-tracking branch 'jturney/master'
commit c9d89cec1407550cb2568f4cef146c93607bbae6
-Merge: a52049d bc61787
+Merge: a52049de2f bc61787a20
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 4 11:57:39 2011 -0700
@@ -68132,7 +78157,7 @@ Date: Wed Mar 23 18:06:51 2011 +0200
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit a52049de2f846fe984d4db5ac8d2c1826c7b2d0b
-Merge: d044d36 266ea63
+Merge: d044d36756 266ea63bc3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Apr 4 09:58:53 2011 +1000
@@ -68308,7 +78333,7 @@ Date: Tue Mar 29 14:27:41 2011 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
commit e0a2ad51dfb7373aa602335490d9666d6101b5ea
-Merge: 327e1d8 3d68831
+Merge: 327e1d8801 3d688316af
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 30 10:51:27 2011 -0700
@@ -68537,14 +78562,14 @@ Date: Mon Mar 28 17:18:39 2011 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a095a6d4e8f5090907e8d3d66018636216300846
-Merge: a22486f ef9d04f
+Merge: a22486f848 ef9d04f8ad
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 20:06:29 2011 -0700
Merge remote-tracking branch 'airlied/pwin-cleanup'
commit a22486f848014000dc13dda470f77d4d8ea9e9f6
-Merge: 2ef4ff4 633b81e
+Merge: 2ef4ff45ef 633b81e8ba
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 27 18:27:10 2011 -0700
@@ -68752,7 +78777,7 @@ Date: Tue Mar 22 19:01:48 2011 -0700
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit 03f45df93469f6aef391e97007b9614e0770cc4c
-Merge: efcb727 5fb329a
+Merge: efcb7275ce 5fb329a04a
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 23 13:38:37 2011 +0900
@@ -68941,7 +78966,7 @@ Date: Sun Mar 13 20:01:30 2011 +0000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0ac4931753a5d5925fc844c8cbec08585aea57a7
-Merge: a8146f6 d7f8011
+Merge: a8146f6bec d7f8011418
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 14 13:06:41 2011 -0700
@@ -69261,7 +79286,7 @@ Date: Wed Mar 9 15:11:42 2011 +1000
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c3c0e2fdd326214e271ce144e8fc2725cbd738ef
-Merge: a19771e 7355555
+Merge: a19771e433 73555555a4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Mar 9 14:25:54 2011 -0800
@@ -69630,28 +79655,28 @@ Date: Fri Mar 4 01:12:01 2011 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6c90e839d9872a37d371578c9c423e8213922044
-Merge: 0bc95d5 edcceed
+Merge: 0bc95d5b06 edcceedbd3
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 14:41:44 2011 -0800
Merge remote branch 'whot/for-keith'
commit 0bc95d5b06dcea65a1aa193ea907b50f7dd168b5
-Merge: 3f41f4a 69a9171
+Merge: 3f41f4adea 69a9171dbb
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 14:33:08 2011 -0800
Merge remote branch 'jeremyhu/master'
commit 3f41f4adea4bbb90d4bda4dab600595b655e3ed8
-Merge: 8e4c3ce dae24ab
+Merge: 8e4c3ce55b dae24abcd4
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 14:12:36 2011 -0800
Merge remote branch 'sandmann/for-keithp'
commit 8e4c3ce55b0f186bc6ba4039e30629669b6087b7
-Merge: f3d19c0 2965615
+Merge: f3d19c0cf3 296561506a
Author: Keith Packard <keithp@keithp.com>
Date: Thu Mar 3 13:42:07 2011 -0800
@@ -69725,14 +79750,14 @@ Date: Mon Feb 28 12:32:53 2011 -0500
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2207d11f243900bc2f641e08d80da63d84e97a8
-Merge: 0077993 579ee8f
+Merge: 00779932de 579ee8f5d8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 28 11:26:09 2011 +1000
Merge branch 'next' into for-keith
Conflicts:
- dix/devices.c
+ dix/devices.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -69980,7 +80005,7 @@ Date: Fri Feb 25 11:08:19 2011 +1000
Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
commit 229b055bdbc53370944401649234e8a38183f4fb
-Merge: 6178959 b17fc99
+Merge: 6178959e3d b17fc99cb9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 19:44:35 2011 -0800
@@ -70034,7 +80059,7 @@ Date: Thu Feb 24 19:18:35 2011 -0800
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 83861595782aaa05907f9cf7b236d50261d404d9
-Merge: a1cc0e5 4102a00
+Merge: a1cc0e52b0 4102a00962
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 18:59:07 2011 -0800
@@ -70054,7 +80079,7 @@ Date: Tue Nov 30 21:17:19 2010 +0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 365ad68fb9f7029550505b7c276a808050cada9c
-Merge: 0801afb 720c895
+Merge: 0801afbd7c 720c895db9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Feb 24 18:49:40 2011 -0800
@@ -70388,7 +80413,7 @@ Date: Wed Feb 23 14:44:23 2011 +0100
Signed-off-by: Cyril Brulebois <kibi@debian.org>
commit 579ee8f5d84c3a523b7b3e3941eabb226d1d19e2
-Merge: b636893 17265cc
+Merge: b636893137 17265ccb02
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 23 08:44:42 2011 +1000
@@ -70694,14 +80719,14 @@ Date: Fri Feb 18 14:46:33 2011 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2c77aeb39f59f1a94cc603a2e6256a62ce785c36
-Merge: 816d67d 402b329
+Merge: 816d67de2b 402b329c3a
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 14:29:32 2011 -0800
Merge remote branch 'jcristau/for-keith'
commit 816d67de2ba9bdfe652da32cb6447a3056342b98
-Merge: a73c28f 3bbb70a
+Merge: a73c28f0bd 3bbb70a1a7
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 12:20:26 2011 -0800
@@ -70721,14 +80746,14 @@ Date: Thu Feb 10 16:27:29 2011 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0bc9b15a622377c57e617411ccd26c4b5bf8cba4
-Merge: d1123b6 93cd4b1
+Merge: d1123b66eb 93cd4b1034
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 12:04:41 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit d1123b66ebbcf96dd816236f54befc568a5f7c68
-Merge: 5d020c3 f6e4ace
+Merge: 5d020c3135 f6e4ace9ea
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 18 11:59:25 2011 -0800
@@ -71443,7 +81468,7 @@ Date: Thu Jan 13 20:19:18 2011 +0200
Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com>
commit ea1ffd3e60bdcedbec5a6f28929f8677bf45d450
-Merge: 12b0f7d 53602c3
+Merge: 12b0f7df2c 53602c3621
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 15:19:55 2011 -0800
@@ -71534,21 +81559,21 @@ Date: Sun Jan 30 14:06:14 2011 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 246d40b685292fa6393ba22127152137494af2af
-Merge: 70f2d39 8c1f75a
+Merge: 70f2d39fbd 8c1f75a1d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 14:51:33 2011 -0800
Merge remote branch 'jeremyhu/master'
commit 70f2d39fbde38d0baa687f1755b6c4c686f23052
-Merge: 3a91c2d a9d3c43
+Merge: 3a91c2d21c a9d3c43a57
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 14:43:19 2011 -0800
Merge remote branch 'jturney/master'
commit 3a91c2d21c3231e2a011d95c3cfc01785430c1cf
-Merge: ac0a00a 82b1eaa
+Merge: ac0a00a840 82b1eaa6ca
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 2 14:37:00 2011 -0800
@@ -71801,21 +81826,21 @@ Date: Thu Jan 13 16:08:29 2011 -0800
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit be3be7580b6f6fd2f7fa4d4abfe5e1ab19470223
-Merge: 57a1d9b a1d885f
+Merge: 57a1d9b853 a1d885fdd6
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 21:21:21 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit 57a1d9b85331f6fe19d5111f5163139572ffbf02
-Merge: 24ce650 6423769
+Merge: 24ce650cf4 6423769799
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 21:16:24 2011 -0800
Merge remote branch 'whot/for-keith'
commit 24ce650cf4f0c6fa72faecd38c53d40703e6c959
-Merge: bbdf81a 09fd010
+Merge: bbdf81a056 09fd010902
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 20 21:11:53 2011 -0800
@@ -72323,14 +82348,14 @@ Date: Sat Jan 15 12:13:39 2011 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit abfea17342da774aa4e3a351a73c8f2af6e6fd28
-Merge: 3611283 e65c3f8
+Merge: 361128389e e65c3f8bcc
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 15:19:34 2011 -0800
Merge remote branch 'ajax/for-keithp'
commit 361128389e5cb0101cbd091ff8de77cf34608f6c
-Merge: 65ceaad d9225b9
+Merge: 65ceaadbf0 d9225b9602
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jan 18 15:18:08 2011 -0800
@@ -72668,7 +82693,7 @@ Date: Tue Nov 23 11:38:50 2010 -0800
Acked-by: Gaetan Nadon <memsize@videotron.ca>
commit 8456625d64bb0013a496f3b56ea3aa20cf7a6142
-Merge: aa30a86 ce74e75
+Merge: aa30a86583 ce74e7562d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 7 09:35:07 2011 +1000
@@ -73013,14 +83038,14 @@ Date: Wed Jan 5 20:41:04 2011 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0dede200c9ac7adbe8b8c16efacc3edc1f183cd9
-Merge: 7714357 2e78145
+Merge: 7714357f50 2e781457d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 5 08:51:46 2011 -0800
Merge remote branch 'vsyrjala/misc_fixes'
commit 7714357f506782973d25e270f85140b42507ed35
-Merge: 02e18c9 b01dd9d
+Merge: 02e18c9fb5 b01dd9d336
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 5 08:43:18 2011 -0800
@@ -73713,7 +83738,7 @@ Date: Wed Dec 15 14:59:13 2010 -0500
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit e7dc253452a1ba64718a08fdc070405b494f53cd
-Merge: d110791 d5b0d58
+Merge: d1107918d4 d5b0d58573
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 20 00:48:45 2010 -0800
@@ -73815,14 +83840,14 @@ Date: Fri Dec 10 00:08:24 2010 +0000
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f1542f1d716723cba7c323849086585635121893
-Merge: 9716d31 8a8fdd7
+Merge: 9716d31247 8a8fdd762a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 14 15:04:12 2010 -0800
Merge remote branch 'whot/for-keith'
commit 9716d3124799c6db0d1c782aa72c72f972d5a158
-Merge: 03ea0b7 f641e4b
+Merge: 03ea0b7726 f641e4b34a
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 14 15:01:36 2010 -0800
@@ -73841,7 +83866,7 @@ Date: Tue Dec 7 16:31:55 2010 -0500
Remove --enable-builddocs as this was last use for BUILDDOCS
- *** From the RELEASE NOTES ***
+ *** From the RELEASE NOTES ***
New configure options for documentation in modules
--------------------------------------------------
@@ -73999,7 +84024,7 @@ Date: Wed Dec 8 18:54:30 2010 +0000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 519d243f0c8e3c80226701f71d2cfa62e42dbff7
-Merge: 9f9c732 446482e
+Merge: 9f9c732311 446482efaa
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 7 13:39:58 2010 -0800
@@ -74457,14 +84482,14 @@ Date: Sun Jun 6 15:23:37 2010 -0700
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
commit f5b8bd620f91214c0b87e9b04d57015655792352
-Merge: 01e9fa7 8127c83
+Merge: 01e9fa7da3 8127c83c81
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:51:06 2010 -0800
Merge remote branch 'jajones/for-keith'
commit 01e9fa7da389fc7ab834b4234b8484514144b7f4
-Merge: 79870db 68a1b0d
+Merge: 79870dbf72 68a1b0de95
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:45:11 2010 -0800
@@ -74487,14 +84512,14 @@ Date: Sat Dec 4 16:13:29 2010 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c4a7a5917ab828d4a0bd825a98e4d641bcb378f1
-Merge: 5de312a 714b68d
+Merge: 5de312a60d 714b68d9e5
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:28:07 2010 -0800
Merge remote branch 'jeremyhu/master'
commit 5de312a60d8227ed670849ecf888ea878aa81430
-Merge: 311cad3 8f42b2b
+Merge: 311cad3315 8f42b2b693
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 6 19:22:52 2010 -0800
@@ -74845,7 +84870,7 @@ Date: Wed Nov 24 00:11:11 2010 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 3824417335ec00a87b51f8d05e592099b8507680
-Merge: dab064f f4f41c8
+Merge: dab064fa5e f4f41c812d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Dec 2 08:39:33 2010 -0800
@@ -75095,14 +85120,14 @@ Date: Sat Nov 27 00:14:51 2010 -0800
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
commit 02449ee24b484c9fea501df5274d95a9f87cab23
-Merge: afd6eb6 b85f906
+Merge: afd6eb66d5 b85f9063c2
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 30 13:30:59 2010 -0800
Merge remote branch 'ajax/for-keithp'
commit afd6eb66d5ef6a59be4c03da4588aaa2ee47b9ad
-Merge: b169649 ffcbfa0
+Merge: b16964910d ffcbfa0063
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 30 13:28:13 2010 -0800
@@ -75620,14 +85645,14 @@ Date: Wed Nov 24 14:20:30 2010 +1000
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 4e0f8f666e61390206c42ad2087477a912525bc7
-Merge: 400ddf2 639600f
+Merge: 400ddf2f58 639600fa7e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 11:47:33 2010 -0800
Merge remote branch 'whot/for-keith'
commit 400ddf2f58ce673c74d4e8ee829729cd3c75f8c9
-Merge: 7250f07 e074f74
+Merge: 7250f078c1 e074f745a8
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 24 11:46:18 2010 -0800
@@ -75681,7 +85706,7 @@ Date: Sun Nov 21 14:27:55 2010 -0500
This will allow a dependency to be specified as done in libX11:
%.html: %.xml $(dist_spec_DATA)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
@@ -75977,21 +86002,21 @@ Date: Tue Jun 22 19:45:26 2010 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 38c46ccf796462d068d95acb9022de2acfc3a1f7
-Merge: 3051dd5 c8998af
+Merge: 3051dd5135 c8998af3eb
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 09:06:33 2010 +0800
Merge remote branch 'whot/for-keith'
commit 3051dd5135962283fc6c7de377a7c819d8a04e7f
-Merge: ed547a9 c597572
+Merge: ed547a9fc8 c5975722a9
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 08:58:02 2010 +0800
Merge remote branch 'jeremyhu/master'
commit ed547a9fc8a4f5cd95ef882b656a376c163eda6d
-Merge: 78f94f1 84e8de1
+Merge: 78f94f19aa 84e8de1271
Author: Keith Packard <keithp@keithp.com>
Date: Mon Nov 15 08:51:27 2010 +0800
@@ -76262,20 +86287,20 @@ Date: Wed Nov 10 21:35:58 2010 -0800
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 88cb61e1e55c54982b90e2a77465faaac6a0ba89
-Merge: 19f4383 4ed4915
+Merge: 19f43836d1 4ed4915bc0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 11 12:54:46 2010 +1000
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api
Conflicts:
- dix/getevents.c
- hw/xfree86/common/xf86Xinput.h
+ dix/getevents.c
+ hw/xfree86/common/xf86Xinput.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9
-Merge: 291c39d ec1bfbc
+Merge: 291c39dfef ec1bfbc669
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 16:58:21 2010 -0800
@@ -76335,14 +86360,14 @@ Date: Sat Sep 11 17:55:57 2010 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit c9c0f93f8ed42413a05193ee71c69fa6b41f6a03
-Merge: 73f6de1 4132b1c
+Merge: 73f6de1ad8 4132b1c591
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 16:11:29 2010 -0800
Merge remote branch 'whot/for-keith'
commit 73f6de1ad8b5e1641102b54ff48a36ebb99ccacb
-Merge: 333b6ed 3dc3aef
+Merge: 333b6ed26e 3dc3aefb88
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 16:02:22 2010 -0800
@@ -76503,7 +86528,7 @@ Date: Mon May 17 19:39:54 2010 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit acba00c0c1129fe4ef7655f018cd21dbb1ee9a1f
-Merge: 383dfe2 44e8165
+Merge: 383dfe23f1 44e8165414
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 10 14:41:08 2010 -0800
@@ -76697,7 +86722,7 @@ Date: Thu Nov 4 12:53:18 2010 +1000
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit a52efb096e166e325deb3d6b502671f339a4fa15
-Merge: fe8d122 f72aadd
+Merge: fe8d122b13 f72aadd38b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 3 06:50:45 2010 -0700
@@ -77099,7 +87124,7 @@ Date: Sun Oct 17 09:58:50 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit d738175eaf1098e29b8afb6de8e99b5098e366a7
-Merge: 8806a04 9872e0f
+Merge: 8806a04f7f 9872e0f011
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 19 22:50:15 2010 -0700
@@ -77515,7 +87540,7 @@ Date: Tue Mar 23 16:34:26 2010 +0000
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
commit 5aff712a8d2eb9f965ecbb93216cc0bcdc327ae6
-Merge: 5b98c62 e354cca
+Merge: 5b98c6267f e354ccac36
Author: Keith Packard <keithp@keithp.com>
Date: Mon Oct 18 17:16:23 2010 -0700
@@ -77726,18 +87751,18 @@ Date: Mon Sep 27 13:58:40 2010 -0400
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit eaf0b6a4d83d49930d21d5191f335fcac962632e
-Merge: 693e92d 23229c7
+Merge: 693e92d404 23229c7ce5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 15 13:46:59 2010 +1000
Merge branch 'master' into input-api
Conflicts:
- config/udev.c
- hw/xfree86/common/xf86Helper.c
- hw/xfree86/common/xf86Module.h
- hw/xfree86/common/xf86Xinput.h
- hw/xfree86/os-support/linux/lnx_init.c
+ config/udev.c
+ hw/xfree86/common/xf86Helper.c
+ hw/xfree86/common/xf86Module.h
+ hw/xfree86/common/xf86Xinput.h
+ hw/xfree86/os-support/linux/lnx_init.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -78133,7 +88158,7 @@ Date: Sat Sep 25 10:05:10 2010 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 5532687a929426c4b1c4667f4591ed362f097c9b
-Merge: 9df4fb0 682a3ee
+Merge: 9df4fb0adf 682a3ee608
Author: Keith Packard <keithp@keithp.com>
Date: Tue Sep 28 08:15:07 2010 -0700
@@ -78309,7 +88334,7 @@ Date: Tue Sep 21 15:13:30 2010 +0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98197d931b266674557b52b4a7099c6470114e55
-Merge: 01ad372 402942c
+Merge: 01ad3725a8 402942cdbc
Author: Keith Packard <keithp@keithp.com>
Date: Thu Sep 23 15:30:37 2010 -0700
@@ -78561,7 +88586,7 @@ Date: Sun May 30 19:12:31 2010 +0300
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
commit c768cdda92696b636c10bb2df64167d5274b4b99
-Merge: 5a72538 2079853
+Merge: 5a725385fb 2079853632
Author: Keith Packard <keithp@keithp.com>
Date: Mon Sep 13 16:48:33 2010 -0700
@@ -78951,7 +88976,7 @@ Date: Wed Sep 8 16:08:24 2010 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit bbffb85461eb63bfb1e01e2cb9674607b9221604
-Merge: 9a1a4cc 71972c2
+Merge: 9a1a4ccbe0 71972c2534
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 11:55:34 2010 -0700
@@ -78990,7 +89015,7 @@ Date: Mon Aug 30 21:24:30 2010 +0300
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca0d578d29f37b61e62556fff59732741885625b
-Merge: cf88363 08adf41
+Merge: cf88363db0 08adf41f63
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 11:50:27 2010 -0700
@@ -79020,7 +89045,7 @@ Date: Fri Aug 27 10:20:29 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit fa22f97af65efc2a147e9be0b7f288848965ff60
-Merge: 6edbdb7 6546665
+Merge: 6edbdb7f9e 6546665293
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 10 11:47:41 2010 -0700
@@ -80645,7 +90670,7 @@ Date: Sat Jun 19 23:40:37 2010 -0700
Reviewed-by: Patrick E. Kane <pekane52@gmail.com>
commit 9fbbff3c0456f1969d45cc957d3260723caf62d7
-Merge: 95756f4 9ac8e20
+Merge: 95756f410c 9ac8e206ff
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jul 21 11:56:39 2010 -0700
@@ -80730,7 +90755,7 @@ Date: Wed Jul 14 12:57:29 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0fc02c0bf92f694889589e3648acc08d4684de37
-Merge: 0540c46 9d8ec71
+Merge: 0540c46066 9d8ec712a6
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 13 15:05:36 2010 -0700
@@ -80827,7 +90852,7 @@ Date: Fri Jul 9 10:36:12 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 2307ab5bc9365ebbe04568edb7c7620a23689b70
-Merge: c65280c fd4f505
+Merge: c65280ce8d fd4f5059f0
Author: Keith Packard <keithp@keithp.com>
Date: Tue Jul 6 23:54:54 2010 -0400
@@ -80990,7 +91015,7 @@ Date: Thu Jun 3 19:00:53 2010 -0700
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 69b2b5c85ec079ef49f84722daa5f148cedc2e1b
-Merge: b90faa7 1432785
+Merge: b90faa7156 1432785839
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jul 1 23:46:53 2010 -0400
@@ -81341,7 +91366,7 @@ Date: Fri Jun 25 09:48:10 2010 +1000
Conflicts:
- dix/events.c
+ dix/events.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
@@ -81382,7 +91407,7 @@ Date: Thu Jun 24 12:52:53 2010 +1000
Conflicts:
- dix/events.c
+ dix/events.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
@@ -81807,7 +91832,7 @@ Date: Thu Jun 10 19:21:18 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9
-Merge: 7e8f100 f4190fe
+Merge: 7e8f100121 f4190feb25
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 11 10:08:13 2010 -0700
@@ -81960,7 +91985,7 @@ Date: Fri Jun 4 16:58:58 2010 +0700
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 620ca54aaa0b363fcf68cec1bd6c37e68c988352
-Merge: fd69234 8ff9b50
+Merge: fd69234db0 8ff9b502cf
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 19:18:53 2010 -0700
@@ -82032,7 +92057,7 @@ Date: Thu Jun 3 19:17:14 2010 -0700
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 07a093add0b7e40c4d9b9b59273e3ff9e14a88a7
-Merge: 84190d2 dc61448
+Merge: 84190d2095 dc614484f9
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 18:39:10 2010 -0700
@@ -82094,8 +92119,8 @@ Date: Mon Jun 7 20:39:58 2010 -0700
don't care how the driver was selected for that device. The MatchDriver
entry can be used to match the current driver string:
- MatchDriver "evdev|mouse"
- Option "Emulate3Buttons" "yes"
+ MatchDriver "evdev|mouse"
+ Option "Emulate3Buttons" "yes"
The driver string is a case sensitive match.
@@ -82115,8 +92140,8 @@ Date: Mon Jun 7 20:39:57 2010 -0700
For instance, an InputClass with
- MatchProduct "foo"
- MatchProduct "bar"
+ MatchProduct "foo"
+ MatchProduct "bar"
will require that the device's product name contain both foo and bar.
This provides a complement to the || style matching when an entry is
@@ -82153,7 +92178,7 @@ Date: Thu Jun 10 06:15:41 2010 -0700
has been added that supports shell pattern matching when fnmatch(3) is
available. For example:
- MatchUSBID "046d:*"
+ MatchUSBID "046d:*"
The IDs are stored in lowercase hex separated by a ':' like "lsusb" or
"lspci -n".
@@ -82173,7 +92198,7 @@ Date: Thu Jun 10 06:11:10 2010 -0700
test against the PnP ID of the device. The entry supports a shell pattern
match on platforms that support fnmatch(3). For example:
- MatchPnPID "WACf*"
+ MatchPnPID "WACf*"
A match type for non-path pattern matching, match_pattern, has been added.
The difference between this and match_path_pattern is the FNM_PATHNAME
@@ -82184,7 +92209,7 @@ Date: Thu Jun 10 06:11:10 2010 -0700
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 84190d20954ef7888e4d96832c2a4b3225b4dfa2
-Merge: 4172aa1 5e1ef1f
+Merge: 4172aa137c 5e1ef1f4dd
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 10 13:36:35 2010 -0700
@@ -82512,7 +92537,7 @@ Date: Fri Jun 4 14:22:06 2010 +0700
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
commit 5d4e2c594059ffb536c8e506c2623320d3c6a787
-Merge: eacc421 793dd39
+Merge: eacc42132e 793dd39946
Author: Keith Packard <keithp@keithp.com>
Date: Sat Jun 5 22:20:28 2010 -0700
@@ -82696,8 +92721,8 @@ Date: Fri Apr 30 22:05:27 2010 -0700
This also renames the device private index and macros to better
reflect their usage:
- miDCSpriteKey -> miDCDeviceKey
- MIDCBUFFER -> miGetDCDevice
+ miDCSpriteKey -> miDCDeviceKey
+ MIDCBUFFER -> miGetDCDevice
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
@@ -82917,7 +92942,7 @@ Date: Fri Jun 4 11:09:46 2010 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0f12e86e600522768f5f64eafc1230526e700ab7
-Merge: aa7c09f f114f54
+Merge: aa7c09f7d0 f114f54986
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 3 15:09:32 2010 -0700
@@ -83099,7 +93124,7 @@ Date: Wed Jun 2 14:31:56 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b13d7a8e09c8e3eb5003420c3c0484431e5a052b
-Merge: f0ab726 dcceb90
+Merge: f0ab726d89 dcceb90b1d
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jun 3 07:01:26 2010 -0700
@@ -83564,7 +93589,7 @@ Date: Mon May 24 09:14:27 2010 -0700
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
commit b11465a6ecdc2b8373e6fc8af427edc4602bcaa1
-Merge: 7c085ae 0abf065
+Merge: 7c085aebfe 0abf065e38
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 24 22:18:31 2010 -0700
@@ -83703,7 +93728,7 @@ Date: Tue May 18 19:35:10 2010 +0300
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
commit 2ffffb4daf6161e6a22d81442ecf6209acc9e975
-Merge: b5e0f6d d530608
+Merge: b5e0f6d8f4 d5306084b5
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 23 23:22:08 2010 -0700
@@ -84078,14 +94103,14 @@ Date: Fri May 14 19:31:56 2010 +0300
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 103507af0c0ce7d7482a67163249864af36a2374
-Merge: 8bd8d81 99fcf65
+Merge: 8bd8d81dc4 99fcf655bd
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 19 22:27:53 2010 -0700
Merge remote branch 'vignatti/bus-cleanup'
commit 8bd8d81dc473bf72ea108b1896a55e32defa02e2
-Merge: c620a1c 66d5ecc
+Merge: c620a1c0a4 66d5ecc5fd
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 19 22:27:20 2010 -0700
@@ -84105,7 +94130,7 @@ Date: Thu May 20 10:26:56 2010 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8b6c1809c09f832051327d86e1a25dc0ec5cc878
-Merge: d88ba77 c38552d
+Merge: d88ba7721d c38552d115
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 19 12:58:02 2010 -0700
@@ -84581,7 +94606,7 @@ Date: Fri May 14 16:25:43 2010 +0300
Signed-off-by: Keith Packard <keithp@keithp.com>
commit f87002cb7d8729b1da4cbefe7653f4cfd3a2d956
-Merge: a4fbc0f 890f536
+Merge: a4fbc0feda 890f536f8d
Author: Keith Packard <keithp@keithp.com>
Date: Fri May 14 11:46:29 2010 -0700
@@ -84619,7 +94644,7 @@ Date: Thu May 13 07:12:43 2010 +0300
Reviewed-by: Keith Packard <keithp@keithp.com>
commit 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534
-Merge: f2a0c32 92ed75a
+Merge: f2a0c324e3 92ed75ac59
Author: Keith Packard <keithp@keithp.com>
Date: Thu May 13 18:22:49 2010 -0700
@@ -84901,7 +94926,7 @@ Date: Sat May 8 15:19:03 2010 -0700
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
commit 59857ee5da5f1f3f4900292581b9586477513211
-Merge: 21ceae9 432cbbe
+Merge: 21ceae9002 432cbbec19
Author: Keith Packard <keithp@keithp.com>
Date: Wed May 12 16:48:08 2010 -0700
@@ -85122,7 +95147,7 @@ Date: Tue May 11 09:08:40 2010 -0700
Reviewed-by: Adam Jackson <ajax@redhat.com>
commit 3df22b293c1f1d27e7ce16662744c578d35b5aba
-Merge: fa6c701 9de0e31
+Merge: fa6c701257 9de0e31746
Author: Keith Packard <keithp@keithp.com>
Date: Tue May 11 08:38:44 2010 -0700
@@ -85252,7 +95277,7 @@ Date: Mon May 10 14:00:49 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 95074538cce93abc1739a4d9dd78b0500fb8fec9
-Merge: c079977 2160ff5
+Merge: c0799779df 2160ff5240
Author: Keith Packard <keithp@keithp.com>
Date: Mon May 10 13:49:33 2010 -0700
@@ -85329,9 +95354,9 @@ Date: Thu May 6 17:58:29 2010 -0400
But no one cares, and it's a modest size win:
- text data bss dec hex filename
- 1773824 69552 59288 1902664 1d0848 hw/vfb/Xvfb.before
- 1773112 69552 58648 1901312 1d0300 hw/vfb/Xvfb
+ text data bss dec hex filename
+ 1773824 69552 59288 1902664 1d0848 hw/vfb/Xvfb.before
+ 1773112 69552 58648 1901312 1d0300 hw/vfb/Xvfb
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
@@ -85480,7 +95505,7 @@ Date: Fri Apr 30 12:18:09 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit a80b1f888f2f7674a715d512ab950eeadee20448
-Merge: 4971099 0efd7b8
+Merge: 4971099860 0efd7b8d82
Author: Keith Packard <keithp@keithp.com>
Date: Sun May 2 16:35:17 2010 -0700
@@ -85589,31 +95614,31 @@ Date: Wed Apr 28 12:37:08 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 986d46144b183a36b4e98aed95eca0c55a8b4251
-Merge: a974c8e b5b8f91
+Merge: a974c8e7cb b5b8f91b82
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:40:53 2010 -0700
Merge remote branch 'jamey/for-keith'
Conflicts:
- hw/xfree86/common/xf86xv.c
+ hw/xfree86/common/xf86xv.c
commit a974c8e7cba40c8d7d1b91e07de8c414627b71a2
-Merge: 6581bc4 02e8622
+Merge: 6581bc4591 02e86221b8
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:33:00 2010 -0700
Merge remote branch 'whot/for-keith'
commit 6581bc4591746c906d97f8b868f946c47bc6d756
-Merge: 0e91e19 d073e51
+Merge: 0e91e19f78 d073e51bee
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:29:52 2010 -0700
Merge remote branch 'yselkowitz/master'
commit 0e91e19f783d21198fc2e210203e0f10040a9cd0
-Merge: 81a081c edbc56c
+Merge: 81a081c1f0 edbc56c088
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 30 12:27:51 2010 -0700
@@ -85807,7 +95832,7 @@ Date: Sat Apr 17 21:36:23 2010 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 3f63db89191701139d45332ca80b9d6eb327c773
-Merge: 41bdb6c 54e51de
+Merge: 41bdb6c003 54e51de8cd
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 26 20:18:13 2010 -0700
@@ -85964,7 +95989,7 @@ Date: Thu Apr 8 21:55:45 2010 -0500
Conflicts:
- configure.ac
+ configure.ac
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -86204,14 +96229,14 @@ Date: Wed Apr 21 18:28:13 2010 +0300
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7ac6a6b7d0dfc5e021270b2898accd3425aa008a
-Merge: 0782894 f7ef6fd
+Merge: 0782894b57 f7ef6fd9a1
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 21 16:07:38 2010 -0700
Merge remote branch 'vignatti/for-keith'
Conflicts:
- exa/exa.c
+ exa/exa.c
Signed-off-by: Keith Packard <keithp@keithp.com>
@@ -86462,7 +96487,7 @@ Date: Mon Apr 19 09:26:10 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b3ab978df861c08298f57529e3db980489055c35
-Merge: a92b2c2 0ad022a
+Merge: a92b2c2c8d 0ad022a729
Author: Keith Packard <keithp@keithp.com>
Date: Sun Apr 18 22:01:40 2010 -0700
@@ -86624,7 +96649,7 @@ Date: Wed Apr 14 17:27:51 2010 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit e424d5812300e82de375d83dc0b490a76d865016
-Merge: 5b0faf3 0e7703f
+Merge: 5b0faf3554 0e7703f9b1
Author: Keith Packard <keithp@keithp.com>
Date: Thu Apr 15 15:01:34 2010 -0700
@@ -86810,7 +96835,7 @@ Date: Fri Apr 9 10:58:48 2010 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ab60975fe28cb135b4183c57b7f50d3615921c1f
-Merge: adbbc66 59edde7
+Merge: adbbc66108 59edde7c28
Author: Keith Packard <keithp@keithp.com>
Date: Mon Apr 12 21:40:41 2010 -0700
@@ -86870,7 +96895,7 @@ Date: Tue Feb 16 08:11:41 2010 -0800
Reviewed-by: Keith Packard <keithp@keithp.com>
commit d7c98c1c81ae272f66edb05fde20f4c616604add
-Merge: 82cf3a4 03ccbd2
+Merge: 82cf3a4ae0 03ccbd2579
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 7 22:25:51 2010 -0700
@@ -86909,15 +96934,15 @@ Date: Sat Apr 3 10:08:25 2010 -0700
for local administration, we also reserve a system directory for vendor
and package usage. The simple search path is:
- /usr/share/X11/xorg.conf.d
- $datadir/X11/xorg.conf.d
+ /usr/share/X11/xorg.conf.d
+ $datadir/X11/xorg.conf.d
Files from these directories will have the lowest config priority. The
directory $datadir/X11/xorg.conf.d is exported from xorg-server.pc in
the variable "sysconfigdir". Packages should install their .conf files
to the directory specified by:
- `pkg-config --variable=sysconfigdir xorg-server`
+ `pkg-config --variable=sysconfigdir xorg-server`
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -86932,10 +96957,10 @@ Date: Sat Apr 3 09:33:49 2010 -0700
hostname to the search path for xorg.conf.d. This changes it to something
very simple:
- /etc/X11/<cmdline>
- $sysconfdir/X11/<cmdline>
- /etc/X11/xorg.conf.d
- $sysconfdir/X11/xorg.conf.d
+ /etc/X11/<cmdline>
+ $sysconfdir/X11/<cmdline>
+ /etc/X11/xorg.conf.d
+ $sysconfdir/X11/xorg.conf.d
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
@@ -87038,14 +97063,14 @@ Date: Mon Apr 5 19:12:22 2010 -0400
Signed-off-by: Keith Packard <keithp@keithp.com>
commit cbda58c963af5bb9c4643e9017dd4eec589ceff3
-Merge: a7698a6 c983f40
+Merge: a7698a6776 c983f40fe4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Apr 7 15:51:38 2010 -0700
Merge remote branch 'yselkowitz/master'
commit a7698a677682a32960b885c22fdba2add70f4658
-Merge: 495cec7 165a4a9
+Merge: 495cec794d 165a4a9c7d
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 6 12:36:15 2010 -0700
@@ -87192,14 +97217,14 @@ Date: Fri Mar 26 09:33:20 2010 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 57cb1a854a1b6d91d214b3fa250a7df2ed20d433
-Merge: 4b3d67a 28a5f14
+Merge: 4b3d67a764 28a5f14b40
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 29 11:46:00 2010 -0700
Merge remote branch 'jeremyhu/master'
commit 4b3d67a7647f696957727948f9757a261e15d14e
-Merge: 579715f aa91508
+Merge: 579715f830 aa91508356
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 29 11:44:07 2010 -0700
@@ -87616,7 +97641,7 @@ Date: Mon Mar 22 18:01:17 2010 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit b29220dc765cb6f878c5466e00e4bd21f3bd803d
-Merge: c3da766 ed31d50
+Merge: c3da76643a ed31d50b5f
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 21 23:01:58 2010 -0700
@@ -87864,7 +97889,7 @@ Date: Sun Mar 21 17:23:46 2010 -0700
Bump to 1.7.99.902 -- 1.8 RC2
commit 235fa5030428084368e5be57fca695647b7b79c4
-Merge: 1c612ac fa5103a
+Merge: 1c612acca8 fa5103a02b
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 21 15:38:40 2010 -0700
@@ -87890,7 +97915,7 @@ Date: Wed Mar 17 14:32:38 2010 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 95ca39b981624df5338a16b506289014c431ae82
-Merge: e7ff956 bf18191
+Merge: e7ff956638 bf181915e1
Author: Keith Packard <keithp@keithp.com>
Date: Sun Mar 21 15:24:06 2010 -0700
@@ -88078,7 +98103,7 @@ Date: Fri Mar 12 16:52:56 2010 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit df9b6f16b27398545cd4cff8a56dd59a3813351d
-Merge: 5f169f5 5172253
+Merge: 5f169f5493 5172253bae
Author: Keith Packard <keithp@keithp.com>
Date: Mon Mar 15 08:26:58 2010 -0700
@@ -88403,7 +98428,7 @@ Date: Wed Jan 27 20:38:38 2010 +0000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 780c95caf9888fa4548dfe4c1c78a7e7ce99a9ed
-Merge: 018b177 758f697
+Merge: 018b177591 758f697175
Author: Keith Packard <keithp@keithp.com>
Date: Wed Feb 24 09:59:19 2010 -0800
@@ -88469,7 +98494,7 @@ Date: Wed Feb 3 15:40:47 2010 -0500
xselinux: Bump extension minor version.
Changes introduced in this version:
- - 3 window-related requests now handle pixmaps also.
+ - 3 window-related requests now handle pixmaps also.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
@@ -88481,9 +98506,9 @@ Date: Wed Feb 3 15:38:57 2010 -0500
xselinux: Rename window-related requests that now support pixmaps.
Renamed requests:
- SetWindowCreateContext -> SetDrawableCreateContext
- GetWindowCreateContext -> GetDrawableCreateContext
- GetWindowContext -> GetDrawableContext
+ SetWindowCreateContext -> SetDrawableCreateContext
+ GetWindowCreateContext -> GetDrawableCreateContext
+ GetWindowContext -> GetDrawableContext
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Reviewed-by: Keith Packard <keithp@keithp.com>
@@ -88571,7 +98596,7 @@ Date: Mon Feb 15 14:18:00 2010 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit ca9c2472d74c7107ccc117e2c9c723c168d2eccf
-Merge: e40ba57 02d1116
+Merge: e40ba5798c 02d1116e7e
Author: Keith Packard <keithp@keithp.com>
Date: Mon Feb 22 13:26:06 2010 -0800
@@ -88909,7 +98934,7 @@ Date: Fri Feb 12 13:46:03 2010 -0800
Bump to 1.7.99.901 -- 1.8 RC1
commit 57ffeb3f2b3313dcef92a396f1f55fdbc064b2c5
-Merge: c6d9bc0 c76248f
+Merge: c6d9bc092c c76248fda9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Feb 12 13:36:32 2010 -0800
@@ -89636,7 +99661,7 @@ Date: Wed Jan 27 11:34:45 2010 -0800
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 0b21a0416b4cb2c32da5e3fda05a0682eb97d56e
-Merge: 1e6fd65 837bd2b
+Merge: 1e6fd65d0b 837bd2bbc0
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 27 14:14:15 2010 -0800
@@ -89955,7 +99980,7 @@ Date: Mon Jan 11 18:02:55 2010 -0800
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
commit 44f9c3d16c9c9b3362306a9ba26ee52e7baafeca
-Merge: 032f978 84956ca
+Merge: 032f97808c 84956ca43b
Author: Keith Packard <keithp@keithp.com>
Date: Wed Jan 13 10:19:21 2010 -0800
@@ -90111,7 +100136,7 @@ Date: Thu Jan 7 14:12:34 2010 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 8ab4749aaefb3727b9fc58bb37b50a2d07eb1531
-Merge: 8d53d84 9437504
+Merge: 8d53d84485 9437504b21
Author: Keith Packard <keithp@keithp.com>
Date: Thu Jan 7 10:32:21 2010 -0800
@@ -90474,14 +100499,14 @@ Date: Wed Dec 23 16:05:16 2009 +1000
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit 9fad8f06fb89ac2ae05bea0fa24cab3df7677297
-Merge: 871bbe1 42e8c92
+Merge: 871bbe1d87 42e8c9224e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 30 09:28:19 2009 -0800
Merge remote branch 'dbn/inputclass'
commit 871bbe1d87fa3c7ebd075e1d1eec33e45b08493d
-Merge: db2c6f7 e116563
+Merge: db2c6f7c91 e1165632bd
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 30 09:16:45 2009 -0800
@@ -90796,7 +100821,7 @@ Date: Tue Dec 22 15:40:40 2009 +1000
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7dc78db79edd15b971110acaf16bbe7f69e40bdb
-Merge: 81a623f b44c9be
+Merge: 81a623f036 b44c9be244
Author: Keith Packard <keithp@keithp.com>
Date: Tue Dec 22 21:25:18 2009 -0800
@@ -90977,14 +101002,14 @@ Date: Mon Dec 14 08:41:18 2009 +1000
Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 0cb638dc6822e54567a1731ea1cf588475a226e9
-Merge: 6a6a041 fbdf493
+Merge: 6a6a041c2d fbdf493a3e
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 16 21:58:44 2009 -0800
Merge remote branch 'alanc/master'
commit 6a6a041c2d8d32f6355db77cd59cff371038c683
-Merge: 8127465 d503195
+Merge: 8127465f44 d503195504
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 16 21:57:32 2009 -0800
@@ -91212,7 +101237,7 @@ Date: Tue Dec 1 11:09:32 2009 -0800
Conflicts:
- fb/fbpict.c
+ fb/fbpict.c
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
@@ -91251,7 +101276,7 @@ Date: Tue Dec 1 11:04:06 2009 -0800
Acked-by: Soeren Sandmann <sandmann@daimi.au.dk>
commit d3e054ac07dae12a82ad764b0622fddbef4b9ec5
-Merge: 12fb318 97a6454
+Merge: 12fb31815d 97a6454ea5
Author: Keith Packard <keithp@keithp.com>
Date: Fri Dec 11 09:22:22 2009 -0800
@@ -91470,7 +101495,7 @@ Date: Wed Dec 2 20:24:02 2009 +0100
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 98c8b752254a27ab1aaf881b36bfda0f74929d0a
-Merge: 0e084d8 91c1bd7
+Merge: 0e084d8c71 91c1bd78f7
Author: Keith Packard <keithp@keithp.com>
Date: Wed Dec 2 15:28:07 2009 -0800
@@ -92468,7 +102493,7 @@ Date: Wed Nov 4 15:35:37 2009 +0200
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 7442f3355ab8f0bb2b1a270da18c65d8d315d4dd
-Merge: 0573042 7897b6c
+Merge: 0573042cdd 7897b6c2d4
Author: Keith Packard <keithp@keithp.com>
Date: Wed Nov 4 08:55:20 2009 -0800
@@ -92550,7 +102575,7 @@ Date: Sun Nov 1 14:30:48 2009 -0500
Make sys.c use unaligned access functions provided in compiler.
Favorite deleted line was definitely
- /* to cope with broken egcs-1.1.2 :-(((( */
+ /* to cope with broken egcs-1.1.2 :-(((( */
Signed-off-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
@@ -92729,7 +102754,7 @@ Date: Wed Oct 28 11:44:27 2009 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit deb72fc61464250af8185dab2da8ee09f13c55d8
-Merge: 55f4c80 a60e676
+Merge: 55f4c80a4c a60e676f1f
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 28 10:54:13 2009 -0700
@@ -92880,7 +102905,7 @@ Date: Thu Oct 22 00:00:35 2009 +0900
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 1228e2d052f0bb98175c55c194340773b5fedb40
-Merge: 08e7f62 52bc6d9
+Merge: 08e7f62faf 52bc6d9449
Author: Keith Packard <keithp@keithp.com>
Date: Wed Oct 21 22:46:53 2009 +0900
@@ -93310,7 +103335,7 @@ Date: Tue Oct 13 20:14:58 2009 -0500
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 6e158003e80534ce007290f75c89d698aec1d00b
-Merge: 2b14e14 5e762f0
+Merge: 2b14e14203 5e762f0e2f
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 13 18:40:42 2009 -0700
@@ -93552,14 +103577,14 @@ Date: Wed Oct 7 09:07:03 2009 -0700
Signed-off-by: Keith Packard <keithp@keithp.com>
commit 68304215e25876ee639015969b4f07e1c9c515e0
-Merge: 6676f49 315aaef
+Merge: 6676f49e34 315aaef557
Author: Keith Packard <keithp@keithp.com>
Date: Tue Oct 6 22:41:42 2009 -0700
Merge remote branch 'alanc/master'
Conflicts:
- configure.ac
+ configure.ac
Signed-off-by: Keith Packard <keithp@keithp.com>
@@ -98704,7 +108729,7 @@ Date: Thu Jul 16 18:57:49 2009 +0300
Coverity Prevent: RESOURCE_LEAK in AccelSetProfileProperty:
Event alloc_arg: Called allocation function "XIPropToInt" on "ptr" [details]
- 167 rc = XIPropToInt(val, &nelem, &ptr);
+ 167 rc = XIPropToInt(val, &nelem, &ptr);
Event leaked_storage: Variable "ptr" goes out of scope
@@ -98722,10 +108747,10 @@ Date: Thu Jul 16 17:51:08 2009 +0300
Event var_tested_neg: Variable "fd" tested NEGATIVE
At conditional (1): "fd != -1" taking false path
- 335 if (fd != -1) {
+ 335 if (fd != -1) {
Event negative_returns: Tracked variable "fd" was passed to a negative sink.
- 347 close(fd);
+ 347 close(fd);
commit 53ae6b63387e04324b23b6f8311cc22a154c1fb8
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
@@ -100018,8 +110043,8 @@ Date: Sat Jun 13 10:28:21 2009 -0400
The new clipping rules:
- - client clips happen after transformation
- - pixels unavailable due to the hierarchy are undefined
+ - client clips happen after transformation
+ - pixels unavailable due to the hierarchy are undefined
The first one is implemented in pixman; the second one is realized by
making a copy of window sources (to prevent out-of-bounds access).
@@ -100955,7 +110980,7 @@ Date: Thu Jun 4 17:33:25 2009 -0400
xace: fix a bad send access hook call.
commit 993daf06497c85bb6a1e70592df380503d721dfb
-Merge: 2bda50e e1e8c7d
+Merge: 2bda50ee14 e1e8c7ddd7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 4 15:11:36 2009 +1000
@@ -101018,7 +111043,7 @@ Date: Wed Jun 3 13:37:32 2009 -0400
s/MIN/min/, s/MAX/max/ (#2968)
commit 6de67d3206f0a4e307070714564c19efc84da2ec
-Merge: af4e658 7f027d9
+Merge: af4e658401 7f027d9dc0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jun 3 16:11:33 2009 +1000
@@ -101413,23 +111438,23 @@ Date: Thu May 28 15:32:03 2009 -0400
These have been nops since 2006 and functionally void since 7.0.
commit d7aef3f663f4b5d861799f8615dcd301d5ce2906
-Merge: a25f248 e08c6a0
+Merge: a25f248fc3 e08c6a0752
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu May 28 17:20:58 2009 +1000
Merge branch 'master' into xi2
Conflicts:
- Xext/geext.c
- Xi/chdevcur.c
- Xi/extgrbdev.c
- Xi/xiproperty.c
- configure.ac
- dix/ptrveloc.c
- hw/xfree86/common/xf86Config.c
- mi/mipointer.h
- test/input.c
- xkb/xkb.c
+ Xext/geext.c
+ Xi/chdevcur.c
+ Xi/extgrbdev.c
+ Xi/xiproperty.c
+ configure.ac
+ dix/ptrveloc.c
+ hw/xfree86/common/xf86Config.c
+ mi/mipointer.h
+ test/input.c
+ xkb/xkb.c
commit a25f248fc3bd0375d91ca8a44320200d445ecfbb
Author: Peter Hutterer <peter.hutterer@who-t.net>
@@ -101465,7 +111490,7 @@ Date: Mon May 4 19:24:47 2009 -0500
Signed-off-by: Federico Mena Quintero <federico@novell.com>
commit b12010e10f38951358b48ff1076c026f943b7cc3
-Merge: 6e69272 f1441b8
+Merge: 6e69272473 f1441b8353
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Wed May 27 15:56:30 2009 -0400
@@ -102593,12 +112618,12 @@ Date: Thu Apr 30 18:49:06 2009 -0700
Array size is 128 elements (of 4 bytes each), index <= 128
Error: Buffer overflow at dix/events.c:592
- in function 'SetMaskForEvent' [Symbolic analysis]
+ in function 'SetMaskForEvent' [Symbolic analysis]
In array dereference of filters[deviceid] with index 'deviceid'
Array size is 20 elements (of 512 bytes each), index >= 0 and index <= 20
Error: Read buffer overflow at hw/xfree86/loader/loader.c:226
- in function 'LoaderOpen' [Symbolic analysis]
+ in function 'LoaderOpen' [Symbolic analysis]
In array dereference of refCount[new_handle] with index 'new_handle'
Array size is 256 elements (of 4 bytes each), index >= 1 and index <= 256
@@ -103299,15 +113324,15 @@ Date: Thu Apr 23 08:42:38 2009 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 057fc9a4f89282e440b5e11458f1dd8655879dd8
-Merge: 95628b7 932d6bc
+Merge: 95628b797e 932d6bcbb6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Apr 24 16:15:47 2009 +1000
Merge branch 'master' into xi2
Conflicts:
- Xi/chdevhier.c
- include/input.h
+ Xi/chdevhier.c
+ include/input.h
commit 932d6bcbb68194c5bdfeb336f700dc8b31529223
Author: Peter Hutterer <peter.hutterer@who-t.net>
@@ -103475,7 +113500,7 @@ Date: Fri Apr 17 15:22:57 2009 +0200
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d5ad14c8ed4d8360e1df8cd0bacf6a7c9c31df91
-Merge: 54716fd 0e0642e
+Merge: 54716fd3db 0e0642ee94
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sun Apr 19 22:28:22 2009 +1000
@@ -104302,7 +114327,7 @@ Date: Thu Mar 26 22:22:32 2009 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 6c3b633299f12051fcf37fb8439f358de876cf03
-Merge: adf21db 0cfd481
+Merge: adf21dba76 0cfd481308
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Apr 7 19:36:27 2009 +1000
@@ -105715,7 +115740,7 @@ Date: Fri Feb 27 16:37:27 2009 +0100
Conflicts:
- exa/exa_render.c
+ exa/exa_render.c
commit d0dd649035fc3698c5b436f9d9d248116aa106a3
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
@@ -110803,7 +120828,7 @@ Date: Thu Dec 4 09:47:25 2008 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 22d4ddcc3d63b7fbf2a23f5162075e4ee06db781
-Merge: d2dad38 c3bf15b
+Merge: d2dad384f5 c3bf15ba85
Author: Matthieu Herrb <matthieu@crux.(none)>
Date: Sun Dec 7 23:56:15 2008 +0100
@@ -111382,9 +121407,9 @@ Date: Mon Dec 1 16:28:45 2008 -0800
Remove xorgconfig & xorgcfg
Update driver lists:
- - Remove vga
- - i810->intel
- - via->openchrome
+ - Remove vga
+ - i810->intel
+ - via->openchrome
commit bd147e6f4b03f344c967c88fd433877b14fe1912
Author: Alan Coopersmith <alan.coopersmith@sun.com>
@@ -111563,19 +121588,19 @@ Date: Sat Nov 29 23:56:06 2008 -0200
SPECIAL CASES
o defined as _X_INTERNAL
- xf86NewInputDevice()
+ xf86NewInputDevice()
o defined as static
- fbGCPrivateKey
- fbOverlayScreenPrivateKey
- fbScreenPrivateKey
- fbWinPrivateKey
+ fbGCPrivateKey
+ fbOverlayScreenPrivateKey
+ fbScreenPrivateKey
+ fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
- GetGlyphs()
- QueryGlyphExtents()
- QueryTextExtents()
- ParseGlyphCachingMode()
- InitGlyphCaching()
- SetGlyphCachingMode()
+ GetGlyphs()
+ QueryGlyphExtents()
+ QueryTextExtents()
+ ParseGlyphCachingMode()
+ InitGlyphCaching()
+ SetGlyphCachingMode()
commit ffb484f7ef84099019b196ef97bfb2355eb6d52a
Author: Maarten Maathuis <madman2003@gmail.com>
@@ -111669,13 +121694,13 @@ Date: Fri Nov 28 01:55:11 2008 -0200
Still missing symbols worth mentioning are:
sunleo
- miFindMaxBand no longer available
+ miFindMaxBand no longer available
- intel (uxa/uxa-accel.c)
- fbShmPutImage no longer available (and should have been static)
+ intel (uxa/uxa-accel.c)
+ fbShmPutImage no longer available (and should have been static)
mga
- MGAGetClientPointer (should come from matrox's libhal)
+ MGAGetClientPointer (should come from matrox's libhal)
This is not a definitive "visibility" patch, as all it does is to
export missing symbols, but the modules that current don't compile,
@@ -111759,7 +121784,7 @@ Date: Tue Nov 25 23:15:35 2008 -0800
New version of dolt
commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b
-Merge: 9ffc671 ed597f1
+Merge: 9ffc671939 ed597f19fd
Author: Keith Packard <keithp@keithp.com>
Date: Tue Nov 25 22:19:08 2008 -0800
@@ -111831,18 +121856,18 @@ Date: Tue Nov 25 15:46:39 2008 -0800
Includes fixes for:
"xf86Config.c", line 2434: warning: argument #1 is incompatible with prototype:
- prototype: pointer to struct _DisplayModeRec: "xf86.h", line 351
- argument : pointer to const struct _DisplayModeRec
+ prototype: pointer to struct _DisplayModeRec: "xf86.h", line 351
+ argument : pointer to const struct _DisplayModeRec
"xf86EdidModes.c", line 312: warning: argument #1 is incompatible with prototype:
- prototype: pointer to struct _DisplayModeRec: "../../../hw/xfree86/common/xf86.h", line 351
- argument : pointer to const struct _DisplayModeRec
+ prototype: pointer to struct _DisplayModeRec: "../../../hw/xfree86/common/xf86.h", line 351
+ argument : pointer to const struct _DisplayModeRec
"xf86EdidModes.c", line 438: warning: assignment type mismatch:
- pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
+ pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
"xf86Modes.c", line 701: warning: assignment type mismatch:
- pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
+ pointer to struct _DisplayModeRec "=" pointer to const struct _DisplayModeRec
commit d5ad296869c38ab30136b5a293a0125b76aad994
Author: Alan Coopersmith <alan.coopersmith@sun.com>
@@ -112640,7 +122665,7 @@ Date: Fri Nov 21 12:21:45 2008 +1000
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 387563b77743d92be83420d982eaf57f5459a883
-Merge: 85f650c f6e01fa
+Merge: 85f650c9b7 f6e01fa1b8
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Nov 23 13:15:46 2008 +0100
@@ -113042,7 +123067,7 @@ Date: Fri Nov 14 12:36:20 2008 -0500
Signed-off-by: James Cloos <cloos@jhcloos.com>
commit ba4e08244ed3923eecf26842dfc1df17c696e053
-Merge: 81fd17f 5bad5d2
+Merge: 81fd17f5f4 5bad5d2abe
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Thu Nov 13 15:04:18 2008 -0500
@@ -114826,7 +124851,7 @@ Date: Tue Oct 7 13:08:38 2008 -0700
Conflicts:
- hw/xfree86/loader/xf86sym.c
+ hw/xfree86/loader/xf86sym.c
commit 94919480d8bb66e1807b4fe87b8f326ef6e012c6
Author: Adam Jackson <ajax@redhat.com>
@@ -116618,7 +126643,7 @@ Date: Wed Aug 20 09:56:06 2008 -0700
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
- ({l,r}{control,alt,command,shift})
+ ({l,r}{control,alt,command,shift})
(cherry picked from commit 8fb6a1cf44c35a20dfb0c05c9824f94898f88da7)
(cherry picked from commit ae9c1b3cfb3874b4d1251681c24bda91c398bcab)
@@ -120146,7 +130171,7 @@ Date: Mon May 26 17:56:08 2008 +0930
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709
-Merge: 5fe5778 2958610
+Merge: 5fe57787fa 29586101dc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 26 17:37:31 2008 +0930
@@ -120625,7 +130650,7 @@ Date: Wed May 21 21:51:27 2008 +0930
Big boss says UniSA isn't unique enough. Who am I to argue?
commit 7509fb498c02fe1cebe4139612b8871ec877c130
-Merge: 2ae3bed dfb7de6
+Merge: 2ae3bed337 dfb7de6571
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 21 16:25:35 2008 +0930
@@ -120664,7 +130689,7 @@ Date: Mon May 19 18:43:29 2008 -0700
Restore return type on xf86SetScrnInfoModes
- Seems to have been accidentally lost by commit 76943fec860315f3c93539e59a59080b8a7b3e75
+ Seems to have been accidentally lost by commit 76943fec860315f3c93539e59a59080b8a7b3e75
commit 7a550cefd9417c22a4397ea4d103ddc347ab1a0f
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -120685,7 +130710,7 @@ Date: Tue May 20 10:54:32 2008 +0930
fb: shut up two compiler warnings.
commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958
-Merge: fc7e256 0178b6a
+Merge: fc7e2566cc 0178b6a4ab
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 20 10:20:14 2008 +0930
@@ -120693,13 +130718,13 @@ Date: Tue May 20 10:20:14 2008 +0930
Conflicts:
- Xext/xprint.c (removed in master)
- config/hal.c
- dix/main.c
- hw/kdrive/ati/ati_cursor.c (removed in master)
- hw/kdrive/i810/i810_cursor.c (removed in master)
- hw/xprint/ddxInit.c (removed in master)
- xkb/ddxLoad.c
+ Xext/xprint.c (removed in master)
+ config/hal.c
+ dix/main.c
+ hw/kdrive/ati/ati_cursor.c (removed in master)
+ hw/kdrive/i810/i810_cursor.c (removed in master)
+ hw/xprint/ddxInit.c (removed in master)
+ xkb/ddxLoad.c
commit 0178b6a4abed0df3e90ba393709ed566105e7c2c
Author: Adam Jackson <ajax@redhat.com>
@@ -121285,7 +131310,7 @@ Date: Fri May 9 15:38:44 2008 -0700
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
commit 7b3066d9b9099135d9c49e0682161d5568fc535b
-Merge: 2a3d142 315f089
+Merge: 2a3d1421e0 315f089056
Author: Drew Parsons <drew@emerall.com>
Date: Sat May 10 00:01:15 2008 +1000
@@ -121385,7 +131410,7 @@ Date: Thu May 8 16:04:24 2008 -0400
Bug #13104: Remove broken XAA a1 glyph fast path.
commit ddaecfa13cefee7c66b39b606c8640c6544d4943
-Merge: 9c2e087 cf20df3
+Merge: 9c2e0871cf cf20df39cc
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 8 14:33:58 2008 -0400
@@ -121643,7 +131668,7 @@ Date: Fri May 2 14:56:58 2008 +0930
xfree86: don't try to repaint the cursor before cursors exist.
commit 334456952930cb3e55c02fcdada2d0c074cd0520
-Merge: 8e56fd9 3b8d534
+Merge: 8e56fd9728 3b8d53452c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri May 2 11:00:14 2008 +0930
@@ -121651,8 +131676,8 @@ Date: Fri May 2 11:00:14 2008 +0930
Conflicts:
- Xi/exevents.c
- dix/devices.c
+ Xi/exevents.c
+ dix/devices.c
commit a338007be6fd4302af012109d959f43ac7eab2b1
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
@@ -122552,7 +132577,7 @@ Date: Mon Apr 21 22:06:38 2008 -0700
(cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
commit 8190ef87547b704848231bde10b1cdffc6442790
-Merge: 179a082 2ddbfd3
+Merge: 179a082c26 2ddbfd3457
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 22 18:04:05 2008 +0930
@@ -122560,12 +132585,12 @@ Date: Tue Apr 22 18:04:05 2008 +0930
Conflicts:
- Xext/EVI.c
- Xext/appgroup.c
- Xext/cup.c
- Xext/mitmisc.c
- Xext/sampleEVI.c
- dix/window.c
+ Xext/EVI.c
+ Xext/appgroup.c
+ Xext/cup.c
+ Xext/mitmisc.c
+ Xext/sampleEVI.c
+ dix/window.c
commit 179a082c26f9e562492ee2e59e7f44f949f39f9c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -123190,7 +133215,7 @@ Date: Mon Apr 14 09:58:49 2008 +0200
EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8.
commit 1a9d7205cd5640eb65f019336097d86301942ea7
-Merge: 90f491c 6866e84
+Merge: 90f491cf8e 6866e84e3c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 14 16:25:58 2008 +0930
@@ -123375,7 +133400,7 @@ Date: Fri Feb 22 11:01:51 2008 +1030
X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
commit 90f491cf8eb869f27c4278b26c1bb84432b12d63
-Merge: cbe01b3 b4380d8
+Merge: cbe01b3083 b4380d8030
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 11 08:29:52 2008 +0930
@@ -123568,7 +133593,7 @@ Date: Tue Apr 8 20:37:25 2008 -0700
(cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
commit cbe01b3083eb65c9d4259b1071683febebf11600
-Merge: 5ffbcfe 389dae7
+Merge: 5ffbcfec3d 389dae73cc
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Apr 9 10:46:46 2008 +0930
@@ -123668,7 +133693,7 @@ Date: Thu Apr 3 14:50:05 2008 -0400
EXA: Fix TS origin computation when implementing RenderComposite with tiling.
commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab
-Merge: b46a009 6c0cfe3
+Merge: b46a009186 6c0cfe3d43
Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au>
Date: Mon Apr 7 07:56:41 2008 +0930
@@ -123676,11 +133701,11 @@ Date: Mon Apr 7 07:56:41 2008 +0930
Conflicts:
- Xext/xevie.c
- dix/dispatch.c
+ Xext/xevie.c
+ dix/dispatch.c
commit 539bf3c2836727e7560c64144071b086f8ea32fe
-Merge: 3ab33e7 6c0cfe3
+Merge: 3ab33e7cd4 6c0cfe3d43
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Mon Apr 7 00:10:16 2008 +0200
@@ -124141,7 +134166,7 @@ Date: Thu Mar 27 15:18:39 2008 +1000
RH BZ 435216
commit 9df915b84d45d39aed7557c98883b20a66da2e96
-Merge: 47eb658 333e712
+Merge: 47eb658e80 333e7123dc
Author: Sascha Hlusiak <saschahlusiak@arcor.de>
Date: Tue Mar 25 17:50:50 2008 +0100
@@ -124683,7 +134708,7 @@ Date: Tue Mar 4 02:44:48 2008 -0500
XACE: Check the return value of the selection create hook call.
commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd
-Merge: 23ae68a 453661a
+Merge: 23ae68a4c7 453661a9e1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Mar 4 18:11:10 2008 +1030
@@ -124694,25 +134719,25 @@ Date: Tue Mar 4 18:11:10 2008 +1030
Conflicts:
- Xi/opendev.c
- dix/devices.c
- dix/dixfonts.c
- dix/getevents.c
- dix/resource.c
- dix/window.c
- hw/xfree86/common/xf86Xinput.c
- mi/mipointer.c
- xkb/ddxBeep.c
- xkb/ddxCtrls.c
- xkb/ddxKeyClick.c
- xkb/ddxList.c
- xkb/ddxLoad.c
- xkb/xkb.c
- xkb/xkbAccessX.c
- xkb/xkbEvents.c
- xkb/xkbInit.c
- xkb/xkbPrKeyEv.c
- xkb/xkbUtils.c
+ Xi/opendev.c
+ dix/devices.c
+ dix/dixfonts.c
+ dix/getevents.c
+ dix/resource.c
+ dix/window.c
+ hw/xfree86/common/xf86Xinput.c
+ mi/mipointer.c
+ xkb/ddxBeep.c
+ xkb/ddxCtrls.c
+ xkb/ddxKeyClick.c
+ xkb/ddxList.c
+ xkb/ddxLoad.c
+ xkb/xkb.c
+ xkb/xkbAccessX.c
+ xkb/xkbEvents.c
+ xkb/xkbInit.c
+ xkb/xkbPrKeyEv.c
+ xkb/xkbUtils.c
commit 72f2197545e734cd0aa785d05a57b2fc0351a763
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -125646,9 +135671,9 @@ Date: Sun Feb 17 11:21:01 2008 +0100
- This allows some compositing managers to work, even after randr12 has changed the root window size.
- Thanks to ajax for figuring out the best place to put this.
- Example:
- - xf86RandR12SetMode() calls EnableDisableFBAccess().
- - That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize().
- - The final step is the call to PositionWindow().
+ - xf86RandR12SetMode() calls EnableDisableFBAccess().
+ - That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize().
+ - The final step is the call to PositionWindow().
commit b95059c20746a71e60ef152bb627e1d5c2210d75
Author: Jeremy Huddleston <jeremy@tifa-2.local>
@@ -126142,7 +136167,7 @@ Date: Fri Feb 1 14:13:29 2008 +1030
Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit e5e531ce96264518f278f572a4d0bfcd345aa618
-Merge: 6c38682 1692dcf
+Merge: 6c38682084 1692dcf197
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 31 16:36:17 2008 +1030
@@ -126150,7 +136175,7 @@ Date: Thu Jan 31 16:36:17 2008 +1030
Conflicts:
- dix/events.c
+ dix/events.c
commit 6c38682084e24b18bac0ea75729b1183aeb01600
Author: Benjamin Tissoires <tissoire@cena.fr>
@@ -126259,14 +136284,14 @@ Date: Mon Jan 28 12:18:43 2008 -0800
(cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff)
commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f
-Merge: 1a88aed e915a26
+Merge: 1a88aed5c8 e915a26397
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Jan 26 16:13:25 2008 -0500
Merge commit 'upstream/master'
commit 0ac175597712edfeae676f536746a4d26d625e30
-Merge: 210eeef e915a26
+Merge: 210eeef495 e915a26397
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jan 26 13:55:07 2008 +1030
@@ -126274,7 +136299,7 @@ Date: Sat Jan 26 13:55:07 2008 +1030
Conflicts:
- Xext/sampleEVI.c
+ Xext/sampleEVI.c
commit e915a2639752bc0ea9e6e192e020cc2031c08063
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -126720,7 +136745,7 @@ Date: Wed Jan 9 19:52:00 2008 -0800
More Xv extension byte swapping fixes
commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca
-Merge: 4e85c7c 0883e83
+Merge: 4e85c7c322 0883e838e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 10 13:38:46 2008 +1030
@@ -126956,7 +136981,7 @@ Date: Thu Jan 3 18:09:56 2008 +1030
dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc.
commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d
-Merge: eace889 ae869fc
+Merge: eace88989c ae869fc766
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 3 17:04:54 2008 +1030
@@ -126964,35 +136989,35 @@ Date: Thu Jan 3 17:04:54 2008 +1030
Conflicts:
- XTrap/xtrapddmi.c
- Xext/security.c
- Xext/xprint.c
- Xext/xtest.c
- Xext/xvdisp.c
- Xi/exevents.c
- Xi/grabdevb.c
- Xi/grabdevk.c
- Xi/opendev.c
- Xi/ungrdev.c
- Xi/ungrdevb.c
- Xi/ungrdevk.c
- dix/cursor.c
- dix/devices.c
- dix/dixutils.c
- dix/events.c
- dix/getevents.c
- dix/main.c
- dix/window.c
- hw/xfree86/ramdac/xf86Cursor.c
- include/dix.h
- include/input.h
- include/inputstr.h
- mi/midispcur.c
- mi/miinitext.c
- mi/misprite.c
- render/animcur.c
- xfixes/cursor.c
- xkb/xkbAccessX.c
+ XTrap/xtrapddmi.c
+ Xext/security.c
+ Xext/xprint.c
+ Xext/xtest.c
+ Xext/xvdisp.c
+ Xi/exevents.c
+ Xi/grabdevb.c
+ Xi/grabdevk.c
+ Xi/opendev.c
+ Xi/ungrdev.c
+ Xi/ungrdevb.c
+ Xi/ungrdevk.c
+ dix/cursor.c
+ dix/devices.c
+ dix/dixutils.c
+ dix/events.c
+ dix/getevents.c
+ dix/main.c
+ dix/window.c
+ hw/xfree86/ramdac/xf86Cursor.c
+ include/dix.h
+ include/input.h
+ include/inputstr.h
+ mi/midispcur.c
+ mi/miinitext.c
+ mi/misprite.c
+ render/animcur.c
+ xfixes/cursor.c
+ xkb/xkbAccessX.c
commit ccf6636d2ca8acdaaeb8da34db507a10a082b0de
Author: Alan Coopersmith <alan.coopersmith@sun.com>
@@ -127595,7 +137620,7 @@ Date: Fri Dec 14 00:53:54 2007 -0500
Bump video driver ABI and extension ABI for devPrivates rework.
commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629
-Merge: 1c1a4bc cb0d7e2
+Merge: 1c1a4bc970 cb0d7e2c26
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 14 00:32:24 2007 -0500
@@ -127603,7 +137628,7 @@ Date: Fri Dec 14 00:32:24 2007 -0500
Conflicts:
- configure.ac
+ configure.ac
This is the last pull before merging to master.
@@ -127643,7 +137668,7 @@ Date: Thu Dec 13 15:55:28 2007 -0800
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
commit c8feb73f5841e7812d8dfdb91f1064e2033d028c
-Merge: 9a7ce57 a125ce4
+Merge: 9a7ce57363 a125ce4a84
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Dec 13 18:38:25 2007 -0500
@@ -127651,36 +137676,36 @@ Date: Thu Dec 13 18:38:25 2007 -0500
Conflicts:
- Xext/EVI.c
- Xext/bigreq.c
- Xext/cup.c
- Xext/dpms.c
- Xext/fontcache.c
- Xext/mitmisc.c
- Xext/xcmisc.c
- Xext/xf86bigfont.c
- Xext/xtest.c
- configure.ac
- dbe/dbe.c
- hw/darwin/darwin.h
- hw/darwin/darwinEvents.c
- hw/darwin/iokit/xfIOKit.h
- hw/darwin/iokit/xfIOKitCursor.c
- hw/darwin/quartz/fullscreen/fullscreen.c
- hw/darwin/quartz/fullscreen/quartzCursor.c
- hw/darwin/quartz/quartz.c
- hw/darwin/quartz/quartzCommon.h
- hw/darwin/quartz/quartzCursor.c
- hw/darwin/quartz/xpr/dri.c
- hw/darwin/quartz/xpr/dristruct.h
- hw/darwin/quartz/xpr/xprCursor.c
- hw/darwin/quartz/xpr/xprFrame.c
- hw/xfree86/modes/xf86RandR12.c
- include/cursor.h
- miext/rootless/rootlessCommon.h
- miext/rootless/rootlessScreen.c
- miext/rootless/rootlessWindow.c
- render/picturestr.h
+ Xext/EVI.c
+ Xext/bigreq.c
+ Xext/cup.c
+ Xext/dpms.c
+ Xext/fontcache.c
+ Xext/mitmisc.c
+ Xext/xcmisc.c
+ Xext/xf86bigfont.c
+ Xext/xtest.c
+ configure.ac
+ dbe/dbe.c
+ hw/darwin/darwin.h
+ hw/darwin/darwinEvents.c
+ hw/darwin/iokit/xfIOKit.h
+ hw/darwin/iokit/xfIOKitCursor.c
+ hw/darwin/quartz/fullscreen/fullscreen.c
+ hw/darwin/quartz/fullscreen/quartzCursor.c
+ hw/darwin/quartz/quartz.c
+ hw/darwin/quartz/quartzCommon.h
+ hw/darwin/quartz/quartzCursor.c
+ hw/darwin/quartz/xpr/dri.c
+ hw/darwin/quartz/xpr/dristruct.h
+ hw/darwin/quartz/xpr/xprCursor.c
+ hw/darwin/quartz/xpr/xprFrame.c
+ hw/xfree86/modes/xf86RandR12.c
+ include/cursor.h
+ miext/rootless/rootlessCommon.h
+ miext/rootless/rootlessScreen.c
+ miext/rootless/rootlessWindow.c
+ render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
@@ -129088,7 +139113,7 @@ Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Nov 20 15:21:31 2007 -0500
devPrivates rework: put back some changes that were mistakenly removed
- during merge conflict resolution.
+ during merge conflict resolution.
commit 709c1a70c8c6a9e132bf0d92f78a12be72beee51
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -129107,10 +139132,10 @@ Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 21:01:22 2007 -0500
devPrivates rework: put back a comment that was mistakenly removed
- during merge conflict resolution.
+ during merge conflict resolution.
commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94
-Merge: 60be452 ea9c63e
+Merge: 60be452c2e ea9c63e93b
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 19 18:10:46 2007 -0500
@@ -129118,8 +139143,8 @@ Date: Mon Nov 19 18:10:46 2007 -0500
Conflicts:
- hw/xnest/Pixmap.c
- include/dix.h
+ hw/xnest/Pixmap.c
+ include/dix.h
commit 60be452c2e88342f92a76ba5ec7d90b5b0211aaf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -129438,7 +139463,7 @@ Date: Thu Nov 8 17:25:36 2007 -0500
Don't sleep(1) at server exit.
commit 1603130236c55ddabc3854d4ba62d544debcf1f5
-Merge: f207e69 f7dd0c7
+Merge: f207e69d62 f7dd0c72b8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 14 13:35:50 2007 -0500
@@ -129446,8 +139471,8 @@ Date: Wed Nov 14 13:35:50 2007 -0500
Conflicts:
- Xext/xace.c
- Xext/xace.h
+ Xext/xace.c
+ Xext/xace.h
commit f207e69d62bc04c7f254347b03e6d8fa8b569d66
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -129815,7 +139840,7 @@ Date: Thu Nov 8 10:00:35 2007 +1030
Also clean up to return error codes instead of sending the error manually.
commit 184a7b8917a15bb2c719153b9b016c03aab42101
-Merge: a8808ac 0b72905
+Merge: a8808ac3d0 0b729051c0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 8 09:34:35 2007 +1030
@@ -129823,10 +139848,10 @@ Date: Thu Nov 8 09:34:35 2007 +1030
Conflicts:
- Xi/opendev.c
+ Xi/opendev.c
commit e94ab0b502160376d1956345196f7e1c7e2e886f
-Merge: 26e1fc7 9bee1c6
+Merge: 26e1fc7b42 9bee1c6912
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Nov 7 19:04:24 2007 +0100
@@ -129865,7 +139890,7 @@ Date: Wed Nov 7 18:43:16 2007 +0100
XNEST_LIBS contains the right thing.
commit 0b729051c04da7068f1e6dd319190bd0a362b2c0
-Merge: b7ee005 d7c5e8b
+Merge: b7ee005d32 d7c5e8bfc1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 7 15:37:23 2007 +1030
@@ -129873,19 +139898,19 @@ Date: Wed Nov 7 15:37:23 2007 +1030
Conflicts:
- Xi/extinit.c
- Xi/grabdev.c
- Xi/setmode.c
- Xi/ungrdev.c
- dix/devices.c
- dix/events.c
- dix/getevents.c
- include/dix.h
- mi/midispcur.c
- mi/misprite.c
- xkb/xkbActions.c
- xkb/xkbEvents.c
- xkb/xkbPrKeyEv.c
+ Xi/extinit.c
+ Xi/grabdev.c
+ Xi/setmode.c
+ Xi/ungrdev.c
+ dix/devices.c
+ dix/events.c
+ dix/getevents.c
+ include/dix.h
+ mi/midispcur.c
+ mi/misprite.c
+ xkb/xkbActions.c
+ xkb/xkbEvents.c
+ xkb/xkbPrKeyEv.c
commit e717409bae355df9a617a226f12fbb8c54ae77e5
Author: Daniel Stone <daniel@fooishbar.org>
@@ -129964,7 +139989,7 @@ Date: Tue Nov 6 16:26:09 2007 -0500
on the x11perf benchmark.
commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500
-Merge: 868e303 ddce48e
+Merge: 868e303630 ddce48ede0
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Tue Nov 6 16:25:40 2007 +0100
@@ -129991,7 +140016,7 @@ Date: Tue Nov 6 09:40:14 2007 +0000
to subsequent assertion failure in libdbus.
commit a52c9b2a59f27266557ff9d5d2c08492e04135a6
-Merge: c7e18be 5833289
+Merge: c7e18beb3c 58332894c0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Nov 5 19:08:36 2007 -0500
@@ -129999,12 +140024,12 @@ Date: Mon Nov 5 19:08:36 2007 -0500
Conflicts:
- dix/dispatch.c
- dix/property.c
- hw/xfree86/common/xf86VidMode.c
- include/xkbsrv.h
- render/glyph.c
- xkb/xkbActions.c
+ dix/dispatch.c
+ dix/property.c
+ hw/xfree86/common/xf86VidMode.c
+ include/xkbsrv.h
+ render/glyph.c
+ xkb/xkbActions.c
commit 58332894c061ae96d6a457f65266660f5f65e88b
Author: Adam Jackson <ajax@redhat.com>
@@ -130019,7 +140044,7 @@ Date: Mon Nov 5 15:01:13 2007 -0500
xselinux: Register SELinux extension protocol names.
commit 632c33c5c18b3e091c4fce98280af4d583e99640
-Merge: 4113f04 dda10c9
+Merge: 4113f040c5 dda10c9066
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Mon Nov 5 17:52:33 2007 +0100
@@ -130689,7 +140714,7 @@ Date: Thu Oct 25 12:35:01 2007 -0400
xselinux: Label the default device directly with the process context.
commit b633d54b94d746d26e13014634d9f63bbb7e8f7d
-Merge: 4b05f19 48ca596
+Merge: 4b05f19cb9 48ca5961ca
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 25 12:19:30 2007 -0400
@@ -130697,11 +140722,11 @@ Date: Thu Oct 25 12:19:30 2007 -0400
Conflicts:
- GL/glx/glxscreens.c
- hw/xnest/Screen.c
- render/glyph.c
- render/glyphstr.h
- render/render.c
+ GL/glx/glxscreens.c
+ hw/xnest/Screen.c
+ render/glyph.c
+ render/glyphstr.h
+ render/render.c
commit 242f56f722243938e908d1957781ee53c2999783
Author: Naoki Hamada <nao@tom-yam.or.jp>
@@ -130891,7 +140916,7 @@ Date: Fri Oct 19 16:34:54 2007 -0700
they should be.
commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a
-Merge: a358b87 7e1cada
+Merge: a358b87f45 7e1cada6c6
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 15:44:17 2007 -0700
@@ -130899,7 +140924,7 @@ Date: Fri Oct 19 15:44:17 2007 -0700
Conflicts:
- configure.ac
+ configure.ac
commit 12e889d202ac9849f534c51167cbfed91c32027a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -131097,7 +141122,7 @@ Date: Wed Oct 17 16:09:40 2007 -0400
Need to merge so this type of thing stops happening.
commit c3f7b862550fa8f46633162f83db8c27e46fc672
-Merge: af4dde0 feac075
+Merge: af4dde0ac1 feac075952
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 17 15:00:54 2007 -0400
@@ -131105,7 +141130,7 @@ Date: Wed Oct 17 15:00:54 2007 -0400
Conflicts:
- os/access.c
+ os/access.c
commit af4dde0ac19ecec1d0ad988eb25b15401e7c6b36
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -131677,7 +141702,7 @@ Date: Sun Oct 14 14:59:12 2007 -0400
Fix GLX byteswapping.
commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8
-Merge: ccda4b6 17ffc34
+Merge: ccda4b66bd 17ffc34ad5
Author: Kristian Høgsberg <krh@redhat.com>
Date: Fri Oct 12 19:28:39 2007 -0400
@@ -131957,7 +141982,7 @@ Date: Fri Oct 5 12:19:03 2007 +0930
regardless of who is the pairing client.
commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8
-Merge: ab11bad 3549a12
+Merge: ab11bad547 3549a12823
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Thu Oct 4 13:07:50 2007 +0200
@@ -131969,8 +141994,8 @@ Date: Thu Oct 4 13:05:29 2007 +0200
Xephyr: remove a potential crasher
- * hw/kdrive/ephyr/hostx.c:
- (hostx_has_dri): be more defensive.
+ * hw/kdrive/ephyr/hostx.c:
+ (hostx_has_dri): be more defensive.
commit 06c8977966e76255ce7798f4839ef6e3530264a8
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132014,8 +142039,8 @@ Date: Thu Oct 4 12:06:19 2007 +0200
Xephyr: better compilation without GLX
- * hw/kdrive/ephyr/ephyrinit.c: protect GLX related code with GLXEXT
- macro
+ * hw/kdrive/ephyr/ephyrinit.c: protect GLX related code with GLXEXT
+ macro
commit 3549a1282365e69e70c7c2546cfa7d25923cce31
Author: Michel Dänzer <michel@tungstengraphics.com>
@@ -132030,7 +142055,7 @@ Date: Thu Oct 4 11:38:01 2007 +0200
it for them completely.
commit 604ebb5a6de372e6a8a96e0ee997db7929126860
-Merge: 1365aef 4ba76a7
+Merge: 1365aeff54 4ba76a7e2b
Author: Dodji Seketeli <dodji@openedhand.com>
Date: Wed Oct 3 16:13:16 2007 +0200
@@ -132045,49 +142070,49 @@ Date: Wed Oct 3 13:03:34 2007 +0200
We can now launch GL or XV apps in any of the
Xephyr screens we want.
- * hw/kdrive/ephyr/hostx.c,h:
- (hostx_get_window):
- (hostx_create_window): make these functions be screen
- number aware.
- * hw/kdrive/ephyr/XF86dri.c : fix some compiler warnings.
- * hw/kdrive/ephyr/ephyrdri.c:
- (ephyrDRIQueryDirectRenderingCapable),
- (ephyrDRIOpenConnection),
- (ephyrDRIAuthConnection),
- (ephyrDRICloseConnection),
- (ephyrDRIGetClientDriverName),
- (ephyrDRICreateContext),
- (ephyrDRIDestroyContext),
- (ephyrDRICreateDrawable),
- (ephyrDRIGetDrawableInfo),
- (ephyrDRIGetDeviceInfo): in all those functions, don't forward
- the screen number we receive - from the client - to the host X.
- We (Xephyr) are always targetting the same X display screen, which is
- the one Xephyr got launched against. So we enforce that in the code.
- * hw/kdrive/ephyr/ephyrdriext.c:
- (EphyrMirrorHostVisuals): make this duplicate the visuals of the host X
- default screen into a given Xephyr screen. This way we have a chance
- to update the visuals of all Xephyr screen to make them mirror those
- of the host X.
- (many other places): specify screen number where required by the api
- change in hostx.h.
- * hw/kdrive/ephyr/ephyrglxext.c: specify screen number where required
- by the api change in hostx.h
- * hw/kdrive/ephyr/ephyrhostglx.c: don't forward the screen number we
- receive - from the client - to the host X.
- We (Xephyr) are always targetting the same
- X display screen, which is
- the one Xephyr got launched against. So we enforce that in the code.
- * hw/kdrive/ephyr/ephyrhostvideo.c,h: take in account the screen number received
- from the client app. This is useful to know on which Xephyr screen we
- need to display video stuff.
- * hw/kdrive/ephyr/ephyrvideo.c: update this to reflect the API change
- in hw/kdrive/ephyr/ephyrhostvideo.h.
- (ephyrSetPortAttribute): when parameters are not valid
- - they exceed their validity range - send them to the host anyway
- and do not return an error to clients.
- Some host expose buggy validity range, so rejecting client for that
- is too harsh.
+ * hw/kdrive/ephyr/hostx.c,h:
+ (hostx_get_window):
+ (hostx_create_window): make these functions be screen
+ number aware.
+ * hw/kdrive/ephyr/XF86dri.c : fix some compiler warnings.
+ * hw/kdrive/ephyr/ephyrdri.c:
+ (ephyrDRIQueryDirectRenderingCapable),
+ (ephyrDRIOpenConnection),
+ (ephyrDRIAuthConnection),
+ (ephyrDRICloseConnection),
+ (ephyrDRIGetClientDriverName),
+ (ephyrDRICreateContext),
+ (ephyrDRIDestroyContext),
+ (ephyrDRICreateDrawable),
+ (ephyrDRIGetDrawableInfo),
+ (ephyrDRIGetDeviceInfo): in all those functions, don't forward
+ the screen number we receive - from the client - to the host X.
+ We (Xephyr) are always targetting the same X display screen, which is
+ the one Xephyr got launched against. So we enforce that in the code.
+ * hw/kdrive/ephyr/ephyrdriext.c:
+ (EphyrMirrorHostVisuals): make this duplicate the visuals of the host X
+ default screen into a given Xephyr screen. This way we have a chance
+ to update the visuals of all Xephyr screen to make them mirror those
+ of the host X.
+ (many other places): specify screen number where required by the api
+ change in hostx.h.
+ * hw/kdrive/ephyr/ephyrglxext.c: specify screen number where required
+ by the api change in hostx.h
+ * hw/kdrive/ephyr/ephyrhostglx.c: don't forward the screen number we
+ receive - from the client - to the host X.
+ We (Xephyr) are always targetting the same
+ X display screen, which is
+ the one Xephyr got launched against. So we enforce that in the code.
+ * hw/kdrive/ephyr/ephyrhostvideo.c,h: take in account the screen number received
+ from the client app. This is useful to know on which Xephyr screen we
+ need to display video stuff.
+ * hw/kdrive/ephyr/ephyrvideo.c: update this to reflect the API change
+ in hw/kdrive/ephyr/ephyrhostvideo.h.
+ (ephyrSetPortAttribute): when parameters are not valid
+ - they exceed their validity range - send them to the host anyway
+ and do not return an error to clients.
+ Some host expose buggy validity range, so rejecting client for that
+ is too harsh.
commit ab88cb8d2e7c1410f9ed2be928b38f176b132e11
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -132168,7 +142193,7 @@ Date: Tue Oct 2 13:13:51 2007 -0700
Also fix incorrect library inclusion by kdrive which broke the build.
commit 439edc768eea17667846ce573c843b8377e0dfb4
-Merge: c8ccf46 93ae6fe
+Merge: c8ccf469dc 93ae6fe18c
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 2 12:14:04 2007 -0700
@@ -132176,8 +142201,8 @@ Date: Tue Oct 2 12:14:04 2007 -0700
Conflicts:
- configure.ac
- exa/exa_render.c
+ configure.ac
+ exa/exa_render.c
commit 59cebcd2e9302d15a52588ecafbbc2d2c5ae3a6c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -132211,9 +142236,9 @@ Date: Wed Sep 19 15:46:09 2007 +0200
Xephyr: glx fixlet
- * hw/kdrive/ephyr/ephyrhostglx.c:
- (ephyrHostGLXQueryVersion): properly query
- the host for its gxl version.
+ * hw/kdrive/ephyr/ephyrhostglx.c:
+ (ephyrHostGLXQueryVersion): properly query
+ the host for its gxl version.
commit 6a435b00003fb00930299a0e0810c93afc23a72e
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132221,17 +142246,17 @@ Date: Wed Sep 19 15:35:51 2007 +0200
Xephyr: check presence of extensions in host X
- * hw/kdrive/ephyr/hostx.c,h:
- (hostx_has_xshape),
- (hostx_has_glx),
- (hostx_has_dri): added these new entry points
- * hw/kdrive/ephyr/ephyrdriext.c:
- (ephyrDRIExtensionInit):
- check presence of DRI and XShape extensions before
- trying to use them.
- * hw/kdrive/ephyr/ephyrglxext.c:
- (ephyrHijackGLXExtension):
- check presence of glx extension before we use it.
+ * hw/kdrive/ephyr/hostx.c,h:
+ (hostx_has_xshape),
+ (hostx_has_glx),
+ (hostx_has_dri): added these new entry points
+ * hw/kdrive/ephyr/ephyrdriext.c:
+ (ephyrDRIExtensionInit):
+ check presence of DRI and XShape extensions before
+ trying to use them.
+ * hw/kdrive/ephyr/ephyrglxext.c:
+ (ephyrHijackGLXExtension):
+ check presence of glx extension before we use it.
commit 2b217fc055300d4c709dd27c4e8ec8166183993b
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132245,9 +142270,9 @@ Date: Tue Sep 18 18:41:18 2007 +0200
Xephyr: add -nodri and -noxv switches.
- * hw/kdrive/ephyr/ephyr.c,ephyrinit.c::
- add -nodri and -noxv to disable either DRI or XV.
- When -nodri, mesa GL (non acceleretated) works.
+ * hw/kdrive/ephyr/ephyr.c,ephyrinit.c::
+ add -nodri and -noxv to disable either DRI or XV.
+ When -nodri, mesa GL (non acceleretated) works.
commit 50674391388b3cfe987782a3ad81b4f240f3db67
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132255,12 +142280,12 @@ Date: Tue Sep 18 18:37:49 2007 +0200
Kdrive: use fbcmap_mi.c instead of fbcmap.c
- * hw/kdrive/src/Makefile.am: use fb/fbcmap_mi.c
- and not fb/fbcmap.c. This allows kdrive to take advantage of
- extensions redefining the entry points of micmap.c stuff.
- For instance it allows Xephyr to have a working GL, which is not
- possible otherwise, because GL redefines mInitVisualsProc
- to initialise its visuals.
+ * hw/kdrive/src/Makefile.am: use fb/fbcmap_mi.c
+ and not fb/fbcmap.c. This allows kdrive to take advantage of
+ extensions redefining the entry points of micmap.c stuff.
+ For instance it allows Xephyr to have a working GL, which is not
+ possible otherwise, because GL redefines mInitVisualsProc
+ to initialise its visuals.
commit a5bd536869f646e4024befa84f6e677b990310bc
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132281,14 +142306,14 @@ Date: Tue Sep 18 18:22:44 2007 +0200
GLX: allow skipping of visual init wrapping
- * GL/glx/glxvisuals.c: added boolean to disable
- calling init_visuals(). This gives a chance to Xephyr
- to take over visuals manipulation and avoid a crash at
- server shutdown in __glXMesaScreenDestroy(), due to the fact
- that mesa might sees more visual than what it has actually created in
- init_visuals(). It might see more visuals because Xephyr can augment
- the number of visuals, dynamically.
- * os/utils.c: the boolean is actually defined here.
+ * GL/glx/glxvisuals.c: added boolean to disable
+ calling init_visuals(). This gives a chance to Xephyr
+ to take over visuals manipulation and avoid a crash at
+ server shutdown in __glXMesaScreenDestroy(), due to the fact
+ that mesa might sees more visual than what it has actually created in
+ init_visuals(). It might see more visuals because Xephyr can augment
+ the number of visuals, dynamically.
+ * os/utils.c: the boolean is actually defined here.
commit ffe9ce6a843443606ad9367eca1645bf5e0635e5
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132296,15 +142321,15 @@ Date: Mon Sep 17 22:13:51 2007 +0200
Xephyr: fix a clipping issue xephyr-dri
- * hw/kdrive/ephyr/ephyrdri.c:
- (ephyrDRIGetDrawableInfo): force the back clipping rects
- to equal the front clipping rects.
- * hw/kdrive/ephyr/ephyrdriext.c:
- (ProcXF86DRIGetDrawableInfo): properly overclip the clipping rects we
- got from the client. This bug fixes a clipping rect that was too
- small in height, basically. Also fix a possible mem corruption.
- * hw/kdrive/ephyr/hostx.c:
- (hostx_set_window_geometry): remove a useless XSync
+ * hw/kdrive/ephyr/ephyrdri.c:
+ (ephyrDRIGetDrawableInfo): force the back clipping rects
+ to equal the front clipping rects.
+ * hw/kdrive/ephyr/ephyrdriext.c:
+ (ProcXF86DRIGetDrawableInfo): properly overclip the clipping rects we
+ got from the client. This bug fixes a clipping rect that was too
+ small in height, basically. Also fix a possible mem corruption.
+ * hw/kdrive/ephyr/hostx.c:
+ (hostx_set_window_geometry): remove a useless XSync
commit 79782726617d4b5a4f9b376f21936d035fc870e1
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132324,23 +142349,23 @@ Date: Sat Sep 8 00:33:59 2007 +0200
Xephyr: make accelerated glxgears work in Xephyr
- * hw/kdrive/ephyr/ephyr.c:
- (ephyrInitialize): cleanup ephyrDRI extension init.
- remove functions that belongs in ephyrdriext.c .
- * hw/kdrive/ephyr/ephyrdri.c:
- (ephyrDRICreateDrawable): create the drawable on the host X peer
- window, not on the host xephyr main window.
- (ephyrDRIGetDrawableInfo): get drawable info of the host X peer
- window.
- * hw/kdrive/ephyr/ephyrdriext.c: make ephyr DRI extention wrap
- a bunch of screen ops so that it can update the host X peer
- window whenever DRI bound drawable are moved in Xephyr.
- Also code the building blocks of the management of the
- host X window peer.
- * hw/kdrive/ephyr/hostx.c,h:
- (hostx_create_window): added this new entry point
- (hostx_destroy_window): ditto
- ()hostx_set_window_geometry): ditto
+ * hw/kdrive/ephyr/ephyr.c:
+ (ephyrInitialize): cleanup ephyrDRI extension init.
+ remove functions that belongs in ephyrdriext.c .
+ * hw/kdrive/ephyr/ephyrdri.c:
+ (ephyrDRICreateDrawable): create the drawable on the host X peer
+ window, not on the host xephyr main window.
+ (ephyrDRIGetDrawableInfo): get drawable info of the host X peer
+ window.
+ * hw/kdrive/ephyr/ephyrdriext.c: make ephyr DRI extention wrap
+ a bunch of screen ops so that it can update the host X peer
+ window whenever DRI bound drawable are moved in Xephyr.
+ Also code the building blocks of the management of the
+ host X window peer.
+ * hw/kdrive/ephyr/hostx.c,h:
+ (hostx_create_window): added this new entry point
+ (hostx_destroy_window): ditto
+ ()hostx_set_window_geometry): ditto
commit 6d1e44d3d53b451d466d43197be589d0ecc4b9f6
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132348,22 +142373,22 @@ Date: Tue Sep 4 18:28:16 2007 +0200
Xephyr: fix a host X hang.
- * hw/kdrive/ephyr/ephyrdri.c:
- (ephyrDRIGetDrawableInfo): quickly hook
- this into getting the drawable info from the host
- X server. For the time being, this only gets the drawable info
- of the Xephyr main window in the host. It should really get
- the info of a the peer drawable in the host X. So there should be a
- peer drawable to begin with.
- * hw/kdrive/ephyr/ephyrdriext.c:
- (ProcXF86DRIGetDrawableInfo): some cleanups. Properly get the
+ * hw/kdrive/ephyr/ephyrdri.c:
+ (ephyrDRIGetDrawableInfo): quickly hook
+ this into getting the drawable info from the host
+ X server. For the time being, this only gets the drawable info
+ of the Xephyr main window in the host. It should really get
+ the info of a the peer drawable in the host X. So there should be a
+ peer drawable to begin with.
+ * hw/kdrive/ephyr/ephyrdriext.c:
+ (ProcXF86DRIGetDrawableInfo): some cleanups. Properly get the
the drawable info otherwise there is a host X hang.
- * hw/kdrive/ephyr/ephyrhostglx.c: do not
- (ephyrHostGLXQueryVersion): do not use C bindings of the glx protocol
- calls. Some of those actually access DRI context directly, resulting
- in the context having three clients. Instead all XF86DRI proto
- fowarding request should be coded by hand and only forward the
- protocol requests
+ * hw/kdrive/ephyr/ephyrhostglx.c: do not
+ (ephyrHostGLXQueryVersion): do not use C bindings of the glx protocol
+ calls. Some of those actually access DRI context directly, resulting
+ in the context having three clients. Instead all XF86DRI proto
+ fowarding request should be coded by hand and only forward the
+ protocol requests
commit a39b57d2f784f14e3198c8506f5eb865bacc2440
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132371,7 +142396,7 @@ Date: Fri Aug 31 16:53:18 2007 +0200
Xephyr: add more logging to GLX forwarding
- * hw/kdrive/ephyr/ephyrhostglx.c: added more logging.
+ * hw/kdrive/ephyr/ephyrhostglx.c: added more logging.
commit 9e192d2118246ad715e23cf5626a038274eb1eaa
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132379,14 +142404,14 @@ Date: Fri Aug 31 14:43:39 2007 +0200
Xephyr: better error handling in GLX forwarding
- * hw/kdrive/ephyr/ephyrglxext.c:
- fixed various logging functions
- (ephyrGLXGetStringReal): make sure all the string is sent to clients
- including the ending zero.
- * hw/kdrive/ephyr/ephyrhostglx.c:
- (ephyrHostGLXGetStringFromServer): better error handling.
- (ephyrHostGLXSendClientInfo): ditto.
- (ephyrHostGLXMakeCurrent): ditto
+ * hw/kdrive/ephyr/ephyrglxext.c:
+ fixed various logging functions
+ (ephyrGLXGetStringReal): make sure all the string is sent to clients
+ including the ending zero.
+ * hw/kdrive/ephyr/ephyrhostglx.c:
+ (ephyrHostGLXGetStringFromServer): better error handling.
+ (ephyrHostGLXSendClientInfo): ditto.
+ (ephyrHostGLXMakeCurrent): ditto
commit 4dd4be99df38b70d43b02d9cb19e09e0ed94462b
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132394,34 +142419,34 @@ Date: Thu Aug 30 23:54:49 2007 +0200
Xephyr: Make glxinfo work on the ATI R200 free driver.
- * hw/kdrive/ephyr/ephyr.c:
- (EphyrDuplicateVisual): when duplicating the
- visual, copy the color component masks and the class
- from the hostX
- (EphyrMirrorHostVisuals): don't mix blue and green mask.
- * hw/kdrive/ephyr/ephyrdri.c: add more logs.
- (ephyrDRICreateDrawable): actually implement this.
- for the moment it creates a DRI drawable for the hostX window,
- no matter what drawable this call was issued for.
- (ephyrDRIGetDrawableInfo): actually implemented this.
- for the moment the drawable info queried for its attrs is the
- Xephyr main main window.
- * hw/kdrive/ephyr/ephyrdriext.c:
- (ProcXF86DRIGetDrawableInfo): properly hook this dispatch
- function to the ephyrDRIGetDrawableInfo() function.
- * hw/kdrive/ephyr/ephyrglxext.c: add a bunch of GLX implementation hooks
- here. Hijack some of the xserver GLX hooks with them. Still need to
- properly support byteswapped clients though.
- * hw/kdrive/ephyr/ephyrhostglx.c,h: actually implemented the protocol
- level forwarding functions used by the GLX entr points in
- ephyrglxext.c. Here as well, there are a bunch of them, but we are
- far from having implemented all the GLX calls.
- * hw/kdrive/ephyr/hostx.c,h:
- (hostx_get_window_attributes): added this new entry point
- (hostx_allocate_resource_id_peer): added this to keep track of
- resource IDs peers: one member of the peer is in Xephyr, the other
- is in host X.
- (hostx_get_resource_id_peer): ditto.
+ * hw/kdrive/ephyr/ephyr.c:
+ (EphyrDuplicateVisual): when duplicating the
+ visual, copy the color component masks and the class
+ from the hostX
+ (EphyrMirrorHostVisuals): don't mix blue and green mask.
+ * hw/kdrive/ephyr/ephyrdri.c: add more logs.
+ (ephyrDRICreateDrawable): actually implement this.
+ for the moment it creates a DRI drawable for the hostX window,
+ no matter what drawable this call was issued for.
+ (ephyrDRIGetDrawableInfo): actually implemented this.
+ for the moment the drawable info queried for its attrs is the
+ Xephyr main main window.
+ * hw/kdrive/ephyr/ephyrdriext.c:
+ (ProcXF86DRIGetDrawableInfo): properly hook this dispatch
+ function to the ephyrDRIGetDrawableInfo() function.
+ * hw/kdrive/ephyr/ephyrglxext.c: add a bunch of GLX implementation hooks
+ here. Hijack some of the xserver GLX hooks with them. Still need to
+ properly support byteswapped clients though.
+ * hw/kdrive/ephyr/ephyrhostglx.c,h: actually implemented the protocol
+ level forwarding functions used by the GLX entr points in
+ ephyrglxext.c. Here as well, there are a bunch of them, but we are
+ far from having implemented all the GLX calls.
+ * hw/kdrive/ephyr/hostx.c,h:
+ (hostx_get_window_attributes): added this new entry point
+ (hostx_allocate_resource_id_peer): added this to keep track of
+ resource IDs peers: one member of the peer is in Xephyr, the other
+ is in host X.
+ (hostx_get_resource_id_peer): ditto.
commit 8c78df0ea36abc7d46c4f59670289f4280f75507
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132429,9 +142454,9 @@ Date: Thu Aug 30 22:31:47 2007 +0200
Xserver: fix potential crash
- * dix/extension.c:
- (AddExtensionAlias): don't crash when failed to add
- extension alias.
+ * dix/extension.c:
+ (AddExtensionAlias): don't crash when failed to add
+ extension alias.
commit 024abe825cd702334266f6b8da289907bbd05970
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132445,11 +142470,11 @@ Date: Tue Aug 28 15:58:55 2007 +0200
mirror the visuals of the host X at startup.
- * hw/kdrive/ephyr/ephyr.c: make Xephyr mirror
- the visuals of the host X upon startup. This
- is important for GLX client apps.
- * hw/kdrive/ephyr/hostx.c,h: add a hostx_get_visuals_info()
- to get the visuals of the host X.
+ * hw/kdrive/ephyr/ephyr.c: make Xephyr mirror
+ the visuals of the host X upon startup. This
+ is important for GLX client apps.
+ * hw/kdrive/ephyr/hostx.c,h: add a hostx_get_visuals_info()
+ to get the visuals of the host X.
commit 26da625055a3876c93a7a005520657b971748c4e
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132457,20 +142482,20 @@ Date: Tue Aug 28 15:55:05 2007 +0200
proxy the glXGetFBConfigSGIX call
- * hw/kdrive/ephyr/ephyrglxext.c:
- (ephyrGLXGetFBConfigsSGIX): proxy the GLXGetFBConfigsSGIX call.
- It is a vendor extension to get the visual configs as a list of
- name/value pairs.
- (ephyrHijackGLXExtension): hijack the VendorPriv_dispatch_info
- dispatch table to register our implementation of GLXGetFBConfigsSGIX
- (ephyrGLXGetFBConfigsSGIXReal): added this where the real
- implementation of GLXGetFBConfigsSGIX is. It support bytes swapping.
- (ephyrGLXGetFBConfigsSGIX,ephyrGLXGetFBConfigsSGIXSwap): these are
- the dispatch entry points. They just call
- ephyrGLXGetFBConfigsSGIXReal.
- * hw/kdrive/ephyr/ephyrhostglx.c,h: reorganize the proxies to get
- visual params from the host so that they clearly support the different
- methods of doing so.
+ * hw/kdrive/ephyr/ephyrglxext.c:
+ (ephyrGLXGetFBConfigsSGIX): proxy the GLXGetFBConfigsSGIX call.
+ It is a vendor extension to get the visual configs as a list of
+ name/value pairs.
+ (ephyrHijackGLXExtension): hijack the VendorPriv_dispatch_info
+ dispatch table to register our implementation of GLXGetFBConfigsSGIX
+ (ephyrGLXGetFBConfigsSGIXReal): added this where the real
+ implementation of GLXGetFBConfigsSGIX is. It support bytes swapping.
+ (ephyrGLXGetFBConfigsSGIX,ephyrGLXGetFBConfigsSGIXSwap): these are
+ the dispatch entry points. They just call
+ ephyrGLXGetFBConfigsSGIXReal.
+ * hw/kdrive/ephyr/ephyrhostglx.c,h: reorganize the proxies to get
+ visual params from the host so that they clearly support the different
+ methods of doing so.
commit 5af73f98c46dfe5640185ca90feb20c39c6e06fa
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132478,16 +142503,16 @@ Date: Fri Aug 24 16:30:50 2007 +0200
EPHYR: Add an experiment proto proxy extension.
- * hw/kdrive/ephyr/Makefile.am: add the proxy extension to
- ephyr. The proxy extension is an experimental extension that
- forwards protocol packets targeted at a given extension to the
- host X.
- * hw/kdrive/ephyr/ephyr.c: init proxy ext.
- * hw/kdrive/ephyr/ephyrhostproxy.c,h: added this new file as part of the
- proxy extension.
- * hw/kdrive/ephyr/ephyrproxyext.c,h: ditto
- * hw/kdrive/ephyr/hostx.c: add the hostx_get_get_extension_info() entry
- point.
+ * hw/kdrive/ephyr/Makefile.am: add the proxy extension to
+ ephyr. The proxy extension is an experimental extension that
+ forwards protocol packets targeted at a given extension to the
+ host X.
+ * hw/kdrive/ephyr/ephyr.c: init proxy ext.
+ * hw/kdrive/ephyr/ephyrhostproxy.c,h: added this new file as part of the
+ proxy extension.
+ * hw/kdrive/ephyr/ephyrproxyext.c,h: ditto
+ * hw/kdrive/ephyr/hostx.c: add the hostx_get_get_extension_info() entry
+ point.
commit c06fa924b4781a35b86e4a78d95ff3e9d95b02d1
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132495,22 +142520,22 @@ Date: Thu Aug 23 11:53:02 2007 +0200
XEPHYR: more GLX/DRI proxying work.
- * hw/kdrive/ephyr/XF86dri.c: re format this correctly.
- Make function decls honour the Ansi-C standard.
- * hw/kdrive/ephyr/ephyr.c: protect glx/dri related
- extension initialisation with the XEPHYR_DRI
- macro. Initialize the GLX ext hijacking
- at startup.
- * hw/kdrive/ephyr/ephyrdri.c: add more logging to ease debugging
- * hw/kdrive/ephyr/ephyrdriext.c: ditto. reformat.
- * hw/kdrive/ephyr/ephyrglxext.c,h: add this extension to
- proxy GLX requests to the host X. started to proxy those nedded to
- make glxinfo work with fglrx. Not yet finished.
- * hw/kdrive/ephyr/ephyrhostglx.c,h: put here the actual
- Xlib code used to hit the host X server because Xlib stuff cannot be
- mixed with xserver internal code, otherwise compilation erros due to
- type clashes happen. So no Xlib type should be exported by the
- entrypoints defined here.
+ * hw/kdrive/ephyr/XF86dri.c: re format this correctly.
+ Make function decls honour the Ansi-C standard.
+ * hw/kdrive/ephyr/ephyr.c: protect glx/dri related
+ extension initialisation with the XEPHYR_DRI
+ macro. Initialize the GLX ext hijacking
+ at startup.
+ * hw/kdrive/ephyr/ephyrdri.c: add more logging to ease debugging
+ * hw/kdrive/ephyr/ephyrdriext.c: ditto. reformat.
+ * hw/kdrive/ephyr/ephyrglxext.c,h: add this extension to
+ proxy GLX requests to the host X. started to proxy those nedded to
+ make glxinfo work with fglrx. Not yet finished.
+ * hw/kdrive/ephyr/ephyrhostglx.c,h: put here the actual
+ Xlib code used to hit the host X server because Xlib stuff cannot be
+ mixed with xserver internal code, otherwise compilation erros due to
+ type clashes happen. So no Xlib type should be exported by the
+ entrypoints defined here.
commit 0b8545144975bf7ed43c2564d01c697144eb1244
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132518,14 +142543,14 @@ Date: Thu Aug 16 17:30:13 2007 +0200
Implement ReputImage and StopVideo
- * hw/kdrive/ephyr/ephyrhostvideo.c/h:
- (ephyrHostXVStopVideo): add this entry point.
- * hw/kdrive/ephyr/ephyrvideo.c:
- Basically add ReputImage and StopVideo implementations.
- Now, when other windows obscur the video window, the reclipping
- seems to be well handled using StopVideo and ReputImage.
- To do this, I was obliged to save the frame in PutImage, so
- that I could resend it un ReputImage.
+ * hw/kdrive/ephyr/ephyrhostvideo.c/h:
+ (ephyrHostXVStopVideo): add this entry point.
+ * hw/kdrive/ephyr/ephyrvideo.c:
+ Basically add ReputImage and StopVideo implementations.
+ Now, when other windows obscur the video window, the reclipping
+ seems to be well handled using StopVideo and ReputImage.
+ To do this, I was obliged to save the frame in PutImage, so
+ that I could resend it un ReputImage.
commit 810dc55866d1c2343512354646c7ab309ea1fad2
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132533,8 +142558,8 @@ Date: Thu Aug 16 17:11:22 2007 +0200
Ephyr-Xv: add a new line to a log
- * hw/kdrive/ephyr/ephyrvideo.c:
- (ephyrQueryImageAttributes): add newline to log.
+ * hw/kdrive/ephyr/ephyrvideo.c:
+ (ephyrQueryImageAttributes): add newline to log.
commit 47e6dff89e48249828e828502e98951eee7f85bc
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132542,11 +142567,11 @@ Date: Thu Aug 16 17:07:36 2007 +0200
Xephyr-Xv: fix a crash when host X support several ports
- * hw/kdrive/ephyr/ephyrvideo.c:
- (ephyrXVPrivQueryHostAdaptors): properly set
- port private luke. This fixes a crash when
- the host Xv supports multiple ports.
- Make sure number of ports cannot be zero.
+ * hw/kdrive/ephyr/ephyrvideo.c:
+ (ephyrXVPrivQueryHostAdaptors): properly set
+ port private luke. This fixes a crash when
+ the host Xv supports multiple ports.
+ Make sure number of ports cannot be zero.
commit a38ad562a6f50e9d76a37917b936035215ea460e
Author: Dodji Seketeli <dodji@seketeli.org>
@@ -132554,15 +142579,15 @@ Date: Wed Aug 15 19:40:10 2007 +0200
make xephyr talk DRI protocol with hostX
- * configure.ac,include/dix-config.h.in: define the XEPHYR_DRI macro.
- define it when --enable-xephyr and --enable-dri are both turned on.
- * hw/kdrive/ephyr/XF86dri.c: copy this from mesa source to enable
- Xephyr to talk DRI protocol the host X. In mesa, this is used by libGL.so to
- talk DRI protocol with the server.
- * hw/kdrive/ephyr/ephyr.c: finally initialise the DRI extension
- in the ephyrInitScreen() function.
- * hw/kdrive/ephyr/ephyrdri.c,ephyrdriext.c: safeguard the compilation
- using the XEPHYR_DRI macro.
+ * configure.ac,include/dix-config.h.in: define the XEPHYR_DRI macro.
+ define it when --enable-xephyr and --enable-dri are both turned on.
+ * hw/kdrive/ephyr/XF86dri.c: copy this from mesa source to enable
+ Xephyr to talk DRI protocol the host X. In mesa, this is used by libGL.so to
+ talk DRI protocol with the server.
+ * hw/kdrive/ephyr/ephyr.c: finally initialise the DRI extension
+ in the ephyrInitScreen() function.
+ * hw/kdrive/ephyr/ephyrdri.c,ephyrdriext.c: safeguard the compilation
+ using the XEPHYR_DRI macro.
commit e4239a48075c77e6a8d2d5cb21f58dd67687482f
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132570,16 +142595,16 @@ Date: Tue Aug 14 22:48:41 2007 +0200
Initial dri forwarding big bricks.
- * hw/kdrive/ephyr/ephyrdriext.c: added this to implement a DRI extension
- into Xephyr. Normally the DRI extension is only present in the
- xfree86 server, but I have ported it to Xephyr. The extension calls
- functions that declared/defined in ephyrdri.h ephyrdri.c that
- forwards the DRI calls to the host X. It does not work yet, as this
- entry is just to put the big bricks in place.
- * hw/kdrive/ephyr/ephyrdri.c,h: declaration & definition of the
- DRI client API that would hit the hostX server.
- * hw/kdrive/ephyr/GL/internal/dri_interface.h: added this, otherwise
- inclusion of /usr/include/X11/dri/xf86dri.h won't compile
+ * hw/kdrive/ephyr/ephyrdriext.c: added this to implement a DRI extension
+ into Xephyr. Normally the DRI extension is only present in the
+ xfree86 server, but I have ported it to Xephyr. The extension calls
+ functions that declared/defined in ephyrdri.h ephyrdri.c that
+ forwards the DRI calls to the host X. It does not work yet, as this
+ entry is just to put the big bricks in place.
+ * hw/kdrive/ephyr/ephyrdri.c,h: declaration & definition of the
+ DRI client API that would hit the hostX server.
+ * hw/kdrive/ephyr/GL/internal/dri_interface.h: added this, otherwise
+ inclusion of /usr/include/X11/dri/xf86dri.h won't compile
commit e01d3dd98d1b596e75d25f94dd89c7d41223011d
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132587,13 +142612,13 @@ Date: Thu Aug 9 10:55:10 2007 +0200
Support clipping region in PutImage.
- * hw/kdrive/ephyr/ephyrhostvideo.c,h:
- (ephyrHostXVPutImage): make this support clipping region.
- The clipping region is propagated to host using XSetClipRectangles.
- This changes the API of ephyrHostXVPutImage.
- * hw/kdrive/ephyr/ephyrvideo.c:
- (ephyrPutImage): propagate the clipping region to the new
- ephyrHostXVPutImage() entry point.
+ * hw/kdrive/ephyr/ephyrhostvideo.c,h:
+ (ephyrHostXVPutImage): make this support clipping region.
+ The clipping region is propagated to host using XSetClipRectangles.
+ This changes the API of ephyrHostXVPutImage.
+ * hw/kdrive/ephyr/ephyrvideo.c:
+ (ephyrPutImage): propagate the clipping region to the new
+ ephyrHostXVPutImage() entry point.
commit 39d3895469f07304d72800d8dcef6c7732f13d5f
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132601,10 +142626,10 @@ Date: Wed Aug 8 14:27:32 2007 +0200
make EphyrXVPriv be a singleton
- * hw/kdrive/ephyr/ephyrvideo.c:
- (ephyrInitVideo) make the EphyrXVPriv object be a
- singleton instance, otherwise a new object is created at each
- generation.
+ * hw/kdrive/ephyr/ephyrvideo.c:
+ (ephyrInitVideo) make the EphyrXVPriv object be a
+ singleton instance, otherwise a new object is created at each
+ generation.
commit 4ed083095a13ec92bb4c8e705f26500f8312c138
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132612,21 +142637,21 @@ Date: Tue Aug 7 14:16:13 2007 +0200
add [Get/Put]Video and [Get/Put]Still support
- * hw/kdrive/ephyr/ephyrhostvideo.c,h:
- (ephyrHostXVAdaptorHasXXX): fix these.
- (ephyrHostXVAdaptorHasGetVideo): added this
- (ephyrHostXVAdaptorHasGetStill): ditto
- (ephyrHostXVPutVideo): added this
- (ephyrHostXVGetVideo): ditto
- (ephyrHostXVPutStill): ditto
- (ephyrHostXVGetStill): ditto
- * hw/kdrive/ephyr/ephyrvideo.c:
- (ephyrPutVideo): implement this
- (ephyrGetVideo): ditto
- (ephyrPutStill): ditto
- (ephyrGetStill): ditto
- (ephyrXVPrivSetAdaptorsHooks): advertise GetVideo and GetStill
- when the host X supports it.
+ * hw/kdrive/ephyr/ephyrhostvideo.c,h:
+ (ephyrHostXVAdaptorHasXXX): fix these.
+ (ephyrHostXVAdaptorHasGetVideo): added this
+ (ephyrHostXVAdaptorHasGetStill): ditto
+ (ephyrHostXVPutVideo): added this
+ (ephyrHostXVGetVideo): ditto
+ (ephyrHostXVPutStill): ditto
+ (ephyrHostXVGetStill): ditto
+ * hw/kdrive/ephyr/ephyrvideo.c:
+ (ephyrPutVideo): implement this
+ (ephyrGetVideo): ditto
+ (ephyrPutStill): ditto
+ (ephyrGetStill): ditto
+ (ephyrXVPrivSetAdaptorsHooks): advertise GetVideo and GetStill
+ when the host X supports it.
commit 6f7961bc218169aaa0d10cfad0952adb7fac2f00
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132799,21 +142824,21 @@ Date: Tue Oct 2 13:25:51 2007 +0200
Xephyr: add "multiscreen" suport
- * This patch adds multiscreen support to Xephyr. For instance,
- the command line : "Xephyr :4 -ac -screen 320x240 -screen 640x480"
- will launch with two "screens" - namely two main windows.
- The first main window represents a screen that has the number :4.0, with
- a geometry of 320x240 pixels, and the second one represents a screen
- that has the number :4.1 with a geometry of 640x480.
- The command line: "DISPLAY=:4.1 xclock" will launch the xclock program
- on the second screen, for intance.
-
- * this patch was edited by Dodji Seketeli <dodji@openedhand.com> for:
- - better style compliance with the rest of the Xephyr code
- - make sure Xephyr could be launched with no -screen option. By
- default that creates a default screen of 640x480 pixel like before
- - display full titles on the windows - with insctructions to grab
- keyboard and mouse - like before.
+ * This patch adds multiscreen support to Xephyr. For instance,
+ the command line : "Xephyr :4 -ac -screen 320x240 -screen 640x480"
+ will launch with two "screens" - namely two main windows.
+ The first main window represents a screen that has the number :4.0, with
+ a geometry of 320x240 pixels, and the second one represents a screen
+ that has the number :4.1 with a geometry of 640x480.
+ The command line: "DISPLAY=:4.1 xclock" will launch the xclock program
+ on the second screen, for intance.
+
+ * this patch was edited by Dodji Seketeli <dodji@openedhand.com> for:
+ - better style compliance with the rest of the Xephyr code
+ - make sure Xephyr could be launched with no -screen option. By
+ default that creates a default screen of 640x480 pixel like before
+ - display full titles on the windows - with insctructions to grab
+ keyboard and mouse - like before.
commit 81692b628f41cb64329f3cccc0503fb216a2b8e3
Author: Dodji Seketeli <dodji@openedhand.com>
@@ -132821,12 +142846,12 @@ Date: Tue Oct 2 13:11:28 2007 +0200
Fix #12650: "windows not receiving mouse events in multiple screens context"
- * dix/events.c, include/dix.h:
- (UpdateSpriteForScreen): added this to update the mouse sprite context
- when we switch from a pScreen to another.
- * mi/mipointer.c:
- (miPointerWarpCursor): as we are switching to a new pScreen,
- don't forget to update the mouse sprite context.
+ * dix/events.c, include/dix.h:
+ (UpdateSpriteForScreen): added this to update the mouse sprite context
+ when we switch from a pScreen to another.
+ * mi/mipointer.c:
+ (miPointerWarpCursor): as we are switching to a new pScreen,
+ don't forget to update the mouse sprite context.
commit f965a5f3454a95ddffb2faf9b291feff46305adf
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -133101,7 +143126,7 @@ Date: Thu Sep 27 11:44:03 2007 +0930
This is hopefully better than hardcodey calling CoreProcessPointerEvent.
commit 27612748e0ec20f3a23839f0a12e39f598dd722c
-Merge: b614614 3b114f2
+Merge: b61461425e 3b114f2603
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 26 07:47:29 2007 -0400
@@ -133109,7 +143134,7 @@ Date: Wed Sep 26 07:47:29 2007 -0400
Conflicts:
- dix/devices.c
+ dix/devices.c
commit 3b114f2603fc2adeec7f5f8f20fe4870afb8dff1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -133137,9 +143162,9 @@ Date: Wed Sep 26 15:26:42 2007 +0200
Xephyr: fix compiler warnings
- * hw/kdrive/ephyr/ephyr_draw.c:
- (ephyrDownloadFromScreen),
- (ephyrUploadToScreen): fix compiler warnings
+ * hw/kdrive/ephyr/ephyr_draw.c:
+ (ephyrDownloadFromScreen),
+ (ephyrUploadToScreen): fix compiler warnings
commit 8f9bf927e1beecf9b9ec8877131ec12c765e4d84
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -133522,7 +143547,7 @@ Date: Wed Sep 19 04:46:10 2007 -0700
hey -- you have to start somewhere. ;)
commit 97c150b61bbe436453b05d3c07cd2173870aac40
-Merge: 57907e0 547ad21
+Merge: 57907e0943 547ad2125e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Sep 19 07:25:55 2007 -0400
@@ -133530,24 +143555,24 @@ Date: Wed Sep 19 07:25:55 2007 -0400
Conflicts:
- afb/afbpntwin.c
- afb/afbscrinit.c
- afb/afbwindow.c
- cfb/cfb.h
- cfb/cfballpriv.c
- cfb/cfbscrinit.c
- cfb/cfbwindow.c
- configure.ac
- fb/wfbrename.h
- hw/xfree86/xf4bpp/ppcIO.c
- hw/xfree86/xf4bpp/ppcPntWin.c
- hw/xfree86/xf4bpp/ppcWindow.c
- hw/xfree86/xf8_32bpp/cfbscrinit.c
- mfb/mfb.h
- mfb/mfbpntwin.c
- mfb/mfbscrinit.c
- mfb/mfbwindow.c
- mi/miexpose.c
+ afb/afbpntwin.c
+ afb/afbscrinit.c
+ afb/afbwindow.c
+ cfb/cfb.h
+ cfb/cfballpriv.c
+ cfb/cfbscrinit.c
+ cfb/cfbwindow.c
+ configure.ac
+ fb/wfbrename.h
+ hw/xfree86/xf4bpp/ppcIO.c
+ hw/xfree86/xf4bpp/ppcPntWin.c
+ hw/xfree86/xf4bpp/ppcWindow.c
+ hw/xfree86/xf8_32bpp/cfbscrinit.c
+ mfb/mfb.h
+ mfb/mfbpntwin.c
+ mfb/mfbscrinit.c
+ mfb/mfbwindow.c
+ mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
@@ -133647,7 +143672,7 @@ Date: Sat Sep 15 14:01:57 2007 +0200
Initialize output->pendingProperties.
commit b9f7aeb20015290a8acf938a11bf9272bf3527cf
-Merge: e4d11e5 06d27f8
+Merge: e4d11e58ce 06d27f8045
Author: Eric Anholt <eric@anholt.net>
Date: Thu Sep 13 00:15:45 2007 +0000
@@ -133655,7 +143680,7 @@ Date: Thu Sep 13 00:15:45 2007 +0000
Conflicts:
- mi/miexpose.c
+ mi/miexpose.c
commit e4d11e58ce349dfe6af2f73ff341317f9b39684c
Author: Eric Anholt <eric@anholt.net>
@@ -134061,7 +144086,7 @@ Date: Wed Sep 5 17:46:23 2007 -0700
broken uses.
commit e332335241af28ef0ab66b102d0cbc4e5c73ac68
-Merge: 7381e91 accd71b
+Merge: 7381e9149e accd71bda6
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 15:51:23 2007 -0700
@@ -134106,7 +144131,7 @@ Date: Wed Sep 5 14:31:01 2007 -0700
so it doesn't make sense to require it when building on OSX/Darwin.
commit ff01e44e33fd072958fb0157dae072f1b1c88944
-Merge: 8ba8c16 47300ed
+Merge: 8ba8c16af7 47300ed2be
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Wed Sep 5 13:56:08 2007 -0700
@@ -134256,7 +144281,7 @@ Date: Tue Sep 4 14:49:49 2007 -0700
Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart.
commit bf5948518763b5e21eff806a0a9abc5f7757fa10
-Merge: 4062db4 735da3d
+Merge: 4062db4020 735da3dcd0
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Tue Sep 4 22:40:31 2007 +0200
@@ -134572,7 +144597,7 @@ Date: Tue Aug 28 09:28:25 2007 -0400
FontRec privates.
commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5
-Merge: 860a09c 7d54399
+Merge: 860a09cfb8 7d54399cfd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 28 07:25:21 2007 -0400
@@ -134580,10 +144605,10 @@ Date: Tue Aug 28 07:25:21 2007 -0400
Conflicts:
- include/miscstruct.h
- mi/mibstore.c
- mi/midispcur.c
- os/Makefile.am
+ include/miscstruct.h
+ mi/mibstore.c
+ mi/midispcur.c
+ os/Makefile.am
commit 3fe67d23edaae3ddde20cd5f349aa5dfde1d26a3
Author: Eric Anholt <eric@anholt.net>
@@ -134672,7 +144697,7 @@ Date: Fri Aug 24 16:00:31 2007 -0700
Bump video driver ABI for pci-rework.
commit 91f358336f77c0e4f577be65cca977d17298e36c
-Merge: b9a806f 8b6b40b
+Merge: b9a806f0b3 8b6b40b727
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Aug 24 15:04:21 2007 -0700
@@ -134726,7 +144751,7 @@ Date: Fri Aug 24 13:04:48 2007 +0200
case.
commit 8b6b40b7271acd81a9548f502c18f46f3b640640
-Merge: ab7a6d8 3305d17
+Merge: ab7a6d860d 3305d17195
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Aug 23 18:19:17 2007 -0700
@@ -134734,16 +144759,16 @@ Date: Thu Aug 23 18:19:17 2007 -0700
Conflicts:
- hw/xfree86/common/xf86.h
- hw/xfree86/common/xf86Init.c
- hw/xfree86/common/xf86pciBus.c
- hw/xfree86/int10/generic.c
- hw/xfree86/int10/helper_exec.c
- hw/xfree86/loader/xf86sym.c
- hw/xfree86/os-support/bus/Pci.c
- hw/xfree86/os-support/bus/Pci.h
- hw/xfree86/os-support/bus/linuxPci.c
- hw/xfree86/os-support/linux/int10/linux.c
+ hw/xfree86/common/xf86.h
+ hw/xfree86/common/xf86Init.c
+ hw/xfree86/common/xf86pciBus.c
+ hw/xfree86/int10/generic.c
+ hw/xfree86/int10/helper_exec.c
+ hw/xfree86/loader/xf86sym.c
+ hw/xfree86/os-support/bus/Pci.c
+ hw/xfree86/os-support/bus/Pci.h
+ hw/xfree86/os-support/bus/linuxPci.c
+ hw/xfree86/os-support/linux/int10/linux.c
commit 93ae6fe18c417a22f1fccb22add4890a20cae713
Author: Carl Worth <cworth@cworth.org>
@@ -134863,7 +144888,7 @@ Date: Wed Aug 22 16:54:29 2007 +0100
Fix <pixman.h> include to <pixman/pixman.h>
commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0
-Merge: 53941c8 6ef4ecd
+Merge: 53941c8e68 6ef4ecd826
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date: Tue Aug 21 14:26:34 2007 -0400
@@ -135175,7 +145200,7 @@ Date: Mon Aug 13 10:43:48 2007 -0400
current interface.
commit f367285fd5825e0adc271982a529c9904ad65c89
-Merge: b1272ee ff4bd3a
+Merge: b1272eefd9 ff4bd3addb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Aug 12 15:31:10 2007 +0930
@@ -135183,11 +145208,11 @@ Date: Sun Aug 12 15:31:10 2007 +0930
Conflicts:
- Xi/exevents.c
- dix/devices.c
- dix/getevents.c
- include/dix.h
- mi/mieq.c
+ Xi/exevents.c
+ dix/devices.c
+ dix/getevents.c
+ include/dix.h
+ mi/mieq.c
commit 03f9da672466b9ab9a9814d784b8c44f1030587e
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
@@ -135550,7 +145575,7 @@ Date: Wed Jul 25 14:57:13 2007 -0700
ProcRenderAddGlyphs: Convert while loops to for loops where more natural
commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74
-Merge: 32c0dcc f3955c0
+Merge: 32c0dcc8c0 f3955c0a02
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Aug 2 14:27:03 2007 -0400
@@ -135558,9 +145583,9 @@ Date: Thu Aug 2 14:27:03 2007 -0400
Conflicts:
- dix/devices.c
- dix/property.c
- include/dix.h
+ dix/devices.c
+ dix/property.c
+ include/dix.h
commit f3955c0a020b39021050cd33c20a17f14fc4b579
Author: Arkadiusz Miskiewicz <arekm@maven.pl>
@@ -135743,7 +145768,7 @@ Date: Mon Apr 30 11:37:46 2007 -0400
find -name '*.c' -o -name '*.h' | xargs gvim
egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
- | grep -v "\.in$" | xargs gvim
+ | grep -v "\.in$" | xargs gvim
cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
@@ -136724,7 +146749,7 @@ Date: Tue Jun 19 18:20:05 2007 +0930
Conflicts:
- Xi/exevents.c
+ Xi/exevents.c
commit 24ee89fd60f489f2d3af0399e0d667057df74d02
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -136858,7 +146883,7 @@ Date: Wed Jun 20 18:42:00 2007 +0200
can't actually occur when swapped out.
commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c
-Merge: 5dee64f 2e7fef7
+Merge: 5dee64fc99 2e7fef7d08
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Jun 19 17:20:52 2007 +0930
@@ -136866,10 +146891,10 @@ Date: Tue Jun 19 17:20:52 2007 +0930
Conflicts:
- dix/devices.c
- hw/xfree86/common/xf86Xinput.c
- hw/xfree86/loader/xf86sym.c
- mi/mieq.c
+ dix/devices.c
+ hw/xfree86/common/xf86Xinput.c
+ hw/xfree86/loader/xf86sym.c
+ mi/mieq.c
commit 40f27a2df4906d9ceb1c78f6163a62c497321535
Author: Michel Dänzer <michel@tungstengraphics.com>
@@ -136900,7 +146925,7 @@ Date: Tue Jun 19 11:28:07 2007 +0930
device to interact, so this seems like a reasonable solution.
commit ab7a6d860d4a275a810a64b1ba7b13726ed10575
-Merge: e9130b8 2e7fef7
+Merge: e9130b8bac 2e7fef7d08
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jun 18 16:51:13 2007 -0700
@@ -136908,8 +146933,8 @@ Date: Mon Jun 18 16:51:13 2007 -0700
Conflicts:
- hw/xfree86/os-support/bus/Pci.c
- hw/xfree86/os-support/bus/linuxPci.c
+ hw/xfree86/os-support/bus/Pci.c
+ hw/xfree86/os-support/bus/linuxPci.c
commit 2e7fef7d0837939e822c40b6ac77e7f0e66d57bd
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
@@ -136982,7 +147007,7 @@ Date: Mon Jun 11 21:25:42 2007 -0400
Delete fbBltmmx().
commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0
-Merge: 878cac7 3f9adb1
+Merge: 878cac71aa 3f9adb18f1
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Jun 11 15:29:11 2007 -0400
@@ -136990,7 +147015,7 @@ Date: Mon Jun 11 15:29:11 2007 -0400
Conflicts:
- dix/dixutils.c
+ dix/dixutils.c
commit 3f9adb18f127318d054f30a57e3a77176e14c692
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
@@ -137306,7 +147331,7 @@ Date: Tue May 29 14:54:27 2007 -0600
Remove wscons keyboard handling stuff that doesn't belong there anymore.
commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0
-Merge: 3a6549a 2f13b7c
+Merge: 3a6549a163 2f13b7c113
Author: Matthieu Herrb <matthieu@deville.herrb.com>
Date: Tue May 29 12:14:49 2007 -0600
@@ -137479,7 +147504,7 @@ Date: Wed May 23 12:56:04 2007 -0400
Add missing offsets for window coordinates - reported by Colin Harrison
commit 2a4aa63a23ddd816b647b851a01865861827a7eb
-Merge: 9cee4ec cc648e6
+Merge: 9cee4ec5e6 cc648e609d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue May 22 14:50:26 2007 -0400
@@ -137487,7 +147512,7 @@ Date: Tue May 22 14:50:26 2007 -0400
Conflicts:
- include/miscstruct.h
+ include/miscstruct.h
commit cc648e609d472472bac4a2e568eb3598b3690ba3
Author: Michel Dänzer <michel@tungstengraphics.com>
@@ -137732,7 +147757,7 @@ Date: Tue May 15 10:24:22 2007 +0930
Conflicts:
- dix/events.c
+ dix/events.c
commit 81fc6a128b64ad412064405ed45db0175398e3f0
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -138030,7 +148055,7 @@ Date: Mon Apr 30 10:33:12 2007 -0600
fix __glXErrorCallBack() proto
commit 6b33459bf5aac23c3ecc7002d091c02f327d907a
-Merge: 18252a5 3c91a99
+Merge: 18252a515d 3c91a993e8
Author: Brian <brian@yutani.localnet.net>
Date: Mon Apr 30 10:26:19 2007 -0600
@@ -138218,7 +148243,7 @@ Date: Fri Apr 27 08:13:08 2007 -0400
are both 0.
commit f28eea0647f007c2e2415ecc6fceef46201faad4
-Merge: 339b73e ae04f2c
+Merge: 339b73e710 ae04f2cb0a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Apr 27 16:34:36 2007 +0930
@@ -138226,8 +148251,8 @@ Date: Fri Apr 27 16:34:36 2007 +0930
Conflicts:
- dix/devices.c
- dix/events.c
+ dix/devices.c
+ dix/events.c
commit 339b73e710a0920608a3fbcb20b406f0f6c4e0f6
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -138749,7 +148774,7 @@ Date: Tue Apr 17 13:46:55 2007 -0400
security: remove debugging code.
commit 1f06d32ef58749d0f0c062193d237ee98f60e90f
-Merge: cf962a8 fc162c6
+Merge: cf962a849d fc162c6cfa
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Apr 17 12:10:22 2007 -0400
@@ -138757,7 +148782,7 @@ Date: Tue Apr 17 12:10:22 2007 -0400
Conflicts:
- dix/privates.c
+ dix/privates.c
commit b6aec7f6f906a18d13586d63afabf1ee4fbb11c3
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -138920,7 +148945,7 @@ Date: Thu Apr 12 11:16:19 2007 +0930
This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
commit d4dad6f84f82a4ade5005c3aa93511c1295875b8
-Merge: f1f8b56 33a5d96
+Merge: f1f8b562aa 33a5d9605e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 12 11:11:03 2007 +0930
@@ -138928,9 +148953,9 @@ Date: Thu Apr 12 11:11:03 2007 +0930
Conflicts:
- configure.ac
- dix/events.c
- hw/xfree86/common/xf86Xinput.c
+ configure.ac
+ dix/events.c
+ hw/xfree86/common/xf86Xinput.c
commit 33a5d9605e3e282f6aa1921d7321a2a12ef02c42
Author: Daniel Stone <daniel@fooishbar.org>
@@ -139174,7 +149199,7 @@ Date: Fri Apr 6 13:38:12 2007 +0300
GLcore: fix after moving xf86glx_util.[hc] to Mesa.
commit cf962a849db2b259ca558c6265ea7e3328a4d312
-Merge: 5ad5625 5a804f2
+Merge: 5ad562565a 5a804f2e97
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Apr 5 14:41:39 2007 -0400
@@ -139182,7 +149207,7 @@ Date: Thu Apr 5 14:41:39 2007 -0400
Conflicts:
- configure.ac
+ configure.ac
commit 5ad562565ac8ef9257da3afb0de1ae4f90f80fe9
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -139320,7 +149345,7 @@ Date: Tue Apr 3 09:27:57 2007 -0600
about setting the XFree86Server symbol.
commit 1cc8db72816cd079f30255046e10043c350bf683
-Merge: 645d87c a39f297
+Merge: 645d87cf8e a39f297ada
Author: Matthieu Herrb <matthieu@roadrock.(none)>
Date: Tue Apr 3 16:04:45 2007 +0200
@@ -139339,7 +149364,7 @@ Date: Tue Apr 3 19:02:14 2007 +0930
Delete all grabs from all devices when deleting a window.
commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3
-Merge: 9b0b340 f09ee16
+Merge: 9b0b340668 f09ee168e2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 3 15:07:18 2007 +0930
@@ -139459,7 +149484,7 @@ Date: Mon Apr 2 12:26:27 2007 -0600
formatting fixes
commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0
-Merge: a120547 96ce17a
+Merge: a12054757d 96ce17aa94
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Apr 2 15:36:26 2007 +0930
@@ -139467,14 +149492,14 @@ Date: Mon Apr 2 15:36:26 2007 +0930
Conflicts:
- Xi/closedev.c
- Xi/exevents.c
- Xi/extinit.c
- Xi/listdev.c
- dix/window.c
- hw/xfree86/common/xf86Xinput.c
- include/extinit.h
- mi/mipointer.c
+ Xi/closedev.c
+ Xi/exevents.c
+ Xi/extinit.c
+ Xi/listdev.c
+ dix/window.c
+ hw/xfree86/common/xf86Xinput.c
+ include/extinit.h
+ mi/mipointer.c
commit 96ce17aa94413c4b8bcb61cae71167050130a307
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -139524,7 +149549,7 @@ Date: Fri Mar 30 16:05:46 2007 -0600
values of 1280 (my screen width).
commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48
-Merge: 2c6d471 92e8cdb
+Merge: 2c6d471088 92e8cdbd32
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Mar 30 13:39:15 2007 -0700
@@ -139661,7 +149686,7 @@ Date: Wed Mar 28 12:57:11 2007 -0400
xace: provide creation-time resource hook call in CreateWindow().
commit 99b220969f2f8ba829bc8294b27ca90fd9311be4
-Merge: 728ad64 82a8b99
+Merge: 728ad64d97 82a8b99a6c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 28 12:54:04 2007 -0400
@@ -139674,7 +149699,7 @@ Date: Wed Mar 28 12:03:19 2007 -0400
Refuse to create tiny modes from EDID detailed timing.
commit 2c6d47108880584f1221ff86c6c8947627f9f607
-Merge: c4fe1bc 8522044
+Merge: c4fe1bcce1 8522044635
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Mar 28 08:08:04 2007 -0700
@@ -139682,8 +149707,8 @@ Date: Wed Mar 28 08:08:04 2007 -0700
Conflicts:
- hw/xfree86/Makefile.am
- hw/xfree86/dri/dri.c
+ hw/xfree86/Makefile.am
+ hw/xfree86/dri/dri.c
commit 85220446359a75ea2c359b418b4051c04eea739c
Author: Daniel Stone <daniel@fooishbar.org>
@@ -139744,7 +149769,7 @@ Date: Mon Mar 26 16:04:50 2007 -0700
Fix indentation of fakexa help text.
commit 728ad64d979fd9e5cca28e8c15118c18d707c431
-Merge: 0331c6a 6a0bed1
+Merge: 0331c6a8fc 6a0bed16e8
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Mar 27 13:16:40 2007 -0400
@@ -139781,7 +149806,7 @@ Date: Mon Mar 26 12:44:58 2007 -0700
Update xorg.conf manpage for new RandR 1.2 monitor options.
commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413
-Merge: 84a066c f7c5aa0
+Merge: 84a066cc88 f7c5aa0dc0
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 26 10:28:05 2007 -0400
@@ -139902,8 +149927,8 @@ Date: Fri Mar 23 23:41:36 2007 -0700
Conflicts:
- randr/randrstr.h
- randr/rrcrtc.c
+ randr/randrstr.h
+ randr/rrcrtc.c
I think master and server-1.3-branch are more in sync now.
@@ -140146,7 +150171,7 @@ Date: Mon Mar 19 16:11:01 2007 +1030
by the evdev driver).
commit 015d728bcde5b16a72a976579755421e3023626b
-Merge: 65b0eb6 b167583
+Merge: 65b0eb60b0 b167583fe2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 19 09:42:56 2007 +1030
@@ -140154,9 +150179,9 @@ Date: Mon Mar 19 09:42:56 2007 +1030
Conflicts:
- dix/devices.c
- dix/events.c
- mi/misprite.c
+ dix/devices.c
+ dix/events.c
+ mi/misprite.c
commit 720f302d241e88e6e9f2962207da1aa9a79728b7
Author: Keith Packard <keithp@neko.keithp.com>
@@ -140224,7 +150249,7 @@ Date: Sun Feb 18 23:49:38 2007 -0800
Conflicts:
- randr/randrstr.h
+ randr/randrstr.h
Updated code to work in master with recent security API changes.
@@ -140453,7 +150478,7 @@ Date: Wed Mar 7 09:57:02 2007 -0500
devPrivates rework: move reset functions into a single call.
commit bb111291d854b4329e47367ce3c67e8a2785e6e9
-Merge: 74175e0 e9bfb2b
+Merge: 74175e0af7 e9bfb2b3d7
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Mar 7 09:03:46 2007 -0500
@@ -140525,7 +150550,7 @@ Date: Tue Mar 6 11:09:30 2007 -0800
updated todo list
commit 81d581e655fc989da3be4256b83849a63b8607b7
-Merge: a05ffca d5aba03
+Merge: a05ffca8dd d5aba03fef
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 10:37:29 2007 -0800
@@ -140556,7 +150581,7 @@ Date: Tue Mar 6 02:31:59 2007 -0800
moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it
commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e
-Merge: ec1ef8a 9b6bb06
+Merge: ec1ef8a56d 9b6bb06f13
Author: Ben Byer <bbyer@bbyer.(none)>
Date: Tue Mar 6 01:04:50 2007 -0800
@@ -140631,7 +150656,7 @@ Date: Mon Mar 5 12:34:37 2007 -0500
devPrivates rework: remove some debugging code from dixFreePrivates.
commit 23fc429aad5b2721911862617772c314e1036bb0
-Merge: e684824 fe7b8f4
+Merge: e684824709 fe7b8f4237
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Mar 5 12:18:54 2007 -0500
@@ -140677,7 +150702,7 @@ Date: Mon Feb 26 09:40:00 2007 +1100
modes: add commit/prepare hooks
commit 1f0075786fedde538a95e2f39681052e25021d88
-Merge: 57aa5e9 12175b6
+Merge: 57aa5e908d 12175b668a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Mar 5 12:37:17 2007 +1030
@@ -140685,11 +150710,11 @@ Date: Mon Mar 5 12:37:17 2007 +1030
Conflicts:
- configure.ac
- dix/getevents.c
- hw/xfree86/ramdac/xf86Cursor.c
- mi/mipointer.c
- xkb/xkbUtils.c
+ configure.ac
+ dix/getevents.c
+ hw/xfree86/ramdac/xf86Cursor.c
+ mi/mipointer.c
+ xkb/xkbUtils.c
commit 06b01186f6ae17aafdd1f628c306466ddea9e065
Author: Keith Packard <keithp@neko.keithp.com>
@@ -140878,7 +150903,7 @@ Date: Wed Feb 28 15:43:06 2007 +1030
between coordinates stored in device and coordinates sent by the event.
commit d9bcb22d199e8444b9762a35754e04d327dd5915
-Merge: 272d934 c16343a
+Merge: 272d9341d0 c16343ac2c
Author: Ben Byer <bbyer@bbyer.apple.com>
Date: Tue Feb 27 16:28:20 2007 -0800
@@ -140998,9 +151023,9 @@ commit 4b8b0e377a27ec904b2028c89aed11c6416af26c
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Feb 22 20:00:59 2007 +1030
- Xi: Add access control request handling.
+ Xi: Add access control request handling.
- dix: New file access.c to handle all access control for devices.
+ dix: New file access.c to handle all access control for devices.
commit 9a3eb0357e779d5d5f76858f23667956c4c5d721
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
@@ -141303,14 +151328,14 @@ Date: Thu Feb 15 17:07:42 2007 +0200
http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446
commit f452507ca9209598401d15da0039aaa4e1fed1a3
-Merge: 0463283 8116757
+Merge: 04632835b7 811675733e
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 09:47:20 2007 -0500
Merge branch 'master' into my-XACE-SELINUX
commit 04632835b7402456fdcf6c8fa01970cd2804e27c
-Merge: 88f89b9 9ecf79c
+Merge: 88f89b9ac1 9ecf79ca01
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Feb 15 09:27:05 2007 -0500
@@ -141358,7 +151383,7 @@ Date: Wed Feb 14 17:09:33 2007 +1030
fix: WarpCursor needs to send MotionNotify.
commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a
-Merge: e540d57 d570ff7
+Merge: e540d572c5 d570ff7c81
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Feb 14 15:39:52 2007 -0800
@@ -141422,7 +151447,7 @@ Date: Mon Feb 12 17:18:29 2007 -0500
Remove spurious LIBADD from xf4bpp
commit 16eb7254f861465f988ae3861ac3449c2c966062
-Merge: 3814862 c4b7e9d
+Merge: 3814862a86 c4b7e9d1c1
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Feb 9 12:38:49 2007 -0800
@@ -141484,7 +151509,7 @@ Date: Mon Feb 5 14:48:48 2007 +1030
dix: If POINTER_CORE_ONLY is set, GetPointerEvents() only creates a core event
- mi: fix: Create motion event in miPointerMoved
+ mi: fix: Create motion event in miPointerMoved
commit 760a38c4c7ab66ae653d3acb92f5cda4bd44edd6
Author: Daniel Stone <daniel@fooishbar.org>
@@ -141509,9 +151534,9 @@ commit a309c936bb79e2fea04a96ce33c7da99ed902484
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Feb 5 11:38:44 2007 +1030
- xkb: Daniel's patch to stop evdev keyboard segfaults.
+ xkb: Daniel's patch to stop evdev keyboard segfaults.
- mi: Remove quickfix from ba547d4f6a2707f51f0d826389d2d418fb62367a
+ mi: Remove quickfix from ba547d4f6a2707f51f0d826389d2d418fb62367a
commit 236f04b638e7d4d1656c6bedd8a6e8d7cec285ec
Author: Dave Airlie <airlied@linux.ie>
@@ -141601,7 +151626,7 @@ Date: Mon Jan 29 17:30:59 2007 -0800
Typical results were failure to sync, and a black screen.
commit 3814862a869ee83d307eb01225d5949039f435d8
-Merge: a216de9 31f2d4a
+Merge: a216de9b7f 31f2d4a57e
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 29 15:14:31 2007 -0800
@@ -141609,7 +151634,7 @@ Date: Mon Jan 29 15:14:31 2007 -0800
Conflicts:
- hw/xfree86/os-support/bus/linuxPci.c
+ hw/xfree86/os-support/bus/linuxPci.c
commit 31f2d4a57e04f5ea635fbb50c508405c4fc37b65
Author: Eric Anholt <eric@anholt.net>
@@ -141628,12 +151653,12 @@ commit 4aaaa70d1b52346213fad46777c006a93c4ece5d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Jan 29 18:23:24 2007 +1030
- Xi: Adding ChangePointerKeyboardPairing request
- Adding PointerKeyboardPairingChanged event
- Correct error values for XWarpDevicePointer
+ Xi: Adding ChangePointerKeyboardPairing request
+ Adding PointerKeyboardPairingChanged event
+ Correct error values for XWarpDevicePointer
- dix: Adding device argument to SendMappingNotify
- Adding spriteOwner flag to devices
+ dix: Adding device argument to SendMappingNotify
+ Adding spriteOwner flag to devices
commit f3418b52dcf2ab4982504856ab9fae3e726ee6d2
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -141642,7 +151667,7 @@ Date: Mon Jan 29 16:10:03 2007 +1030
mi: Fix cursor rendering issues.
commit 15a81b6325d359990017b8e9f17ce18a7eff1354
-Merge: 3759254 cc3d66d
+Merge: 3759254c09 cc3d66d4a5
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 28 17:18:57 2007 +1030
@@ -141655,7 +151680,7 @@ Date: Wed Nov 15 17:50:02 2006 +1030
o fix minor error in comment for GetPointerEvents()
commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9
-Merge: ba547d4 ca5ebe3
+Merge: ba547d4f6a ca5ebe3971
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jan 28 17:05:55 2007 +1030
@@ -141674,7 +151699,7 @@ Date: Fri Jan 26 13:00:45 2007 +0100
Xorg #9692
commit a216de9b7ff55e2b73c487d037f248f00bd2e63b
-Merge: 24506ea cf7ca9d
+Merge: 24506ea65b cf7ca9d09c
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 25 10:17:32 2007 -0800
@@ -141709,7 +151734,7 @@ Date: Wed Jan 24 15:33:49 2007 -0800
read_legcay_BIOS, and delete all remnants of it from all other places.
commit fdb3a0798f0d17e72ec7293d59a7a81b5ffdf95b
-Merge: 39b51e1 a53586e
+Merge: 39b51e1bfc a53586eebc
Author: Ian Romanick <idr@us.ibm.com>
Date: Wed Jan 24 14:49:39 2007 -0800
@@ -141737,7 +151762,7 @@ Date: Thu Jan 25 00:29:20 2007 +0800
Make Xinearama screen information reflect CRTC rotation.
commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa
-Merge: 637b19b 788cfce
+Merge: 637b19b3ee 788cfce911
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 23 13:25:56 2007 -0800
@@ -141779,7 +151804,7 @@ Date: Mon Jan 22 09:13:59 2007 -0800
ARCH_PCI_OS_INIT mechanism useless. Remove it.
commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f
-Merge: c279d5f 2dc8662
+Merge: c279d5fdc5 2dc866252c
Author: Ian Romanick <idr@us.ibm.com>
Date: Mon Jan 22 08:44:36 2007 -0800
@@ -141817,7 +151842,7 @@ Date: Fri Jan 19 14:52:23 2007 -0800
-ardelay and -arinterval, respectively.
commit c279d5fdc53612a90f33fafe9e9c59ced008dd51
-Merge: 88f248e 14d6a9b
+Merge: 88f248e671 14d6a9b327
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Jan 19 12:59:54 2007 -0800
@@ -142074,8 +152099,8 @@ commit 5e2f8dee6331645fcbd2734c43698eb4f9c5b116
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jan 11 14:05:39 2007 +1030
- mi: remove core pointer special handling. No event has core pointer as
- device now.
+ mi: remove core pointer special handling. No event has core pointer as
+ device now.
dix: zero pSprite memory, stop segfaults on server restart.
@@ -142100,8 +152125,8 @@ Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jan 10 14:52:13 2007 +1030
Xi: add missing call for SProcXChangeDeviceCursor
- add DeviceEnterNotify and DeviceLeaveNotify
- fix: QueryDevicePointer crashed if called with keyboard device
+ add DeviceEnterNotify and DeviceLeaveNotify
+ fix: QueryDevicePointer crashed if called with keyboard device
commit 6a2fb2928714ce77ee342cdc23a1178e5e766cf2
Author: Eric Anholt <eric@anholt.net>
@@ -142110,7 +152135,7 @@ Date: Tue Jan 9 16:34:40 2007 -0800
Track rename of DamagePost -> DamageAdd.
commit da09964a931cc64d05ab571bf545fdad35a6d395
-Merge: e1f73d2 e3aa6ad
+Merge: e1f73d2208 e3aa6ad201
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Jan 9 15:27:34 2007 -0800
@@ -142118,7 +152143,7 @@ Date: Tue Jan 9 15:27:34 2007 -0800
Conflicts:
- hw/xfree86/int10/generic.c
+ hw/xfree86/int10/generic.c
commit e3aa6ad201eb20862c11c000e76206e317a96dc9
Author: Matthieu Herrb <matthieu@blues.laas.fr>
@@ -142195,7 +152220,7 @@ Date: Thu Jan 4 15:37:33 2007 -0800
Incorporate new byte-order related configure changes.
commit 8dd5771a1b91c331860b667fb18e484452000aad
-Merge: 45aa26c 7d2ec92
+Merge: 45aa26ccb4 7d2ec92170
Author: Ian Romanick <idr@us.ibm.com>
Date: Thu Jan 4 15:01:38 2007 -0800
@@ -142203,8 +152228,8 @@ Date: Thu Jan 4 15:01:38 2007 -0800
Conflicts:
- GL/glx/indirect_dispatch_swap.c
- GL/glx/swap_interval.c
+ GL/glx/indirect_dispatch_swap.c
+ GL/glx/swap_interval.c
commit 45aa26ccb4f61c2919ce2475d0907c6e1b177da2
Author: Ian Romanick <idr@us.ibm.com>
@@ -142361,7 +152386,7 @@ Date: Thu Dec 28 13:15:11 2006 -0800
Export exaMove{In,Out}Pixmap().
commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b
-Merge: 05f9150 9563b2e
+Merge: 05f915050c 9563b2eea2
Author: Eric Anholt <eric@anholt.net>
Date: Wed Dec 27 16:11:31 2006 -0800
@@ -142402,7 +152427,7 @@ Date: Sat Dec 9 22:51:59 2006 +0200
Make sure we're not copying sym_interpret across from an empty source.
commit 43a4376bd72ef1b6486cddb60ad57b2d6169292a
-Merge: 4b1c9ac d9e079d
+Merge: 4b1c9ac3d1 d9e079d2a3
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Dec 22 13:53:55 2006 -0500
@@ -142452,10 +152477,10 @@ Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Dec 20 13:05:53 2006 +1030
xfree86: Changing "IsMPDevice" to "SharedPointer" option. Devices will default
- to MP devices.
+ to MP devices.
- Xi: Adding QueryDevicePointer request/reply
- Adding WarpDevicePointer request/reply
+ Xi: Adding QueryDevicePointer request/reply
+ Adding WarpDevicePointer request/reply
commit e437f357b6850a6c87ca6696870b3abd40e5b8ed
Author: Alan Coopersmith <alan.coopersmith@sun.com>
@@ -142464,7 +152489,7 @@ Date: Tue Dec 19 16:38:34 2006 -0800
xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA"
commit a81dbaae0597492f0245080c6f5af7158e05e2d0
-Merge: fb6d676 d442998
+Merge: fb6d676de5 d442998e39
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 19 16:11:19 2006 -0500
@@ -142504,7 +152529,7 @@ Date: Tue Dec 19 18:45:25 2006 +0100
This affects drivers with no UploadToScreen or UploadToScreen failures.
commit 4334860e69e7d5b156082bd05c7a86708e5bad4c
-Merge: 7e47176 fdcc22c
+Merge: 7e4717683d fdcc22ca17
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Dec 19 16:29:26 2006 +0100
@@ -142512,8 +152537,8 @@ Date: Tue Dec 19 16:29:26 2006 +0100
Conflicts:
- exa/exa_accel.c
- exa/exa_migration.c
+ exa/exa_accel.c
+ exa/exa_migration.c
commit fdcc22ca1704d3519156c66804528c21b04fea65
Author: Michel Dänzer <michel@tungstengraphics.com>
@@ -142539,14 +152564,14 @@ Date: Tue Dec 19 15:24:19 2006 +0100
See https://bugs.freedesktop.org/show_bug.cgi?id=6772 .
commit ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba
-Merge: 4d07b50 1b029fd
+Merge: 4d07b50372 1b029fd896
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 19 10:51:01 2006 +1030
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver
commit 2d0a63126b3d3a17005b7e122617ee0c5f44a55b
-Merge: d8b5394 1b029fd
+Merge: d8b5394eda 1b029fd896
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 19 10:31:40 2006 +1030
@@ -142578,14 +152603,14 @@ Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 18 15:33:54 2006 +1030
mi: removing MPX ifdefs
- global sprite renaming in mipointer and misprite
- fixed: multiple remove cursor call in miSpriteInstallColormap
- fixed: wrong core pointer usage in miSpriteStoreColors
+ global sprite renaming in mipointer and misprite
+ fixed: multiple remove cursor call in miSpriteInstallColormap
+ fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
- removing MPX ifdefs
- removing MPX event generation (using Xi solely now)
- bugfix GrabDevice: uninitialized field in grab struct caused segfault
+ removing MPX ifdefs
+ removing MPX event generation (using Xi solely now)
+ bugfix GrabDevice: uninitialized field in grab struct caused segfault
xfree86: removing MPX fdefs
@@ -142738,13 +152763,13 @@ Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Dec 14 10:50:18 2006 +1030
mi: removing MPX ifdefs
- global sprite renaming in mipointer and misprite
- fixed: multiple remove cursor call in miSpriteInstallColormap
- fixed: wrong core pointer usage in miSpriteStoreColors
+ global sprite renaming in mipointer and misprite
+ fixed: multiple remove cursor call in miSpriteInstallColormap
+ fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
- removing MPX ifdefs
- removing MPX event generation (using Xi solely now)
+ removing MPX ifdefs
+ removing MPX event generation (using Xi solely now)
commit b88ad820fac81d0dfd557a384bf0406e8893e7af
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
@@ -142773,7 +152798,7 @@ Date: Tue Dec 12 15:59:08 2006 -0500
Split AssignClientState() into two routines, new routine is server-specific.
commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6
-Merge: e124806 f3c6090
+Merge: e124806994 f3c60900e5
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Dec 12 13:54:33 2006 -0500
@@ -142865,8 +152890,8 @@ Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Dec 11 18:09:59 2006 +1030
dix: Moving SpriteRec into DeviceIntRec
- removing global sprite structure
- beginning to remove MPX ifdefs
+ removing global sprite structure
+ beginning to remove MPX ifdefs
xnest: Fix to make xnest compile again
@@ -142877,7 +152902,7 @@ Date: Sun Dec 10 11:24:05 2006 -0500
Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible.
commit e1f73d220873fa091695e46b7fcd008663a95a6f
-Merge: 27d682f d56249a
+Merge: 27d682fa03 d56249a15e
Author: Ian Romanick <idr@us.ibm.com>
Date: Fri Dec 8 17:24:15 2006 -0800
@@ -142885,19 +152910,19 @@ Date: Fri Dec 8 17:24:15 2006 -0800
Conflicts:
- hw/xfree86/common/xf86Configure.c
- hw/xfree86/common/xf86Helper.c
- hw/xfree86/common/xf86pciBus.c
- hw/xfree86/int10/helper_exec.c
- hw/xfree86/os-support/bus/Pci.c
- hw/xfree86/os-support/bus/linuxPci.c
- hw/xfree86/os-support/linux/lnx_pci.c
- hw/xfree86/scanpci/Makefile.am
- hw/xfree86/utils/pcitweak/Makefile.am
- hw/xfree86/utils/scanpci/Makefile.am
+ hw/xfree86/common/xf86Configure.c
+ hw/xfree86/common/xf86Helper.c
+ hw/xfree86/common/xf86pciBus.c
+ hw/xfree86/int10/helper_exec.c
+ hw/xfree86/os-support/bus/Pci.c
+ hw/xfree86/os-support/bus/linuxPci.c
+ hw/xfree86/os-support/linux/lnx_pci.c
+ hw/xfree86/scanpci/Makefile.am
+ hw/xfree86/utils/pcitweak/Makefile.am
+ hw/xfree86/utils/scanpci/Makefile.am
commit d56249a15ead51ad4d2117d5538ada24af05b693
-Merge: f1f8df1 ec84f72
+Merge: f1f8df1889 ec84f72d07
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Fri Dec 8 15:52:37 2006 -0600
@@ -143059,7 +153084,7 @@ Date: Tue Dec 5 18:50:19 2006 +1030
Ironing some glitches caused by the merge
commit 3c8f166022a2d19af14eb670fa382503ba1451cd
-Merge: 2a51149 f9f7d7f
+Merge: 2a511492f9 f9f7d7f3be
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Dec 5 18:28:33 2006 +1030
@@ -143067,7 +153092,7 @@ Date: Tue Dec 5 18:28:33 2006 +1030
Conflicts:
- dix/events.c
+ dix/events.c
commit 2a511492f9a235d3f5390ab87b6c643cbea92d88
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -143076,8 +153101,8 @@ Date: Tue Dec 5 15:45:18 2006 +1030
Xi: adding MPX checks to ProcessOtherEvents
mpx: adding QueryPointer request and reply
- adjusting names of requests to Xlib compatible naming (xMPX*** instead of
- mpx***)
+ adjusting names of requests to Xlib compatible naming (xMPX*** instead of
+ mpx***)
commit f9f7d7f3be53c808abb5eaceb7a1abc55744a210
Author: Alan Coopersmith <alan.coopersmith@sun.com>
@@ -143131,16 +153156,16 @@ Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri Dec 1 15:56:52 2006 +1030
mpx: SelectEvents and GetEventBase requests.
- Some renaming and cleaning up in extinit.c
- MPXLastEvent added
+ Some renaming and cleaning up in extinit.c
+ MPXLastEvent added
- Xi: ShouldFreeInputMask() from XI is not static any more, used in mpx
+ Xi: ShouldFreeInputMask() from XI is not static any more, used in mpx
- dix: GetPointerEvents() allocates MPX event for MPX devices.
- DeliverDeviceEvents() caters for MPX devices.
+ dix: GetPointerEvents() allocates MPX event for MPX devices.
+ DeliverDeviceEvents() caters for MPX devices.
commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0
-Merge: 9423ac1 82912ad
+Merge: 9423ac134a 82912ad770
Author: Drew Parsons <drew@pug.localdomain>
Date: Fri Dec 1 15:21:57 2006 +1100
@@ -143179,7 +153204,7 @@ Date: Wed Nov 29 22:19:57 2006 -0500
Add required root window context to config file.
commit 143558500a89a5c887c75c03798bae68c953cac9
-Merge: e3d3d29 ee9bdd3
+Merge: e3d3d29db5 ee9bdd3f4a
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Nov 29 20:41:41 2006 -0500
@@ -143288,9 +153313,9 @@ commit bdf718907b3202815a04ec28a868689708f43da9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 28 18:06:34 2006 +1030
- dix: missing parameter to SetCursorPosition in CheckMotion ifndef MPX
+ dix: missing parameter to SetCursorPosition in CheckMotion ifndef MPX
- mi: missing include in misprite.c ifndef MPX
+ mi: missing include in misprite.c ifndef MPX
commit e88bc0e55a6937ff0b47fe38f60bfa8991196578
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -143313,7 +153338,7 @@ Date: Mon Nov 27 16:21:31 2006 -0800
Move mode handling helpers from ddcProperty.c to xf86Mode.c.
commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618
-Merge: 64de3ba d6cd031
+Merge: 64de3baf85 d6cd0313c7
Author: Eric Anholt <eric@anholt.net>
Date: Mon Nov 27 15:43:15 2006 -0800
@@ -143321,12 +153346,12 @@ Date: Mon Nov 27 15:43:15 2006 -0800
Conflicts:
- dix/events.c
- dix/getevents.c
- hw/xfree86/common/xf86Mode.c
- hw/xfree86/dri/Makefile.am
- hw/xfree86/os-support/drm/xf86drm.c
- hw/xfree86/os-support/xf86drm.h
+ dix/events.c
+ dix/getevents.c
+ hw/xfree86/common/xf86Mode.c
+ hw/xfree86/dri/Makefile.am
+ hw/xfree86/os-support/drm/xf86drm.c
+ hw/xfree86/os-support/xf86drm.h
commit d6cd0313c7f23f32c9c7dda00ff739e772bf7db3
Author: Eric Anholt <eric@anholt.net>
@@ -143343,49 +153368,49 @@ Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 18:07:16 2006 +1030
mi: malloc checks for misprite and midispcur, code cleanup
- removed IsMPDev()
+ removed IsMPDev()
commit 023da4e804ad260eaf0c50d2ec7213dd514e2113
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 15:54:33 2006 +1030
mi: mipointer.c cleanup, reducing code duplication, using MPHasCursor()
- instead of IsMPDev()
+ instead of IsMPDev()
commit a2340a73687dfd93affb6de28a33d73fd808c96b
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon Nov 27 14:47:23 2006 +1030
mi: free allocated memory in miDCCloseScreen and in miDCInitialize in case
- of errors.
- Some copyright notices.
- misprite.c passes DeviceIntPtr around and down to DC (previously
- miCursorInfoPtr and the plain device id).
- Large cleanup in misprite.c to avoid code duplication.
+ of errors.
+ Some copyright notices.
+ misprite.c passes DeviceIntPtr around and down to DC (previously
+ miCursorInfoPtr and the plain device id).
+ Large cleanup in misprite.c to avoid code duplication.
commit 1c7568b8a1417257fa67c7fca69aa253099b9461
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Nov 23 17:15:14 2006 +1030
- mi: closing memory leak, miPointer is freed in miPointerCloseScreen
- bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
- adding DeviceIntPtr parameter to ScreenRec's cursor functions.
- cleanup of miPointer code to use same scheme in each function
+ mi: closing memory leak, miPointer is freed in miPointerCloseScreen
+ bugfix: uninitialized pPointer in miPointerGetPosition ifndef MPX
+ adding DeviceIntPtr parameter to ScreenRec's cursor functions.
+ cleanup of miPointer code to use same scheme in each function
- dix: MPHasCursor() function determines checking whether to invoke
- cursor rendering.
+ dix: MPHasCursor() function determines checking whether to invoke
+ cursor rendering.
animcur: adding DeviceIntPtr parameter to cursor functions but animcur relies
- on the core pointer right now.
+ on the core pointer right now.
xfixes: adding DeviceIntPtr parameter to cursor functions but xfixes relies on
- the core pointer right now.
+ the core pointer right now.
- rac: adding DeviceIntPtr parameter to cursor functions but RAC relies on
- the core pointer right now.
+ rac: adding DeviceIntPtr parameter to cursor functions but RAC relies on
+ the core pointer right now.
- ramdac: adding DeviceIntPtr parameter to cursor functions but ramdac relies on
- the core pointer right now.
+ ramdac: adding DeviceIntPtr parameter to cursor functions but ramdac relies on
+ the core pointer right now.
commit 64de3baf85f6df274f71f736016f0848567cd9f6
Author: Aaron Plattner <aplattner@nvidia.com>
@@ -143422,7 +153447,7 @@ commit f52d53e060d0468b658a565688d1f92c156405c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 17:58:57 2006 +1030
- dix: DeliverEventsToWindow adjusted for MPX
+ dix: DeliverEventsToWindow adjusted for MPX
mi: sprite debugging disabled
@@ -143430,10 +153455,10 @@ commit 8c16f21d5df08b028e93440d632939a5fdbf5876
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Nov 22 17:06:47 2006 +1030
- dix GetSpriteWindow() adjusted for MPX
- added device dependency for MPX to DoEnterLeaveEvents,
- EnterLeaveEvents, EnterNotifies, LeaveNotifies and
- FixUpEventFromWindow.
+ dix GetSpriteWindow() adjusted for MPX
+ added device dependency for MPX to DoEnterLeaveEvents,
+ EnterLeaveEvents, EnterNotifies, LeaveNotifies and
+ FixUpEventFromWindow.
commit 70383105de279df553874efa56b37a7b3e426ea1
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -143446,7 +153471,7 @@ Date: Wed Nov 22 15:27:16 2006 +1030
events.c (XineramaChangeToCursor, XineramaCheckPhysLimits,
XineramaConstrainCursor)
- Xi: fix: accessing other->buttons for keyboard segfaulted the server
+ Xi: fix: accessing other->buttons for keyboard segfaulted the server
commit 33ff4cec5ff7533ec725f71d357c096dfb0acb79
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
@@ -143460,27 +153485,27 @@ commit efd4f3c6ffec804c68ba5df17cc117da264fb7c4
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 20:31:30 2006 +1030
- dix: WindowsRestructured() calls CheckMotion() on all devices
+ dix: WindowsRestructured() calls CheckMotion() on all devices
- mi: core pointer was checked twice in miSpriteReportDamage,
- miSpriteInstallColormap, miSpriteStoreColors, miSpriteSaveDoomedAreas
- and miSpriteRealiseCursor
- using damage bug (see comment in file) to avoid artefacts
+ mi: core pointer was checked twice in miSpriteReportDamage,
+ miSpriteInstallColormap, miSpriteStoreColors, miSpriteSaveDoomedAreas
+ and miSpriteRealiseCursor
+ using damage bug (see comment in file) to avoid artefacts
commit 9db851c22d4befb95bfb074b96620261d8e32ac9
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 18:15:04 2006 +1030
dix: moved sprite from static to be pointer of type SpritePtr
- added SpriteRecs for MPX devices
- changed sprite dependency and added MPX functionality to parts
- of events.c (ConfineToShape, PostNewCursor, XineramaCheckMotion,
- CheckMotion, XineramaChangeToCursor, ChangeToCursor, CheckPhysLimits,
- PointerConfinedToScreen)
- added DeviceIntRec param to GetSpritePosition(). This required some
- minor changes in ddx, xtest, xkb and xfixes.
+ added SpriteRecs for MPX devices
+ changed sprite dependency and added MPX functionality to parts
+ of events.c (ConfineToShape, PostNewCursor, XineramaCheckMotion,
+ CheckMotion, XineramaChangeToCursor, ChangeToCursor, CheckPhysLimits,
+ PointerConfinedToScreen)
+ added DeviceIntRec param to GetSpritePosition(). This required some
+ minor changes in ddx, xtest, xkb and xfixes.
- mi: changed miPointer to pointer instead of static struct.
+ mi: changed miPointer to pointer instead of static struct.
commit fd8b9a6eaee28a453a00af14195b81ef1890a577
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -143492,7 +153517,7 @@ commit 447efdc01d4f8922205ba26e52c9e5ff9f5cb90e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Nov 21 14:46:00 2006 +1030
- mi: constrain MPX cursors to screen
+ mi: constrain MPX cursors to screen
commit 1107d8bea22eea26f7b666f1c00a53360b7d237e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
@@ -143532,7 +153557,7 @@ Date: Mon Nov 20 13:10:07 2006 +1030
bugfix in mipointer, semicolon after preprocessor statement
commit ca2874b273232d9f51881b1cd754ed6847bfaf47
-Merge: c9a5f9d e2f6dac
+Merge: c9a5f9d391 e2f6dacc73
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Sat Nov 18 19:56:32 2006 +0000
@@ -143705,7 +153730,7 @@ Date: Tue Nov 14 15:33:07 2006 +0100
Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL.
commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf
-Merge: 6facd95 f80a8ae
+Merge: 6facd958c2 f80a8ae6e6
Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
Date: Mon Nov 13 20:32:26 2006 -0600
@@ -144029,7 +154054,7 @@ Date: Tue Nov 7 15:48:05 2006 -0800
A couple more cases of error message before freeing strings.
commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58
-Merge: 3e7e0e3 46af6d1
+Merge: 3e7e0e3509 46af6d1e95
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Tue Nov 7 18:42:54 2006 -0500
@@ -144075,7 +154100,7 @@ Date: Tue Nov 7 01:29:51 2006 -0800
getevents.c
commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8
-Merge: 028bbdc 3d39c02
+Merge: 028bbdc041 3d39c02fe6
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Nov 7 01:21:28 2006 -0800
@@ -144114,14 +154139,14 @@ Date: Mon Nov 6 00:30:09 2006 +0100
Fix typo in Xvesa: incorrect reporting of DAC capabilities.
commit 028bbdc0417173803695808ba9f48498519273a3
-Merge: 50504c6 8deaaa3
+Merge: 50504c68e1 8deaaa312a
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:46:26 2006 -0800
Merge master back to randr-1.2
commit 50504c68e1d407232cf83465981b235e542ef31f
-Merge: 8b87ce1 cde8806
+Merge: 8b87ce1974 cde8806c29
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Nov 4 17:43:19 2006 -0800
@@ -144201,7 +154226,7 @@ Date: Fri Oct 27 12:36:56 2006 -0700
and 1024x768@75 modes.
commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4
-Merge: 49a2668 bd0c829
+Merge: 49a26681b2 bd0c829654
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Nov 3 12:54:56 2006 -0800
@@ -144314,7 +154339,7 @@ Date: Thu Nov 2 12:25:03 2006 +0100
Build with -D_PC on ix86 only.
commit 543b397277d1f03b8091e44812010abcd5d80102
-Merge: 4056e6e 645d057
+Merge: 4056e6e79a 645d057620
Author: Keith Packard <keithp@neko.keithp.com>
Date: Thu Nov 2 19:00:35 2006 -0800
@@ -144385,14 +154410,14 @@ Date: Thu Nov 2 03:22:09 2006 +0200
bump to 1.2.99.0
commit 18c246a13b887b865de6a17e6cd1c259b9bc383d
-Merge: 794f2e7 4843d82
+Merge: 794f2e7291 4843d823f4
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:21:37 2006 +0200
Merge branch 'input-hotplug'
commit 4843d823f4d38d8bd468ce3a8feddbff229ed416
-Merge: ba9f513 a7b944f
+Merge: ba9f5138fc a7b944f0d9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:18:13 2006 +0200
@@ -144408,7 +154433,7 @@ Date: Thu Nov 2 03:16:10 2006 +0200
config file.
commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9
-Merge: a2d6242 6fdfd9d
+Merge: a2d6242106 6fdfd9dad9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 2 03:15:25 2006 +0200
@@ -144525,7 +154550,7 @@ Date: Sun Oct 29 17:49:46 2006 +0100
kill GNU-make'ism.
commit 0107320fac0913aae2cb169992e31c670b4bd2f7
-Merge: 06b6b97 a34446f
+Merge: 06b6b971d0 a34446f5b3
Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Sun Oct 29 15:23:35 2006 +0100
@@ -144596,7 +154621,7 @@ Date: Fri Oct 27 18:26:30 2006 +0200
Import libdrm functions for the drm memory manager.
commit e3d3d29db5eef057b4e8294377c9c3147436bc2f
-Merge: 92387e9 004d00e
+Merge: 92387e99d0 004d00e668
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu Oct 26 20:21:16 2006 -0400
@@ -144647,7 +154672,7 @@ Date: Thu Oct 26 20:38:58 2006 +0300
lnx_ia64.c.
commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e
-Merge: cdc8a4b 004d00e
+Merge: cdc8a4b7b2 004d00e668
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 15:21:22 2006 +0300
@@ -144665,7 +154690,7 @@ Date: Thu Oct 26 01:10:08 2006 +0300
The fallthrough to gettimeofday() is preserved.
commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a
-Merge: 3da918a d285833
+Merge: 3da918a16c d285833290
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 26 00:28:30 2006 +0300
@@ -144706,14 +154731,14 @@ Date: Wed Oct 25 11:39:27 2006 +0200
without pretending it's always on.
commit 59511974db843fa7e11133894cfc10c20fdaf60f
-Merge: 054f8cd 598ac7a
+Merge: 054f8cd267 598ac7a836
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:26:20 2006 -0700
Merge branch 'master' into randr-1.2
commit 598ac7a83698327b607084abaebcbd22f8d25fbb
-Merge: 828c34e 948a97b
+Merge: 828c34e83c 948a97b97e
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Oct 24 17:23:12 2006 -0700
@@ -144812,7 +154837,7 @@ Date: Tue Oct 24 09:04:14 2006 -0700
Fix from HEAD accidentally reverted during merge.
commit 8b909135664abb69ada522e8e39495d9eca717ac
-Merge: 21291d6 948a97b
+Merge: 21291d6ca7 948a97b97e
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Oct 24 08:57:59 2006 -0700
@@ -144820,14 +154845,14 @@ Date: Tue Oct 24 08:57:59 2006 -0700
Conflicts:
- hw/xfree86/Makefile.am
- hw/xfree86/common/xf86.h
- hw/xfree86/common/xf86DoScanPci.c
- hw/xfree86/os-support/bus/linuxPci.c
- hw/xfree86/scanpci/extrapci.ids
- hw/xfree86/scanpci/pci.ids
- hw/xfree86/scanpci/pciid2c.pl
- hw/xfree86/scanpci/xf86PciStdIds.h
+ hw/xfree86/Makefile.am
+ hw/xfree86/common/xf86.h
+ hw/xfree86/common/xf86DoScanPci.c
+ hw/xfree86/os-support/bus/linuxPci.c
+ hw/xfree86/scanpci/extrapci.ids
+ hw/xfree86/scanpci/pci.ids
+ hw/xfree86/scanpci/pciid2c.pl
+ hw/xfree86/scanpci/xf86PciStdIds.h
commit 0cd6a3d8efb5cc1ce4f85ab95bcdf4fb66c7245d
Author: Daniel Stone <daniel@fooishbar.org>
@@ -144869,7 +154894,7 @@ Date: Mon Oct 23 05:12:15 2006 +0300
Remove unused xf86CheckButton.
commit c5b5b046e86b159a9d32451308f38246cc4587f7
-Merge: fab1d37 948a97b
+Merge: fab1d37ecb 948a97b97e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 23 02:58:30 2006 +0300
@@ -145055,7 +155080,7 @@ Date: Sat Oct 21 22:06:43 2006 +1000
Minor typos in Xserver man page.
commit e26a494f417c3c700636ee68892c3015b2e0f27a
-Merge: 736b0d5 aeba855
+Merge: 736b0d5078 aeba855b07
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sat Oct 21 04:26:14 2006 -0400
@@ -145369,7 +155394,7 @@ Date: Fri Oct 13 17:34:53 2006 -0700
Separate configuration from layout changes to send correct events.
commit 335b503c5e7041bb0c44611e496d1c46f554e630
-Merge: bd3d93b cf948b7
+Merge: bd3d93be82 cf948b7b04
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Oct 13 18:10:45 2006 +0300
@@ -145383,7 +155408,7 @@ Date: Fri Oct 13 14:48:10 2006 +0100
to avoid cursor movements signalling io.
commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6
-Merge: 23f6f08 042d4a4
+Merge: 23f6f08b7b 042d4a407d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Oct 11 20:50:31 2006 -0400
@@ -145597,7 +155622,7 @@ Date: Sat Oct 7 14:16:51 2006 +0300
layer.
commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db
-Merge: 8382234 49a70c8
+Merge: 8382234a7f 49a70c8570
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Oct 6 18:01:13 2006 -0700
@@ -145650,14 +155675,14 @@ Date: Thu Oct 5 16:07:26 2006 -0400
Improve error handling, messages during initialization.
commit de63a469dcd0a8ae98554bca540ac0106cccf2a5
-Merge: 9c7440b 8382234
+Merge: 9c7440bdf5 8382234a7f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Oct 5 20:29:19 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b
-Merge: c4f30c6 8382234
+Merge: c4f30c6353 8382234a7f
Author: Keith Packard <keithp@neko.keithp.com>
Date: Wed Oct 4 14:46:04 2006 -0700
@@ -145693,7 +155718,7 @@ Date: Tue Oct 3 17:48:50 2006 -0700
Don't insert RCS tag into generated pci id header files
commit 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343
-Merge: 6926776 20c0cee
+Merge: 6926776f0e 20c0ceedfb
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Oct 3 13:58:03 2006 -0400
@@ -145727,7 +155752,7 @@ Date: Mon Oct 2 02:17:14 2006 +0300
Use XkbCharToInt as that's what we're doing.
commit 3c98cebb6e954855528794fec46830f456cbdec1
-Merge: fa1ac94 2cf1098
+Merge: fa1ac94178 2cf1098436
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Oct 2 02:18:17 2006 +0300
@@ -145755,21 +155780,21 @@ Date: Sat Sep 30 17:05:46 2006 +0300
if built with --enable-debug.
commit 20c0ceedfbce9ae5c70703900b52973917ac4cd0
-Merge: 49a70c8 84eb2c0
+Merge: 49a70c8570 84eb2c0a06
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 29 15:37:00 2006 -0400
Merge branch 'master' into my-XACE-modular
commit 518db35ca3f569e7cb95dbddeddb93f3691de498
-Merge: 5d99e05 84eb2c0
+Merge: 5d99e05f05 84eb2c0a06
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:35:21 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit 5d99e05f05a42a82a9f02844df9bfebaa673759d
-Merge: ad631af 5893375
+Merge: ad631afcf3 5893375786
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Sep 29 00:35:07 2006 +0300
@@ -145793,7 +155818,7 @@ Date: Thu Sep 28 15:09:40 2006 -0600
Patch by Dan Nicholson.
commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145
-Merge: cf6e968 f9542e7
+Merge: cf6e9687ff f9542e7495
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Thu Sep 28 13:27:13 2006 -0700
@@ -145833,7 +155858,7 @@ Date: Wed Aug 30 19:12:17 2006 +0200
Add wrapper for new ioctl to update drawable information in the DRM.
commit ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c
-Merge: 5e9d33f f7c1d94
+Merge: 5e9d33fe87 f7c1d94241
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Sep 24 17:56:43 2006 +0300
@@ -146037,14 +156062,14 @@ Date: Sat Sep 16 03:49:11 2006 -0400
Thanks, automake.
commit 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb
-Merge: 6950267 49a70c8
+Merge: 6950267dd6 49a70c8570
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 15 15:28:13 2006 -0400
Merge branch 'my-XACE-modular' into my-XACE-SELINUX
commit 49a70c8570b03aff8239324a2474918a6fbc52a0
-Merge: d1110c5 05231e3
+Merge: d1110c5c83 05231e336d
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 15 15:26:57 2006 -0400
@@ -146272,7 +156297,7 @@ Date: Sun Sep 10 11:13:18 2006 -0700
so I think we can tolerate the extra #ifdef for the next release.
commit 60db190ecfce52cbfa888c0af3210634f9186bed
-Merge: 5e9d33f 6525610
+Merge: 5e9d33fe87 65256109bb
Author: Zephaniah E. Hull <warp@agamemnon.b5>
Date: Sun Sep 10 03:49:17 2006 -0400
@@ -146284,8 +156309,8 @@ Date: Sun Sep 10 17:40:37 2006 +1000
* Define XPSERVERLIST with `/etc/init.d/xprint get_xpserverlist`
instead of `/bin/sh /etc/init.d/xprint get_xpserverlist`
- - allows the initscript to set its own different shell under #!
- - allows disabling of XPSERVERLIST by making the script non-executable
+ - allows the initscript to set its own different shell under #!
+ - allows disabling of XPSERVERLIST by making the script non-executable
* Allow files to be installed by using dist_*_DATA instead of EXTRA_DIST.
Also, use dist_*_SCRIPTS to install scripts.
* Fix minor typos in man pages.
@@ -146297,7 +156322,7 @@ Date: Fri Sep 8 15:31:18 2006 -0400
Add SELinux extension configure-time support.
commit fb34c02861ab3629c1c85c156e73b158518db7c7
-Merge: 9c503f0 d1110c5
+Merge: 9c503f09ce d1110c5c83
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Sep 8 15:30:12 2006 -0400
@@ -146365,7 +156390,7 @@ Date: Thu Sep 7 15:35:16 2006 -0400
DRI locking between 2D and 3D drivers around VT switch.
commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a
-Merge: 629798c 64479ff
+Merge: 629798c73a 64479fffa2
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Sep 7 15:43:31 2006 +0300
@@ -146417,7 +156442,7 @@ Date: Tue Sep 5 15:23:54 2006 -0700
(unsigned long)(1 << 31) = bad news on x86_64.
commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7
-Merge: 20c4ac6 c281351
+Merge: 20c4ac6e03 c2813514cf
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Sep 5 18:03:25 2006 -0400
@@ -146425,7 +156450,7 @@ Date: Tue Sep 5 18:03:25 2006 -0400
Conflicts:
- configure.ac
+ configure.ac
commit c2813514cf7b1a36caa848cbc2ceef99cf2eb769
Author: Ian Romanick <idr@us.ibm.com>
@@ -146483,7 +156508,7 @@ Date: Tue Aug 29 16:35:32 2006 -0700
appear in the server's string.
commit 1c8851ad491dd02d1c79e620b46384956838ed42
-Merge: d59b52f 5ddbf4b
+Merge: d59b52fc08 5ddbf4bcd4
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 16:34:04 2006 -0700
@@ -146519,7 +156544,7 @@ Date: Tue Aug 29 23:49:26 2006 +0300
Yeah. That was dumb.
commit 942b4369990a255257f66835caf8671432c405a3
-Merge: 77d315b 393dc0a
+Merge: 77d315bd2f 393dc0a338
Author: Ian Romanick <idr@us.ibm.com>
Date: Tue Aug 29 13:30:37 2006 -0700
@@ -146579,7 +156604,7 @@ Date: Tue Aug 29 13:19:12 2006 +0300
couple of range-related thinkos in level name copying.
commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2
-Merge: 8d77d44 ebbdc13
+Merge: 8d77d44fda ebbdc1342a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 29 15:16:01 2006 +0300
@@ -146592,14 +156617,14 @@ Date: Mon Aug 28 18:17:32 2006 -0400
Remove calls to LoaderCheckUnresolved(), since it's now a stub.
commit 8d77d44fda3aacbae62864a3620e09095b79e92d
-Merge: d6f36bd 2fde560
+Merge: d6f36bd280 2fde560bbb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Aug 27 23:08:49 2006 +0300
Merge branch 'origin' into input-hotplug
commit 20c4ac6e038607ebbf6c04639670514c016d8597
-Merge: 13c6713 8d4f21a
+Merge: 13c6713c82 8d4f21ab53
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri Aug 25 18:49:46 2006 -0400
@@ -146632,7 +156657,7 @@ Date: Fri Aug 25 12:05:16 2006 -0700
GL_NV_{vertex,fragment}_program, and related extensions can be enabled.
commit 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9
-Merge: 1a5561c cd2da4e
+Merge: 1a5561c4ec cd2da4e41e
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Aug 25 09:34:21 2006 -0700
@@ -146647,7 +156672,7 @@ Date: Fri Aug 25 12:43:17 2006 +0300
best-effort attempt to keep configs working.
commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709
-Merge: 393f834 cd2da4e
+Merge: 393f8347ed cd2da4e41e
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 25 11:15:33 2006 +0300
@@ -146689,7 +156714,7 @@ Date: Thu Aug 24 17:58:52 2006 -0700
Add some missing bits of GL_SGI_color_table.
commit ae608b2071d882966e9c7ede71f846b1ecec0b23
-Merge: 2c86527 b879356
+Merge: 2c865277fe b879356ce9
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 24 14:56:33 2006 -0700
@@ -146712,7 +156737,7 @@ Date: Thu Aug 24 14:49:46 2006 -0700
Regenerate from gl_API.xml 1.62. Functions move, no real changes.
commit 3a36b0a24aa9e9e238faa7f00100f59800f5142b
-Merge: db1ab1b b879356
+Merge: db1ab1bdb2 b879356ce9
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 23:35:28 2006 +0300
@@ -146750,7 +156775,7 @@ Date: Thu Aug 24 15:50:15 2006 -0400
More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER.
commit 4ed311cf1c29090c53e474a3001c5702ff8409df
-Merge: 73e58ad b29b236
+Merge: 73e58adda9 b29b236d88
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Aug 24 20:17:10 2006 +0200
@@ -146783,7 +156808,7 @@ Date: Thu Aug 24 14:51:26 2006 +0300
Fix horrendous thinko. Indicators now work perfectly.
commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813
-Merge: 33af05d 67bd672
+Merge: 33af05d58f 67bd672c88
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 24 10:59:33 2006 +0300
@@ -146802,7 +156827,7 @@ Date: Wed Aug 23 22:39:42 2006 +0000
Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI
commit b983773d446cef6a0948ca264ed48126e404ae9a
-Merge: 0623d36 d9a8656
+Merge: 0623d3643f d9a86566c2
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 23 17:16:50 2006 -0700
@@ -146924,14 +156949,14 @@ Date: Wed Aug 23 14:33:41 2006 +0300
the moment), and use that instead of nasty pointer assignments.
commit 52ba722e4c89c052609b4fc62e965d92778aa2dd
-Merge: 9138d5a 0554125
+Merge: 9138d5a51e 05541259bd
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon Aug 21 18:49:31 2006 -0400
Merge branch 'XACE-modular' into my-XACE-modular
commit 05541259bdb0dfaab015a01caa3722b7a1b782e2
-Merge: c2535f6 a1ac044
+Merge: c2535f6792 a1ac0440bb
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Aug 21 13:07:41 2006 -0700
@@ -146947,7 +156972,7 @@ Date: Fri Aug 18 18:03:41 2006 +0300
configure time.
commit 0704bb298cc826cd117815898c6bc015a693c2c9
-Merge: c140369 a1ac044
+Merge: c14036977f a1ac0440bb
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:30:14 2006 +0300
@@ -146967,14 +156992,14 @@ Date: Fri Aug 18 17:24:34 2006 +0300
input.h: add InitCoreDevices prototype
commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412
-Merge: 633b6a6 70ddd0f
+Merge: 633b6a69f5 70ddd0f39d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:05:50 2006 +0300
Merge branch 'origin' into input-hotplug
commit 19f673b7788d32c220e7e06734f1074b0e4a999c
-Merge: cb0a565 70ddd0f
+Merge: cb0a565d2b 70ddd0f39d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Aug 18 17:05:41 2006 +0300
@@ -146997,7 +157022,7 @@ Date: Fri Aug 18 14:43:10 2006 +0100
(Brett Stahlman & Colin Harrison)
commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc
-Merge: e1f4565 ee5e2cb
+Merge: e1f4565be5 ee5e2cbd2b
Author: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri Aug 18 09:13:52 2006 +0100
@@ -147042,7 +157067,7 @@ Date: Thu Aug 17 16:22:07 2006 -0400
It would be really nice if we only did this in one place instead of 40.
commit 633b6a69f560c0a77dcff78fdef5fcf0041e2e04
-Merge: 95dbfcf 7da5144
+Merge: 95dbfcf882 7da51447ea
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 17 21:25:14 2006 +0300
@@ -147150,21 +157175,21 @@ Date: Tue Aug 15 15:23:53 2006 +0300
Fix debug_events prototype.
commit d003bada3352ec7d734498c4c732904876a9d1e2
-Merge: d6433be a815b9b
+Merge: d6433be3cc a815b9b990
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 22:48:55 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
commit a815b9b990e068f02d9cbba2b17f2cc3a30a9310
-Merge: 37943e2 984babe
+Merge: 37943e2f1a 984babe86b
Author: George Sapountzis <gsap7@yahoo.gr>
Date: Sat Aug 12 21:58:33 2006 +0300
Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver
commit d6433be3cca807dd78fbb1f45d9ba0212283083d
-Merge: 2bf9e3d 984babe
+Merge: 2bf9e3dc1e 984babe86b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 21:50:52 2006 +0300
@@ -147223,7 +157248,7 @@ Date: Sat Aug 12 19:25:06 2006 +0300
Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h.
commit 26c3cd1c9e3f52548389817a6d89a377e20c4269
-Merge: 008aa7e c4951e0
+Merge: 008aa7eb6e c4951e0a6b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 12 18:58:18 2006 +0300
@@ -147252,7 +157277,7 @@ Date: Thu Aug 10 20:43:15 2006 -0400
mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set.
commit c2535f67923bde0bfb0e72363467110806e2f40f
-Merge: c0cb8d1 db82e12
+Merge: c0cb8d1fb8 db82e12fac
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Aug 10 10:37:59 2006 -0700
@@ -147274,7 +157299,7 @@ Date: Thu Aug 10 20:28:06 2006 +0300
auto.
commit 1a5561c4ecccaf32b03c41373adf376100d457aa
-Merge: 190f229 db82e12
+Merge: 190f229ed7 db82e12fac
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Aug 10 10:20:37 2006 -0700
@@ -147295,7 +157320,7 @@ Date: Thu Aug 10 18:02:47 2006 +0300
XKB (and thus don't need to count the extra repeat events).
commit 172d45b9b75f95c997d1e9358040eead496e2a06
-Merge: 3832a3d db82e12
+Merge: 3832a3d7db db82e12fac
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 10 14:14:54 2006 +0300
@@ -147340,7 +157365,7 @@ Date: Wed Aug 9 14:48:51 2006 -0400
Remove the bc flag from the -help text, since it's gone.
commit 767f372dd02232469f9fd804b811a17eaf762e1e
-Merge: c4f5de6 462bb61
+Merge: c4f5de6cc3 462bb61b0f
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Wed Aug 9 20:23:30 2006 +0200
@@ -147358,7 +157383,7 @@ Date: Wed Aug 9 20:21:52 2006 +0200
hooks.
commit 5506b4ad200745236f997c121e8200179c47b749
-Merge: 4be9abb 462bb61
+Merge: 4be9abb850 462bb61b0f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 9 07:21:01 2006 +0300
@@ -147419,7 +157444,7 @@ Date: Tue Aug 8 14:54:10 2006 +0300
Sending MapNotify is more correct in this case than NKN, so do that.
commit 31089816317f27c668b12a15c74fdd226a8df9f7
-Merge: ab3ebfe 12dbd8a
+Merge: ab3ebfefdb 12dbd8a02f
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Aug 8 12:01:12 2006 +0300
@@ -147543,7 +157568,7 @@ Date: Mon Aug 7 16:51:09 2006 +0300
memcpy events into our event structure instead of doing pointer assignment.
commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e
-Merge: a406f6b f54b71b
+Merge: a406f6bfea f54b71b772
Author: Daniel Stone <daniel@fooishbar.org>
Date: Mon Aug 7 15:54:55 2006 +0300
@@ -147630,7 +157655,7 @@ Date: Wed Aug 2 09:55:32 2006 -0700
Remove pciConfigPtr and all of the associated cruft.
commit 966ebd3d2d84b440e89504d055a0e937303ed11d
-Merge: a941766 39169fd
+Merge: a94176627c 39169fd373
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Aug 2 08:14:58 2006 -0700
@@ -147685,14 +157710,14 @@ Date: Mon Jul 31 13:54:36 2006 -0700
Build fixes for last pull from HEAD.
commit 65dc25d8f86b962f2adc765a9ff327419f98092b
-Merge: 69533fc b74c845
+Merge: 69533fc04f b74c845a12
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 12:30:30 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit b74c845a1233f78b841ff8840272c50873300c20
-Merge: 3112a6c 02daa6b
+Merge: 3112a6c4f2 02daa6bb10
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 10:26:06 2006 -0700
@@ -147716,7 +157741,7 @@ Date: Mon Jul 31 17:32:05 2006 +0100
and GC stripple and tile pixmaps.
commit 69533fc04f38c67fd424776c5191a4ba57ba8c8f
-Merge: ef1aeca 24051ef
+Merge: ef1aecaaf6 24051ef974
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jul 31 09:26:04 2006 -0700
@@ -147724,8 +157749,8 @@ Date: Mon Jul 31 09:26:04 2006 -0700
Conflicts:
- hw/xfree86/Makefile.am
- hw/xfree86/common/xf86AutoConfig.c
+ hw/xfree86/Makefile.am
+ hw/xfree86/common/xf86AutoConfig.c
commit 24051ef97406f28c102cf46a78223400b61fdae2
Author: Daniel Stone <daniel@fooishbar.org>
@@ -147764,7 +157789,7 @@ Date: Sun Jul 30 11:08:47 2006 +0300
remove README (which doesn't exist) from EXTRA_DIST
commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa
-Merge: 3518e2d 654619d
+Merge: 3518e2d0de 654619d76c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sun Jul 30 10:51:34 2006 +0300
@@ -147862,7 +157887,7 @@ Date: Wed Jul 26 13:25:13 2006 -0700
Pass correct pointer to xf86MapLegacyIO.
commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216
-Merge: eb7733a 3821f6a
+Merge: eb7733a48a 3821f6aeaa
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Jul 26 11:29:21 2006 +0300
@@ -147889,7 +157914,7 @@ Date: Tue Jul 25 15:38:09 2006 -0700
pci_device_get_bridge_buses can be used.
commit 380b51d605a82c98082a2cebd70a0d1d0735eaa7
-Merge: 82f6b7e 8977b07
+Merge: 82f6b7e75e 8977b07434
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jul 25 11:30:04 2006 -0700
@@ -147897,14 +157922,14 @@ Date: Tue Jul 25 11:30:04 2006 -0700
Conflicts:
- hw/xfree86/common/xf86Init.c
- hw/xfree86/int10/pci.c
- hw/xfree86/scanpci/xf86PciData.h
- hw/xfree86/scanpci/xf86PciStdIds.h
- hw/xfree86/scanpci/xf86PciStr.h
- hw/xfree86/scanpci/xf86ScanPci.h
- hw/xfree86/utils/pcitweak/pcitweak.c
- hw/xfree86/utils/scanpci/scanpci.c
+ hw/xfree86/common/xf86Init.c
+ hw/xfree86/int10/pci.c
+ hw/xfree86/scanpci/xf86PciData.h
+ hw/xfree86/scanpci/xf86PciStdIds.h
+ hw/xfree86/scanpci/xf86PciStr.h
+ hw/xfree86/scanpci/xf86ScanPci.h
+ hw/xfree86/utils/pcitweak/pcitweak.c
+ hw/xfree86/utils/scanpci/scanpci.c
Re-removed most of the conflicting files.
@@ -147987,7 +158012,7 @@ Date: Sun Jul 23 19:02:12 2006 -0400
Allow XOpenDevice on closed devices.
commit e73e5e2a4d8f22889d840a7719479f9af686cb9c
-Merge: a73cef1 8977b07
+Merge: a73cef1f00 8977b07434
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 22 13:56:30 2006 -0400
@@ -148000,7 +158025,7 @@ Date: Sun Jul 23 03:36:47 2006 +1000
glx: fix typo from tag removal
commit a73cef1f005ca66db18e952e676ee5a21b829700
-Merge: 672ca15 70869fc
+Merge: 672ca156bf 70869fc677
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Jul 22 12:07:22 2006 -0400
@@ -148043,7 +158068,7 @@ Date: Fri Jul 21 19:16:38 2006 -0700
Fix stupid typos.
commit 672ca156bfb11440e6e234650bfba9d38e1edb52
-Merge: d14d91f 6cf844a
+Merge: d14d91f094 6cf844ab69
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:58:42 2006 -0400
@@ -148076,7 +158101,7 @@ Date: Fri Jul 21 16:47:45 2006 -0700
which in turn allows the elimination of hw/xfree86/int10/pci.c.
commit 87a6346bf7f086b5f98b2b2ecd52f27efe864e56
-Merge: b73fb2a 0486d39
+Merge: b73fb2ae35 0486d3966d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:36:25 2006 -0400
@@ -148091,7 +158116,7 @@ Date: Fri Jul 21 19:35:04 2006 -0400
XkbSA_XFree86Private.
commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1
-Merge: e7ac27a aff404f
+Merge: e7ac27ad81 aff404f293
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:30:26 2006 -0400
@@ -148113,7 +158138,7 @@ Date: Fri Jul 21 19:10:26 2006 -0400
Ugh.
commit 7465010d59ec435bd00b738f0cef766b352dc7eb
-Merge: 1d31ed7 0aaac95
+Merge: 1d31ed7782 0aaac95b0d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Fri Jul 21 19:05:41 2006 -0400
@@ -148139,7 +158164,7 @@ Date: Fri Jul 21 18:41:46 2006 -0400
Remove the loader's required and referenced symbol lists, dead code.
commit 07ad92d2c4cb07db8487d76efc822fd7b88137cb
-Merge: 18624a9 22db3fd
+Merge: 18624a9b7c 22db3fdb54
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 15:25:35 2006 -0700
@@ -148147,9 +158172,9 @@ Date: Fri Jul 21 15:25:35 2006 -0700
Conflicts:
- hw/xfree86/common/xf86DoScanPci.c
- hw/xfree86/common/xf86Init.c
- hw/xfree86/common/xf86pciBus.c
+ hw/xfree86/common/xf86DoScanPci.c
+ hw/xfree86/common/xf86Init.c
+ hw/xfree86/common/xf86pciBus.c
commit aff404f293ed86a44a093a51a9f11e79e6c3f4f6
Author: Adam Jackson <ajax@theobromine.nwnk.net>
@@ -148170,7 +158195,7 @@ Date: Thu Jul 20 18:19:07 2006 -0700
Fix the RandR failure path for rotated screens.
commit 22db3fdb54d2f7f6b72638b46c186af6db04e214
-Merge: 2f98841 93cd538
+Merge: 2f98841fde 93cd53860c
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jul 21 13:55:37 2006 -0700
@@ -148413,7 +158438,7 @@ Date: Thu Jul 20 17:33:13 2006 -0400
Remove the DDXTIME conditional, for being unused.
commit c69c00d6523a35232a32e54a533811fc2b37815a
-Merge: 4636935 84683f1
+Merge: 46369350d4 84683f19b4
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 20 12:08:38 2006 -0700
@@ -148487,7 +158512,7 @@ Date: Thu Jul 13 21:10:48 2006 -0700
Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr.
commit 12595a77d6c2f037f48dfe751bdc10505b3317df
-Merge: 37838de 4c225a3
+Merge: 37838de62e 4c225a3a8b
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 13 12:48:03 2006 -0700
@@ -148528,7 +158553,7 @@ Date: Sat Jul 8 21:57:07 2006 +0100
Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc )
commit 21e3e3ca298dce22e5fad6ef38aa6fe9736a1d3b
-Merge: e805621 39b2f7b
+Merge: e805621894 39b2f7b218
Author: Matthew Allum <mallum@polystyrene.(none)>
Date: Sat Jul 8 21:13:52 2006 +0100
@@ -148615,7 +158640,7 @@ Date: Thu Jul 6 17:39:14 2006 -0400
Switch the default mouse device on Linux to /dev/input/mice.
commit 37838de62edc474f44c0a48bd56470a6c23f8956
-Merge: fd49a0d 8d07ee0
+Merge: fd49a0dcc1 8d07ee070e
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 13:01:57 2006 -0700
@@ -148623,7 +158648,7 @@ Date: Thu Jul 6 13:01:57 2006 -0700
Conflicts:
- hw/xfree86/os-support/bus/linuxPci.c
+ hw/xfree86/os-support/bus/linuxPci.c
commit 8d07ee070ecf0d403d9d27c80764d343b80af6f0
Author: Ian Romanick <idr@umwelt.(none)>
@@ -148641,7 +158666,7 @@ Date: Thu Jul 6 14:22:33 2006 -0400
Spotted by Aaron Plattner.
commit fd49a0dcc13280cf195bd6c7ee0f23d0840cb665
-Merge: e66e7b4 28b95fd
+Merge: e66e7b48e1 28b95fd9d1
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jul 6 09:52:15 2006 -0700
@@ -148699,7 +158724,7 @@ Date: Wed Jun 28 15:59:01 2006 -0400
DoGetDrawableAttributes and __glXQueryContextInfoEXT.
commit e66e7b48e15543f3753951a19376f0446759963a
-Merge: a9d4842 eb35f81
+Merge: a9d4842893 eb35f812a5
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jul 5 15:21:36 2006 -0700
@@ -148758,7 +158783,7 @@ Date: Wed Jun 28 18:35:59 2006 +0200
Optimize out computing a gradient pixel if the mask value is 0.
- Obtained from: kdrive CVS (DavidR XGL fb/ megapatch)
+ Obtained from: kdrive CVS (DavidR XGL fb/ megapatch)
commit a838fb70c52a829872680f6a2a2e7dd6d2dc9247
Author: Eric Anholt <anholt@FreeBSD.org>
@@ -148813,7 +158838,7 @@ Date: Sat Jul 1 12:34:36 2006 -0700
Missing close parenthesis in one of the setuid() fixes.
commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea
-Merge: d3d6c5f 179737d
+Merge: d3d6c5f4d0 179737d4a0
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Jul 1 11:12:50 2006 -0700
@@ -148841,7 +158866,7 @@ Date: Wed Jun 7 01:46:00 2006 -0700
Move variable declarations to start of blocks as required by c89
commit a9d4842893b65232d61fe4c63f074d30e81021d2
-Merge: 66cac9b 6bd4c25
+Merge: 66cac9b174 6bd4c25439
Author: Ian Romanick <idr@umwelt.(none)>
Date: Fri Jun 30 11:49:29 2006 -0700
@@ -148855,7 +158880,7 @@ Date: Mon Jun 26 01:52:24 2006 +0200
Updated for Solaris 10 changes to DDI
commit 66cac9b17498497d939bfb7a4075bcee5a485e5f
-Merge: 7c4e540 54d9acd
+Merge: 7c4e540253 54d9acd511
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 28 14:11:49 2006 -0700
@@ -148892,14 +158917,14 @@ Date: Tue Jun 27 04:11:47 2006 +0200
cairo's clip-operator test.
commit 7c4e54025345455f420cd2abaa7a40679689d3cb
-Merge: 9d0a15d ff6b59a
+Merge: 9d0a15dca5 ff6b59a0db
Author: Ian Romanick <idr@umwelt.(none)>
Date: Mon Jun 26 14:39:44 2006 -0700
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
commit ff6b59a0dbadbe61a53e48c23965d3073d95791b
-Merge: b3c8693 48c8715
+Merge: b3c869304c 48c871564d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jun 26 13:02:33 2006 -0700
@@ -148982,7 +159007,7 @@ Date: Wed Jun 21 09:30:59 2006 -0700
Add a manpage for EXA.
commit 9d0a15dca56b14821cad474f9db9c332acb3b1e6
-Merge: 6c514ca d67fd10
+Merge: 6c514ca14c d67fd10696
Author: Ian Romanick <idr@umwelt.(none)>
Date: Thu Jun 22 16:21:10 2006 -0700
@@ -148990,7 +159015,7 @@ Date: Thu Jun 22 16:21:10 2006 -0700
Conflicts:
- hw/xfree86/loader/xf86sym.c
+ hw/xfree86/loader/xf86sym.c
commit 6c514ca14c2326c2cf82b73196429789d11e4a01
Author: Ian Romanick <idr@umwelt.(none)>
@@ -149018,7 +159043,7 @@ Date: Wed Jun 21 18:12:41 2006 -0700
Use XACE, not XCSECURITY to decide if SecurityLookup* are exported
commit 3177dc498a955cd58cd6054a7c7e69724db4a59b
-Merge: 3f19803 91dcac5
+Merge: 3f19803e0b 91dcac5295
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 18:06:06 2006 -0700
@@ -149031,7 +159056,7 @@ Date: Wed Jun 21 18:05:51 2006 -0700
APPGROUP requires both X-ACE & XC-SECURITY now
commit 91dcac5295486cc55a34ad91704bfa483bd31eeb
-Merge: d8135eb 77c947b
+Merge: d8135eb9e4 77c947b900
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed Jun 21 20:49:30 2006 -0400
@@ -149058,7 +159083,7 @@ Date: Wed Jun 21 16:24:20 2006 -0700
Correct ifdef - should be XACE, not XSECURITY
commit 90af38fa0c46c2081d2becac262a614c26ba6ef1
-Merge: 3e098ef 77c947b
+Merge: 3e098efa35 77c947b900
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Jun 21 16:23:31 2006 -0700
@@ -149066,7 +159091,7 @@ Date: Wed Jun 21 16:23:31 2006 -0700
Conflicts:
- Xext/appgroup.c
+ Xext/appgroup.c
commit 3e098efa35ba70ad4d5699af3130a3b02e1cb06e
Author: Alan Coopersmith <alan.coopersmith@sun.com>
@@ -149085,7 +159110,7 @@ Date: Wed Jun 21 16:18:41 2006 -0700
of updates.)
commit aa131c51e06e735d7b54cadf51205f703a3de4ef
-Merge: 1708b0c 77aa701
+Merge: 1708b0c7d9 77aa701e89
Author: Ian Romanick <idr@umwelt.(none)>
Date: Wed Jun 21 14:39:52 2006 -0700
@@ -149153,7 +159178,7 @@ Date: Tue Jun 20 19:01:34 2006 -0700
- Added X-ACE sources to Xext/Makefile.am
commit a46c06dab8392cf8012c7cc0b916de9a9e569671
-Merge: 49b368c d44b2a0
+Merge: 49b368c0bb d44b2a0a57
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Jun 20 18:40:18 2006 -0700
@@ -149161,16 +159186,16 @@ Date: Tue Jun 20 18:40:18 2006 -0700
Conflicts:
- Xext/appgroup.c
- Xext/security.c
- dix/devices.c
- dix/dispatch.c
- dix/dixutils.c
- dix/events.c
- dix/extension.c
- dix/property.c
- dix/window.c
- os/access.c
+ Xext/appgroup.c
+ Xext/security.c
+ dix/devices.c
+ dix/dispatch.c
+ dix/dixutils.c
+ dix/events.c
+ dix/extension.c
+ dix/property.c
+ dix/window.c
+ os/access.c
commit d44b2a0a57fb89741173c31676af0ccc822387dc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
@@ -149185,7 +159210,7 @@ Date: Tue Jun 20 18:14:27 2006 -0700
Move Xserver API for security extension to securitysrv.h
commit 49b368c0bb04816c4a3579071c596b2398cae3ec
-Merge: 63f6e6b 481d401
+Merge: 63f6e6bbfd 481d4012e7
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:22:39 2006 -0700
@@ -149198,7 +159223,7 @@ Date: Tue Jun 20 16:16:19 2006 -0700
Don't add -ldl to XORG_LIBS if it's not needed for dlopen
commit 63f6e6bbfd0d3677e29621af982c9392ead98dd7
-Merge: 88ede2c 6df52fb
+Merge: 88ede2cec7 6df52fb774
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 16:03:34 2006 -0700
@@ -149211,7 +159236,7 @@ Date: Tue Jun 20 16:02:55 2006 -0700
Delete code that's been inside #if 0 since X11R6.7.
commit 75398cff82b56c0a8fc301e84e2087f59a61a360
-Merge: 1f91b57 2b58685
+Merge: 1f91b5726c 2b58685402
Author: Ian Romanick <idr@umwelt.(none)>
Date: Tue Jun 20 15:49:47 2006 -0700
@@ -149219,11 +159244,11 @@ Date: Tue Jun 20 15:49:47 2006 -0700
Conflicts:
- hw/xfree86/loader/Makefile.am
- hw/xfree86/loader/xf86sym.c
+ hw/xfree86/loader/Makefile.am
+ hw/xfree86/loader/xf86sym.c
commit 88ede2cec79281a43cecb43ee6dec65770f82530
-Merge: 227a319 2b58685
+Merge: 227a319340 2b58685402
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Tue Jun 20 15:29:55 2006 -0700
@@ -149262,8 +159287,8 @@ Date: Mon Jun 19 22:13:22 2006 -0400
Cherry-picking patches:
- 8a5ea68800b9d7dca90ff4e573ad8533852f1ea3 and
- 4d755fe14274a7293748ce9aa666ab85df6297c5
+ 8a5ea68800b9d7dca90ff4e573ad8533852f1ea3 and
+ 4d755fe14274a7293748ce9aa666ab85df6297c5
commit f818e0ab60da3779ab2602c6e6d3ff261b50917e
Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
@@ -149273,7 +159298,7 @@ Date: Wed May 5 20:07:37 2004 +0000
(cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit)
commit 0707eb33d6826e1300a905edea28c12134600b12
-Merge: 37f0ae0 98d17bb
+Merge: 37f0ae0245 98d17bba71
Author: Alan Coopersmith <alanc@alf.(none)>
Date: Mon Jun 19 17:09:51 2006 -0700
@@ -149326,7 +159351,7 @@ Date: Mon Jun 19 14:06:02 2006 -0700
Correct component ordering when fetching [ax]4b4g4r4 pixels.
- Noticed by: rendercheck
+ Noticed by: rendercheck
commit e1672a12eb70836a2ceec803d505294897ae8cd2
Author: Eric Anholt <anholt@FreeBSD.org>
@@ -149438,7 +159463,7 @@ Date: Fri Jun 16 10:14:30 2006 -0700
hadn't been bumped.
commit 72ac20c0e878ad48ff61f7e846cbf1005a4eb435
-Merge: fc3e814 b900883
+Merge: fc3e81473a b90088321e
Author: Ian Romanick <idr@localhost.localdomain>
Date: Tue Jun 13 21:13:02 2006 -0700
@@ -149465,7 +159490,7 @@ Date: Mon Jun 12 20:12:31 2006 +0200
Provide option to report damage after operation is complete.
commit fc3e81473a98d3b932faa73c0c01c21366a48a9e
-Merge: 4bedaad 041ef23
+Merge: 4bedaad17d 041ef23192
Author: Ian Romanick <idr@localhost.localdomain>
Date: Mon Jun 12 09:41:06 2006 -0700
@@ -149502,7 +159527,7 @@ Date: Fri Jun 9 16:08:06 2006 -0700
another function that was already in that file.
commit 7810d87cd6ae9316d88f6a2e7696deb8837cec27
-Merge: dcfaa9f caad8b7
+Merge: dcfaa9f4f8 caad8b724b
Author: Ian Romanick <idr@localhost.localdomain>
Date: Fri Jun 9 15:16:50 2006 -0700
@@ -149574,7 +159599,7 @@ Date: Fri Jun 9 09:51:28 2006 -0700
based on FIXME in mi/miinitext.c
commit dcfaa9f4f8fb10b75be50c9a49ccd88caf6d0f6a
-Merge: af9afe4 576e6fb
+Merge: af9afe4cc5 576e6fb112
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 15:03:00 2006 -0700
@@ -149594,7 +159619,7 @@ Date: Thu Jun 8 17:46:53 2006 -0400
Bug #7121: fix clipboard handling in Xming (Colin Harrison)
commit af9afe4cc50df973bea2293a803f7dfdefaa6411
-Merge: caffac3 3930da3
+Merge: caffac3843 3930da3f62
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 11:37:09 2006 -0700
@@ -149671,7 +159696,7 @@ Date: Thu Jun 8 10:40:24 2006 -0700
if anyone really cares about this code.
commit caffac38432009e8dc01e7d3e72a7fa6fba2f078
-Merge: c5b3aa1 9fa7372
+Merge: c5b3aa120b 9fa73721f0
Author: Ian Romanick <idr@localhost.localdomain>
Date: Thu Jun 8 10:38:43 2006 -0700
@@ -149782,7 +159807,7 @@ Date: Wed Jun 7 17:44:06 2006 -0700
when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time.
commit 23182315f34e3a0065739b43b15d4560e75b41a1
-Merge: bc05158 757f40f
+Merge: bc05158a5a 757f40fca5
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 17:03:48 2006 -0700
@@ -149819,7 +159844,7 @@ Date: Wed Jun 7 14:09:13 2006 -0700
updated the .gitignore file with more auto-generated files
commit bc05158a5ab00c548e4b04b5638afe07bc702260
-Merge: 46f55f5 cc46580
+Merge: 46f55f5dea cc465800dd
Author: Ian Romanick <idr@localhost.localdomain>
Date: Wed Jun 7 14:09:12 2006 -0700
@@ -149839,7 +159864,7 @@ Date: Wed Jun 7 14:03:35 2006 -0700
Fix compiler warnings about SetVendorRelease and SetVendorString
commit 785c9789704ed142fe98cd17b5995e4a95b7141f
-Merge: 21ebcfd 36d786e
+Merge: 21ebcfd702 36d786e9f0
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Jun 7 13:20:21 2006 -0700
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 07:33:03 +0000