diff options
57 files changed, 2338 insertions, 976 deletions
diff --git a/xserver/ChangeLog b/xserver/ChangeLog index f87054c58..a14ffe982 100644 --- a/xserver/ChangeLog +++ b/xserver/ChangeLog @@ -1,3 +1,929 @@ +commit 6b3fafa9bfa94b9b04a1a44dc52afb7c4bc250ce +Author: Matt Turner <mattst88@gmail.com> +Date: Fri Nov 22 17:52:04 2019 -0500 + + xserver 1.20.6 + + Signed-off-by: Matt Turner <mattst88@gmail.com> + +commit 88f12aa74bf4fea25d5b8d8002b3088432feb405 +Author: Matt Turner <mattst88@gmail.com> +Date: Thu Nov 21 11:23:18 2019 -0500 + + xfree86: Test presence of isastream() + + isastream() was never more than a stub in glibc, and was removed in + glibc-2.30 by commit a0a0dc83173c ("Remove obsolete, never-implemented + XSI STREAMS declarations"). + + Bug: https://bugs.gentoo.org/700838 + Reviewed-by: Julien Cristau <jcristau@debian.org> + Signed-off-by: Matt Turner <mattst88@gmail.com> + (cherry picked from commit e6ab7f9f342f463092c45226f3294074351fdd5e) + +commit 0e60139064b84b856c59e5a456e26c60710b1b69 +Author: Olivier Fourdan <ofourdan@redhat.com> +Date: Mon Nov 18 17:28:45 2019 +0100 + + present/wnmd: Relax assertion on CRTC on abort_vblank() + + Currently, the function `present_wnmd_abort_vblank()` would fail if the + given `crtc` is NULL. + + However, `xwl_present_get_crtc()` can return `NULL` under some + circumstances, which would cause an unexpected termination of Xwayland + in such a case, caused by the assertion failure being triggered. + + Remove the assertion, considering that the `crtc` isn't actually used in + neither `present_wnmd_abort_vblank()` nor `xwl_present_abort_vblank()`. + + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> + Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> + Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/937 + (cherry picked from commit 4f984fc06bd57cabfa38f6191f10714878dc8969) + +commit 2edadf26f1f8deddbe171115fa502337ac62df02 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Tue Nov 19 10:08:51 2019 -0800 + + os: Don't crash in AttendClient if the client is gone + + If a client is in the process of being closed down, then its client->osPrivate + pointer will be set to NULL by CloseDownConnection. This can cause a crash if + freeing the client's resources results in a call to AttendClient. For example, + if the client has a pending sync fence: + + Thread 1 "X" received signal SIGSEGV, Segmentation fault. + AttendClient (client=0x5571c4aed9a0) at ../os/connection.c:942 + (gdb) bt + #0 AttendClient (client=0x5571c4aed9a0) at ../os/connection.c:942 + #1 0x00005571c3dbb865 in SyncAwaitTriggerFired (pTrigger=<optimized out>) at ../Xext/sync.c:694 + #2 0x00005571c3dd5749 in miSyncDestroyFence (pFence=0x5571c5063980) at ../miext/sync/misync.c:120 + #3 0x00005571c3dbbc69 in FreeFence (obj=<optimized out>, id=<optimized out>) at ../Xext/sync.c:1909 + #4 0x00005571c3d7a01d in doFreeResource (res=0x5571c506e3d0, skip=skip@entry=0) at ../dix/resource.c:880 + #5 0x00005571c3d7b1dc in FreeClientResources (client=0x5571c4aed9a0) at ../dix/resource.c:1146 + #6 FreeClientResources (client=0x5571c4aed9a0) at ../dix/resource.c:1109 + #7 0x00005571c3d5525f in CloseDownClient (client=0x5571c4aed9a0) at ../dix/dispatch.c:3473 + #8 0x00005571c3d55eeb in Dispatch () at ../dix/dispatch.c:492 + #9 0x00005571c3d59e96 in dix_main (argc=3, argv=0x7ffe7854bc28, envp=<optimized out>) at ../dix/main.c:276 + #10 0x00007fea4837cb6b in __libc_start_main (main=0x5571c3d1d060 <main>, argc=3, argv=0x7ffe7854bc28, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7ffe7854bc18) at ../csu/libc-start.c:308 + #11 0x00005571c3d1d09a in _start () at ../Xext/sync.c:2378 + (gdb) print client->osPrivate + $1 = (void *) 0x0 + + Since the client is about to be freed, its ignore count doesn't matter and + AttendClient can simply be a no-op. Check for client->clientGone in AttendClient + and remove similar checks from two callers that had them. + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + (cherry picked from commit 4308f5d3d1fbd0f5dce81e22c0c3f08c65a7c9d8) + +commit 68cfee97bc59580724d594c82f5ee55a980dadf0 +Author: Adam Jackson <ajax@redhat.com> +Date: Wed Oct 9 11:57:18 2019 -0400 + + dix: Call SourceValidate before GetImage + + This ensures that any prep work for the drawable we're about to read + from is already done before we call down to GetImage. This should be no + functional change as most of the callers with a non-trivial + SourceValidate are already wrapping GetImage and doing the equivalent + thing, but we'll be simplifying that shortly. + + More importantly this ensures that if any of that prep work would + generate events - like automatic compositing flushing rendering to a + parent pixmap which then triggers damage - then it happens entirely + before we start writing the GetImage reply header. + + Note that we do not do the same for GetSpans, but that's okay. The only + way to get to GetSpans is through miCopyArea or miCopyPlane - where the + callers must already call SourceValidate - or miGetImage - which this + commit now protects with SourceValidate. + + Fixes: xorg/xserver#902 + Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> + (cherry picked from commit 516e75dbb6bbf97c7af9c2226242ffd9259fec11) + +commit 2320fd4b52a60411714170d516fc58e6ec516353 +Author: Adam Jackson <ajax@redhat.com> +Date: Wed Oct 9 11:27:12 2019 -0400 + + mi: Add a default no-op miSourceValidate + + Slightly simplifies the callers since they don't need to check for + non-NULL anymore. + + I do extremely hate the workarounds here to suppress misprite taking the + cursor down though. Surely there's a better way. + + [1.20: Do not in fact simplify the callers as above, since it would + change the ABI. - ajax] + + Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> + (cherry picked from commit ff310903f34ac34c916ad74e919d1ac12aea4715) + +commit 07efd81b819f21046afc0bb7e19a6cdf7f3c7ea9 +Author: Olivier Fourdan <ofourdan@redhat.com> +Date: Mon Jul 1 13:20:39 2019 +0200 + + compiler.h: Do not include sys/io.h on ARM with glibc + + <sys/io.h> on ARM hasn't worked for a long, long time, so it was removed + it from glibc upstream. + + Remove the include to avoid a compilation failure on ARM with glibc. + + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> + Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/840 + (cherry picked from commit fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba) + +commit 03b91e17ce72649b2d6946213f5a7d152bfe7098 +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Wed Nov 6 10:45:43 2019 -0800 + + xfree86: Call ScreenInit for protocol screens before GPU screens + + During startup, the xfree86 DDX's InitOutput() calls PreInit for + protocol screens first, and then GPU screens. On teardown, dix_main() + calls CloseScreen in the reverse order: GPU screens first starting with + the last one and then working backwards, and then protocol screens also + in reverse order. + + InitOutput() calls ScreenInit in the wrong order: for GPU screens first and then + for protocol screens. This causes a problem for drivers that have global state + that is tied to the first screen that calls ScreenInit. + + Fix this by simply re-ordering the for loops to call PreInit for + protocol screens first and then for GPU screens second. + + (cherry picked from commit e5e9a8ca91d1c087edd8788a110251ad940dbc94) + +commit 325f694e97a117aec47aa2e1a9b2b28c3c47994e +Author: Alex Goins <agoins@nvidia.com> +Date: Tue Sep 17 18:36:35 2019 -0500 + + modesetting: Implement ms_covering_randr_crtc() for ms_present_get_crtc() + + ms_present_get_crtc() returns an RRCrtcPtr, but derives it from a xf86CrtcPtr + found via ms_dri2_crtc_covering_drawable()=>ms_covering_crtc(). As a result, it + depends on all associated DIX ScreenRecs having an xf86CrtcConfigPtr DDX + private. + + Some DIX ScreenRecs don't have an xf86CrtcConfigPtr DDX private, but do have an + rrScrPrivPtr DDX private. Given that we can derive all of the information we + need from RandR, we can support these screens by avoiding the use of xf86Crtc. + This change implements an RandR-based path for ms_present_get_crtc(), allowing + drawables to successfully fall back to syncing to the primary output, even if + the slave doesn't have an xf86CrtcConfigPtr DDX private. + + Without this change, if a slave doesn't have an xf86CrtcConfigPtr DDX private, + drawables will fall back to 1 FPS if they overlap an output on that slave. + + Signed-off-by: Alex Goins <agoins@nvidia.com> + (cherry picked from commit 562c7888be538c4d043ec1f374a9d9afa0b305a4) + +commit aa43dce15f69624ce939bb69bafc3df5a9b78dbb +Author: Alex Goins <agoins@nvidia.com> +Date: Tue Sep 17 18:03:34 2019 -0500 + + modesetting: Fix ms_covering_crtc() segfault with non-xf86Crtc slave + + DIX ScreenRecs don't necessarily have an xf86CrtcConfigPtr DDX private. + ms_covering_crtc() assumes that they do, which can result in a segfault. + + Update ms_covering_crtc() to check the XF86_CRTC_CONFIG_PTR() returned pointer + before dereferencing it. This will still mean that ms_covering_crtc() can't fall + back to the primary output when a drawable overlaps a slave output (going to the + 1 FPS default instead), but it won't segfault. + + Signed-off-by: Alex Goins <agoins@nvidia.com> + (cherry picked from commit 797e7a0ceb673fe2870c673e248835526a84d000) + +commit 341a4787157c68597951727d5d11a2813a31ec7e +Author: Alex Goins <agoins@nvidia.com> +Date: Wed Aug 28 18:24:16 2019 -0500 + + modesetting: Fix ms_covering_crtc() segfault with non-modesetting slave primary + + ms_covering_crtc() uses RRFirstOutput() to determine a primary output to fall + back to if a drawable is overlapping a slave output. + + If the primary output is a slave output, RRFirstOutput() will return a slave + output even if passed a master ScreenPtr. ms_covering_crtc() dereferences the + output's devPrivate, which is invalid for non-modesetting outputs, and can + crash. + + Changing RRFirstOutput() could have unintended side effects for other callers, + so this change replaces the call to RRFirstOutput() with ms_first_output(). + ms_first_output() ignores the primary output if it doesn't match the given + ScreenPtr, choosing the first connected output instead. + + Signed-off-by: Alex Goins <agoins@nvidia.com> + (cherry picked from commit 3ef9029ace4245d9f8929aa71e22bc6a6f40b7b3) + +commit 2dd9dfc8d9a5dc906ee06d667a756ab267f55e64 +Author: Alex Goins <agoins@nvidia.com> +Date: Wed Sep 4 12:25:31 2019 -0500 + + randr: Fix RRCrtcDetachScanoutPixmap() segfault during server teardown + + During server teardown, mrootdraw is NULL, which can cause segfaults if + master->Stop{,Flipping}PixmapTracking() don't do NULL checking. In this case we + shouldn't need to do master->Stop{,Flipping}PixmapTracking() anyway, so just + skip it. + + Signed-off-by: Alex Goins <agoins@nvidia.com> + (cherry picked from commit c82f814313a813d7e1a2d7d3b1f7561810446b34) + +commit 642c1f83b9ed2452ceb20457a4423a8f52a7a8c4 +Author: Hans de Goede <hdegoede@redhat.com> +Date: Mon Nov 4 20:03:17 2019 +0100 + + glamor/xwayland: Define EGL_NO_X11 + + Define EGL_NO_X11 everywhere were we also define MESA_EGL_NO_X11_HEADERS, + EGL_NO_X11 is the MESA_EGL_NO_X11_HEADERS equivalent for the egl headers + shipped with libglvnd. + + This fixes the xserver not building with the libglvnd-1.2.0 headers: + + In file included from /usr/include/EGL/eglplatform.h:128, + from /usr/include/epoxy/egl_generated.h:11, + from /usr/include/epoxy/egl.h:46, + from glamor_priv.h:43, + from glamor_composite_glyphs.c:25: + /usr/include/X11/Xlib.h:222:2: error: conflicting types for 'GC' + 222 | *GC; + | ^~ + In file included from glamor.h:34, + from glamor_priv.h:32, + from glamor_composite_glyphs.c:25: + ../include/gcstruct.h:282:3: note: previous declaration of 'GC' was here + 282 | } GC; + | ^~ + + Signed-off-by: Hans de Goede <hdegoede@redhat.com> + (cherry picked from commit 741bd73429e337071f49509ddcc5fb392e20b0f6) + +commit 2f55e8dc270fb65e8ff013c5e846a1a510c761e0 +Author: Adam Jackson <ajax@redhat.com> +Date: Wed Oct 9 16:03:17 2019 -0400 + + meson: Apparently 1.2 is < 1.2.0 + + Siiiigh. + + (cherry picked from commit 3340ddf37743fdf197dfc16a97107435ff53c6e4) + +commit e16eb696f2238796827794d2d3b23f268cf4daf0 +Author: Adam Jackson <ajax@redhat.com> +Date: Wed Oct 9 15:17:47 2019 -0400 + + meson: Fix another reference to "gl" 9.2.0 + + Previous commit e6ef2b12 missed a spot. + + (cherry picked from commit c7486613b0dc586f93f6ba293d9b55c69995b05c) + +commit a57729d3180ee4bc3ae012cfd03fe5188d858a83 +Author: Marvin Schmidt <marv@exherbo.org> +Date: Tue Sep 24 09:58:43 2019 +0200 + + build: glx: Lower gl version to work with libglvnd + + When using mesa with libglvnd support, mesa will no longer install the + gl, glx, egl pkg-config files but instead let libglvnd provide them. + libglvnd maintainers decided to change the versioning as it was + mesa-specific previously. Now the libraries have versions of the API + they expose[1]. + This causes problems when building the X server: + + checking for glproto >= 1.4.17 gl >= 9.2.0... no + configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met: + + Requested 'gl >= 9.2.0' but version of gl is 1.2 + + Lower the version requirement to 1.2 to allow building against libglvnd + provided libraries + + [1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba + + (cherry picked from commit e6ef2b12404dfec7f23592a3524d2a63d9d25802) + +commit 3491f1dc5c701656e2f69f74b459dfcaef9451d6 +Author: Sven Joachim <svenjoac@gmx.de> +Date: Wed Oct 2 18:26:07 2019 +0200 + + modesetting: Fix broken manpage in autoconf build + + The autoconf build for the modesetting driver still relied on + xorg-macros.m4 for string replacements and did not include the + top-level manpages.am. As a result, no substitutions took place after + commit 2e497bf887aca832dc0dd30d071c5288ab5c1e15. + + This should be a candidate for the 1.20 branch. + + Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> + (cherry picked from commit de0d39f825cce7422986011ee9d5db91f15e2987) + +commit df1f8f691d7550a18d2076a44c109b1cb6da05ae +Author: Alexander Tsoy <alexander@tsoy.me> +Date: Mon Sep 23 18:23:40 2019 +0300 + + configure: Set libdrm flags correctly if only XORG is enabled + + This fixes modesetting driver build failure which can be triggered with + the following configure options: + + $ ./configure --disable-dri --disable-dri2 --disable-dri3 + --disable-config-udev --enable-xorg + + Bugzilla: https://bugs.gentoo.org/689768 + Signed-off-by: Alexander Tsoy <alexander@tsoy.me> + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> + (cherry picked from commit 334f1107146a2e6ebf6f7743b77aec2ad5c46f75) + +commit fada61e89dd1f20fe8e2e0fb9e4baefb45b4b848 +Author: Matt Turner <mattst88@gmail.com> +Date: Fri Aug 9 20:22:29 2019 -0700 + + dix: Assert noPanoramiXExtension is false in PanoramiX code + + When compiling with link time optimization, GCC thinks it's discovered + undefined behavior: + + events.c: In function 'XineramaConfineCursorToWindow': + events.c:609:13: warning: iteration 2147483647 invokes undefined behavior [-Waggressive-loop-optimizations] + events.c:609:11: note: within this loop + events.c:605:49: warning: array subscript -1 is below array bounds of 'struct _Window *[16]' [-Warray-bounds] + events.c:606:31: warning: array subscript -1 is below array bounds of 'struct _Screen *[16]' [-Warray-bounds] + events.c:610:39: warning: array subscript -2 is below array bounds of 'struct _Screen *[16]' [-Warray-bounds] + events.c:617:38: warning: array subscript -2 is below array bounds of 'struct _Window *[16]' [-Warray-bounds] + events.c:619:35: warning: array subscript -2 is below array bounds of 'struct _Screen *[16]' [-Warray-bounds] + + This results from + + i = PanoramiXNumScreens - 1; + + RegionCopy(&pSprite->Reg1, &pSprite->windows[i]->borderSize); + off_x = screenInfo.screens[i]->x; + off_y = screenInfo.screens[i]->y; + + where GCC believes that PanoramiXNumScreens might be 0. Unfortunately + GCC is just smart enough to be an annoyance because this case is not + actually possible: XineramaConfineCursorToWindow() is only called when + noPanoramiXExtension is false, and if noPanoramiXExtension is false then + PanoramiXNumScreens must be >1 (see PanoramiXExtensionInit()). + + So, add an assert(!noPanoramiXExtension), which to my surprise provides + GCC with information even in release builds and lets GCC understand that + the code is not doing anything that is undefined behavior. + + I chose this solution instead of the proposed assert(i >= 0) because the + same pattern occurs in CheckVirtualMotion() but is inside an + 'if (!noPanoramiXExtension)' and does not generate any warnings. + + Fixes: xorg/xserver#590 + Signed-off-by: Matt Turner <mattst88@gmail.com> + (cherry picked from commit 61aa40aeb3d4efefda47f245ed4b83a1a19b1d4c) + +commit e815db543450c38d1d4ec03184b8e82fa0a37498 +Author: Alexander Volkov <a.volkov@rusbitech.ru> +Date: Mon Feb 11 18:54:10 2019 +0300 + + shm: Use memfd_create when possible + + It doesn't require shared memory dir and thus allows + to avoid cases when this dir is detected incorrectly, + as in https://bugreports.qt.io/browse/QTBUG-71440 + + Signed-off-by: Alexander Volkov <a.volkov@rusbitech.ru> + (cherry picked from commit f6753c117ef0f83499d5e2d6dda226fec9ddf803) + +commit 05c5b970136f0a11fffa16692744bdf5a23963e8 +Author: Eric Anholt <eric@anholt.net> +Date: Wed Sep 19 13:28:06 2018 -0700 + + shm: Pick the shm dir at run time, not build time. + + Prodding the builder's filesystem for tmp dirs doesn't necessarily + tell you anything about what the actual host's filesystem is going to + look like, so we should just try the dirs at runtime. + + Signed-off-by: Eric Anholt <eric@anholt.net> + (cherry picked from commit 19f6cb570becbc4e355807199c6e251fc7935132) + +commit 9ee4e35bfe084fa942c2b2ce46405e048eb335a8 +Author: Eric Anholt <eric@anholt.net> +Date: Wed Sep 19 13:20:12 2018 -0700 + + shm: reindent shm_tmpfile to follow our standards. + + Signed-off-by: Eric Anholt <eric@anholt.net> + (cherry picked from commit 804a9b4f57107fa2d0ed1ae0becda5bebaffe6e1) + +commit b6ee04e774af1fc2e2560583c95dfac688494c2a +Author: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Mon Jul 1 02:31:02 2019 +0200 + + Fix crash on XkbSetMap + + Some devices may not have keyboard information. + + Fixes #574 + + (cherry picked from commit 8469bfead9515ab3644f1769a1ff51466ba8ffee) + +commit 616b3e1dd19d51688e4cba380394bd93c62b50d4 +Author: Samuel Thibault <samuel.thibault@ens-lyon.org> +Date: Mon Jul 1 02:33:26 2019 +0200 + + Fix crash on XkbSetMap + + Since group_info and width are used for the key actions allocations, + when modifying them we need to take care of reallocation key actions if + needed. + + (cherry picked from commit fabc4219622f3c0b41b1cb897c46e092377059e3) + +commit c747dbb250c11c6a02641b253e7322145dc9b913 +Author: Michel Dänzer <mdaenzer@redhat.com> +Date: Mon Sep 23 18:35:41 2019 +0200 + + miext/sync: Make struct _SyncObject::initialized fully ABI compatible + + With a 32-bit build, putting the initialized field at the end of the + struct bumped the struct size from 20 bytes to 24, changing the layout + of other structs embedding struct _SyncObject. While this would be + acceptable on master, it caused crashes with 1.20. + + Making the initialized field a char and putting it in the hole before + the beingDestroyed field restores the 32-bit ABI as well. + + Fixes https://gitlab.freedesktop.org/xorg/xserver/issues/892 + + Reviewed-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Alex Goins <agoins@nvidia.com> + (cherry picked from commit 0d8cc7bb180468fee72330f40d87f6e9db7b42c0) + +commit 5aadaac9499c71ebf88c0e5fc658d9d56c8a7e16 +Author: Andres Rodriguez <andresx7@gmail.com> +Date: Fri Sep 6 18:32:44 2019 -0400 + + xf86: Disable unused crtc functions when a lease is revoked + + This fixes 'non-desktop' displays staying powered on after their lease + has been revoked. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111620 + Cc: Keith Packard <keithp@keithp.com> + Signed-off-by: Andres Rodriguez <andresx7@gmail.com> + +commit 63346c74393e1df4555f84367529802a67578ef6 +Author: Carlos Garnacho <carlosg@gnome.org> +Date: Mon Jan 7 15:33:35 2019 +0100 + + xwayland: Handle the case of windows being realized before redirection + + If Xwayland gets to realize a window meant for composition before the + compositor redirected windows (i.e. redirect mode is not RedirectDrawManual + yet), the window would stay "invisible" as we wouldn't create a + wl_surface/wl_shell_surface for it at any later point. + + This scenario may happen if the wayland compositor sets up a X11 socket + upfront, but waits to raise Xwayland until there are X11 clients. In this + case the first data on the socket is the client's, the compositor can hardly + beat that in order to redirect subwindows before the client realizes a + Window. + + In order to jump across this hurdle, allow the late creation of a matching + (shell) surface for the WindowPtr on SetWindowPixmapProc, so it is ensured + to be created after the compositor set up redirection. + + Signed-off-by: Carlos Garnacho <carlosg@gnome.org> + Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> + Reviewed-by: Olivier Fourdan <ofourdan@redhat.com> + (cherry picked from commit 78cc8b6f9613fc71f6ecc7e8848d54364a250634) + +commit 12db645c7fc0539752a881df7ac2bcd09e3cb17b +Author: Carlos Garnacho <carlosg@gnome.org> +Date: Mon Jan 7 15:33:31 2019 +0100 + + xwayland: Refactor surface creation into a separate function + + This is just called from xwl_window_realize() ATM, but will be useful in + future commits. + + Signed-off-by: Carlos Garnacho <carlosg@gnome.org> + (cherry picked from commit c2e8ae964052944312c5023ca7ea5c41a92990e5) + +commit e0af09061f9e8397ca564ec3bbedea51974455d4 +Author: Carlos Garnacho <carlosg@gnome.org> +Date: Mon Jan 7 15:20:05 2019 +0100 + + xwayland: Separate DamagePtr into separate window data + + This will be dissociated in future commits to handle the cases + where windows are being realized before there is a compositor + handling redirection. + + In that case, we still want the DamagePtr to be registered upfront + on RealizeWindowProc before a corresponding xwl_window might be + created. Most notably, it cannot be lazily created on + SetWindowPixmapProc as damage accounting gets broken. + + Signed-off-by: Carlos Garnacho <carlosg@gnome.org> + (cherry picked from commit 4e50440ae20c537d6a4edf356cda67dd33d4e5a8) + +commit 045add84927051a33569ed701097e1fd514bf0ca +Author: Adam Jackson <ajax@redhat.com> +Date: Fri Aug 16 14:56:19 2019 -0400 + + glx: Fix previous context validation in xorgGlxMakeCurrent + + vnd has already verified that the context tag is valid before this gets + called, and we only set the context tag private data to non-null for + indirect clients. Mesa happens to be buggy and doesn't send MakeCurrent + requests nearly as much as it should for direct contexts, but if you fix + that, then unbinding a direct context would fail here with + GLXBadContextTag. + + Sadly Mesa will still need to carry a workaround here for broken + servers, but we should still fix the server. + + (cherry picked from commit 95dcc81cb122e5a4c5b38e84ef46eb872b2e1431) + +commit 8449c8623d6208b77e76596e8b10250817d3e8ab +Author: Adam Jackson <ajax@redhat.com> +Date: Mon Aug 19 14:27:54 2019 -0400 + + miext/sync: Fix needless ABI change + + The initialized field was added in: + + commit 82f01ad7869e3f2be51e41a8246dab5982bbc36a + Author: Alex Goins <agoins@nvidia.com> + Date: Wed Apr 10 13:48:02 2019 -0500 + + xsync: Add resource inside of SyncCreate, export SyncCreate + + But it added this field not at the end of SyncObject. It may not have + been _usefully_ possible to create those from another extension prior to + that commit, but that's still an ABI-incompatible change. + + (cherry picked from commit 194ba38728b34a76885275dae153057c8afaf72e) + +commit 39b3005c329bc63676df72c43529d641bf305bcd +Author: Aaron Plattner <aplattner@nvidia.com> +Date: Tue May 21 10:50:42 2019 -0700 + + GLX: Set GlxServerExports::{major,minor}Version + + Commit 56c0a71fdd94a008e5d746261f70a713c4767f93 incremented the + GLXSERVER_VENDOR_ABI_MINOR_VERSION define, but this define was not actually + being used to set glxServer.minorVersion. + + Update the initializer for glxServer to use the correct version numbers. + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + (cherry picked from commit b4231d69028adc8123801a7552b40a15ea928d1b) + +commit d3034ef2f5121d85ae766a73fda4e523399043a9 +Author: Kyle Brenneman <kbrenneman@nvidia.com> +Date: Thu May 2 07:17:21 2019 -0600 + + GLX: Add a function to change a clients vendor list. + + Add a new function, GlxServerExports::setClientScreenVendor, which will change + the vendor that handles GLX requests for a screen, but only for requests from + a specific client. + + v2: Increment the GLXVND minor version number. + v3: Note the GLXVND version requirement for setClientScreenVendor. + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + (cherry picked from commit 56c0a71fdd94a008e5d746261f70a713c4767f93) + +commit abeae4a6d356653d50026707ecc2afceac83631e +Author: Kyle Brenneman <kbrenneman@nvidia.com> +Date: Wed May 8 08:44:54 2019 -0600 + + GLX: Use the sending client for looking up XID's + + When GlxGetXIDMap looks up an unknown XID, it will now look up a vendor based + on the screen number for the XID and the client that sent the current request. + + In GlxGetXIDMap, if the XID is for a regular X window, then it won't be in the + (XID -> vendor) mapping, so we have to look up a vendor by screen number. + + With this change, GlxGetXIDMap will use the (screen -> vendor) map for + whichever client sent the current request, instead of using the global + (screen -> vendor) map. + + Since GlxGetXIDMap doesn't take a ClientPtr argument, GlxDispatchRequest will + store the client for the current request in a global variable. That way, the + ABI for GLXVND doesn't need to change. + + v2: Fix an error check in GlxDispatchRequest. + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + (cherry picked from commit 8b67ec7cc6fda243480a5a8ca118b66242f3eb2c) + +commit 1fdb7cbce538f0b37304a3cfc9fae4ff2fe9ece9 +Author: Kyle Brenneman <kbrenneman@nvidia.com> +Date: Thu Oct 19 15:14:51 2017 -0600 + + GLX: Add a per-client vendor mapping. + + Each client now has its own (screen, vendor) mapping. + + Currently, it's just a copy of the global mapping, but later changes will allow + it to change. + + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Aaron Plattner <aplattner@nvidia.com> + Reviewed-by: Adam Jackson <ajax@redhat.com> + (cherry picked from commit 37a36a6b5b887d5c5a17a6931ceba8ad5d1bb6d5) + +commit 82f01ad7869e3f2be51e41a8246dab5982bbc36a +Author: Alex Goins <agoins@nvidia.com> +Date: Wed Apr 10 13:48:02 2019 -0500 + + xsync: Add resource inside of SyncCreate, export SyncCreate + + As shown by DRI3 adding the SyncCreateFenceFromFD() function, extensions may + want to create a fence, then initialize it in their own way. This currently + can't be done without adding a function directly to Xext/sync.c due to the fact + that the RTFence resource type is private and there is no external interface to + add to it. + + To facilitate other X extensions creating fences and initializing them, this + change exports SyncCreate() and adds the resource directly within it. Callers no + longer need to call AddResource() after SyncCreate(), they only need to + initialize the SyncObject. + + To prevent FreeFence() and FreeCounter() from segfaulting if the call to + AddResource() fails before the sync object is initialized, this adds a new + 'initialized' parameter to SyncObject that, when FALSE, causes FreeFence() and + FreeCounter() to skip de-initialization and simply free the object. + Initialization after adding the resource shouldn't otherwise be a problem due to + the single-threaded nature of X. + + Signed-off-by: Alex Goins <agoins@nvidia.com> + Reviewed-by: James Jones <jajones@nvidia.com> + Signed-off-by: Aaron Plattner <aplattner@nvidia.com> + (cherry picked from commit 7f962c70b6d9c346477f23f6c15211e749110078) + +commit dfd51be3ca2a244bbca27a95310b60e0c14940df +Author: Olivier Fourdan <ofourdan@redhat.com> +Date: Tue Jul 23 11:01:47 2019 +0200 + + xwayland: Do not free a NULL GBM bo + + Both `gbm_bo_create()` and `gbm_bo_create_with_modifiers()` can fail and + return `NULL`. + + If that occurs, `xwl_glamor_gbm_create_pixmap()` will not create a + pixmap for the (NULL) GBM bo, but would still try to free the bo which + leads to a crash in mesa: + + [...] + #7 <signal handler called> + #8 in gbm_bo_destroy (bo=0x0) at ../src/gbm/main/gbm.c:439 + #9 in xwl_glamor_gbm_create_pixmap () at xwayland-glamor-gbm.c:245 + #10 in ProcCreatePixmap () at dispatch.c:1440 + #11 in Dispatch () at dispatch.c:478 + #12 in dix_main () at main.c:276 + + To avoid the crash, only free the GBM bo if not `NULL`. + + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> + Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> + Bugzilla: https://bugzilla.redhat.com/1729925 + (cherry picked from commit d9ec525059dbe96fc893c73c0362be2a6dd73e85) + +commit df7ee10d9812897b297c67fde29f0b134ffba3ec +Author: Adam Jackson <ajax@redhat.com> +Date: Mon Jul 15 11:38:44 2019 -0400 + + xwayland: Expand the RANDR screen size limits + + There's not really a good way to query this from the wayland server, so + just set the maximum to the X11 protocol limits. While we're at it, + lower the minimum screen size to something implausibly small too, just + in case. + + Fixes: xorg/xserver#850 + Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> + (cherry picked from commit d0850241c6218f61127c45c2f95d6e791c3fea44) + +commit 44c693f45d6abd6f7f3bd2f756d35811db143af7 +Author: Olivier Fourdan <ofourdan@redhat.com> +Date: Fri Jun 28 16:55:11 2019 +0200 + + xwayland: Update screen pixmap on output resize + + Running Xwayland non-rootless and resizing the output would lead to a + crash while trying to update the larger areas of the root window. + + Make sure we resize the backing pixmap according to the new output size + to avoid the crash. + + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> + Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/834 + Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> + (cherry picked from commit ce9455b5ee389b100a9b7da76b79690d97211b7a) + +commit 1804e7327113d128ac9a759da55fd3de0b9f8c35 +Author: Matt Roper <matthew.d.roper@intel.com> +Date: Wed Jun 26 09:34:46 2019 -0700 + + dri2: Sync i965_pci_ids.h from mesa + + Copied from Mesa with no modifications. + + This update brings in a significant number of new platform ID's. + + Syncs with mesa up to commit e334a595e ("intel/icl: Add new ICL + PCI-IDs"). + + Signed-off-by: Matt Roper <matthew.d.roper@intel.com> + (cherry picked from commit a8d9ebeb43583e8d8ef182ac15adbdce256d4867) + +commit 98e3db2ac43d4a3f13475cb160c8ce0155ac7d61 +Author: Marco Trevisan (Treviño) <mail@3v1n0.net> +Date: Fri Oct 26 19:52:49 2018 +0200 + + Xi: Use current device active grab to deliver touch events if any + + When Retrieving touch delivery data we need to check if we have an active + grab on such device, and in that case use it to delivery events. + If we don't do this, when rejecting the touch events in DeactivatePointerGrab, + we will end-up in creating an implicit grab that will change the device + deviceGrab's state, causing a recursion during TouchEndTouch. + + Fixes #7 + + https://bugs.freedesktop.org/show_bug.cgi?id=96536 + (cherry picked from commit 35e5a76cc1d02801fadd49d12e60664b02e4bebc) + +commit 26b6ba5347953ed5f60b7fb9454b45754b145c6f +Author: Michel Dänzer <michel.daenzer@amd.com> +Date: Wed Jul 3 11:53:56 2019 +0200 + + Revert "present/scmd: Check that the flip and screen pixmap pitches match" + + This reverts commit ef91da2757050652c724f6e674e8b1acf5d0cb31. + + I thought this couldn't work under any circumstances, but I was wrong, + and drivers are already checking for cases that really cannot work. + + Fixes issue #839. + + (cherry picked from commit 2f0dd1816d556eef8c4b691330d39f13e1ed93f0) + +commit c86222d4bd94892f3bf3c5947c19793ca18bd9e2 +Author: Carlos Garnacho <carlosg@gnome.org> +Date: Wed May 22 17:51:04 2019 +0200 + + xwayland: Reset scheduled frames after hiding tablet cursor + + Hiding the tablet tool cursor results in it being hidden forever after. + This is due to the stale frame callback that will neither be disposed + or replaced. This can be reproduced in krita (X11) as the pointer + cursor is hidden while over the canvas. + + Clearing the frame callback ensures the correct behavior in future + xwl_tablet_tool_set_cursor() calls (i.e. a new cursor surface being + displayed, and a new frame callback created), and is 1:1 + with xwl_seat_set_cursor() for pointers. + + Signed-off-by: Carlos Garnacho <carlosg@gnome.org> + (cherry picked from commit dea4a74621294391ce5901bb3339e1b8e7151efc) + +commit 6e199e4613e149cd5d5ce69cdd6a259744b6cb44 +Author: Olivier Fourdan <ofourdan@redhat.com> +Date: Fri Apr 26 13:37:09 2019 +0200 + + glamor: Make pixmap exportable from `gbm_bo_from_pixmap()` + + If a pixmap is not exportable, `glamor_gbm_bo_from_pixmap()` would fail + and the modesettings driver would consequently fail to do its page flip, + which both prevents Present from working and also fill up the logs with + error messages such as: + + (EE) modeset(0): Failed to get GBM bo for flip to new front. + (EE) modeset(0): present flip failed + + Refactor the code so that `glamor_gbm_bo_from_pixmap()` takes care of + making the pixmap exportable. + + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> + Signed-off-by: Yuxuan Shui yshui@hadean.com + See-also: https://gitlab.freedesktop.org/xorg/xserver/merge_requests/131 + Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/68 + Fixes: 86b2d8740a "glamor: Reallocate pixmap storage without modifiers + if necessary" + (cherry picked from commit 26fe29f4fa53cbb7d51892e2cf397c084093812f) + +commit 34ad57e570f96dfe4bc493f14726b7a0ae6d45f9 +Author: Olivier Fourdan <ofourdan@redhat.com> +Date: Tue Mar 12 15:38:03 2019 +0100 + + xwayland: Check status in GBM pixmap creation + + The current code in `xwl_glamor_gbm_create_pixmap_for_bo()` may fail in + several cases that are not checked for: + + - `eglCreateImageKHR()` may have failed to create the image, + - `glEGLImageTargetTexture2DOES()` may fail and set an error, + - `glamor_set_pixmap_texture()` may fail for very large pixmaps + because the corresponding FBO could not be created. + + Trying to upload content to a pixmap with no texture will crash Mesa, + glamor and Xwayland, e.g.: + + XXX fail to create fbo. + (EE) + (EE) Backtrace: + (EE) 0: Xwayland (OsSigHandler+0x29) + (EE) 1: libpthread.so.0 (funlockfile+0x50) + (EE) 2: libc.so.6 (__memmove_avx_unaligned_erms+0x215) + (EE) 3: dri/i965_dri.so (_mesa_format_convert+0xab3) + (EE) 4: dri/i965_dri.so (_mesa_texstore+0x205) + (EE) 5: dri/i965_dri.so (store_texsubimage+0x28c) + (EE) 6: dri/i965_dri.so (intel_upload_tex+0x13b) + (EE) 7: dri/i965_dri.so (texture_sub_image+0x134) + (EE) 8: dri/i965_dri.so (texsubimage_err+0x150) + (EE) 9: dri/i965_dri.so (_mesa_TexSubImage2D+0x48) + (EE) 10: Xwayland (glamor_upload_boxes+0x246) + (EE) 11: Xwayland (glamor_copy+0x4d1) + (EE) 12: Xwayland (miCopyRegion+0x96) + (EE) 13: Xwayland (miDoCopy+0x43c) + (EE) 14: Xwayland (glamor_copy_area+0x24) + (EE) 15: Xwayland (damageCopyArea+0xba) + (EE) 16: Xwayland (compCopyWindow+0x31c) + (EE) 17: Xwayland (damageCopyWindow+0xd3) + (EE) 18: Xwayland (miResizeWindow+0x7b7) + (EE) 19: Xwayland (compResizeWindow+0x3a) + (EE) 20: Xwayland (ConfigureWindow+0xa96) + (EE) 21: Xwayland (ProcConfigureWindow+0x7d) + (EE) 22: Xwayland (Dispatch+0x320) + (EE) 23: Xwayland (dix_main+0x366) + (EE) 24: libc.so.6 (__libc_start_main+0xf3) + (EE) 25: Xwayland (_start+0x2e) + (EE) + Fatal server error: + (EE) Caught signal 11 (Segmentation fault). Server aborting + (EE) + + Check for the possible cases of failure above and fallback to the + regular glamor pixmap creation when an error is detected. + + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> + Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/661 + (cherry picked from commit fc6380a11be4c6202ed72f241dd9ee8c7c24671d) + +commit 6711b5c6fdf0581c77150306fff909d7bc63b8a4 +Author: Olivier Fourdan <ofourdan@redhat.com> +Date: Thu May 9 10:36:19 2019 +0200 + + xwayland: Avoid a crash on pointer enter with a grab + + On pointer enter notification, Xwayland checks for an existing pointer + warp with a `NULL` sprite. + + In turn, `xwl_pointer_warp_emulator_maybe_lock()` checks for an existing + grab and the destination window using `XYToWindow()` which does not + check for the actual sprite not being `NULL`. + + So, in some cases, when the pointer enters the surface and there is an + existing X11 grab which is not an ownerEvents grab, Xwayland would crash + trying to dereference the `NULL` sprite pointer: + + #0 __GI_raise () + #1 __GI_abort () at abort.c:79 + #2 OsAbort () at utils.c:1351 + #3 AbortServer () at log.c:879 + #4 FatalError () at log.c:1017 + #5 OsSigHandler () at osinit.c:156 + #6 OsSigHandler () at osinit.c:110 + #7 <signal handler called> + #8 XYToWindow (pSprite=0x0, x=0, y=0) at events.c:2880 + #9 xwl_pointer_warp_emulator_maybe_lock () at xwayland-input.c:2673 + #10 pointer_handle_enter () at xwayland-input.c:434 + + Avoid the crash by simply checking for the sprite being not `NULL` in + `xwl_pointer_warp_emulator_maybe_lock()` + + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> + Bugzilla: https://bugzilla.redhat.com/1708119 + (cherry picked from commit 0a07446318f248b65fcbc8ab8a73ead51153f09e) + commit fbbdd5613122f0f7d74471f240c28e4c3b796065 Author: Adam Jackson <ajax@redhat.com> Date: Thu May 30 14:07:06 2019 -0400 @@ -15902,7 +16828,7 @@ Date: Fri Oct 28 09:28:32 2016 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 356db2340f5b473a7191c7969586ca5b0396c48f -Merge: 9ed5b26354 03d99ef729 +Merge: 9ed5b2635 03d99ef72 Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 28 09:05:54 2016 -0700 @@ -17843,7 +18769,7 @@ Date: Sun Sep 11 03:07:44 2016 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 265c4e66533243b60d92cffc7769ecadb0292c8d -Merge: 3caf671ed2 f5f4d32ac7 +Merge: 3caf671ed f5f4d32ac Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 15 21:32:46 2016 -0700 @@ -19028,7 +19954,7 @@ Date: Fri Jul 29 17:45:45 2016 -0700 Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com> commit 387d6b5df3e11de5cb88db8a559128fcb62e4e5a -Merge: d2558f063a 8bb9d460fb +Merge: d2558f063 8bb9d460f Author: Keith Packard <keithp@keithp.com> Date: Sat Aug 13 09:12:19 2016 -0700 @@ -21227,7 +22153,7 @@ Date: Tue May 10 00:29:58 2016 +0000 Signed-off-by: Guilherme Quentel Melo <gqmelo@gmail.com> commit 266cf39a8f108e2f365a9772f4ee4d9fca88eb36 -Merge: fa7b70a9b8 848089e0dd +Merge: fa7b70a9b 848089e0d Author: Adam Jackson <ajax@redhat.com> Date: Mon Jun 20 11:21:40 2016 -0400 @@ -21870,7 +22796,7 @@ Date: Wed Mar 9 10:31:13 2016 +0100 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3735ab965a4642273d070840bda4e827991e5219 -Merge: 7c77c42fe8 43dbc556f3 +Merge: 7c77c42fe 43dbc556f Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 2 07:47:16 2016 -0700 @@ -27635,7 +28561,7 @@ Date: Mon Sep 21 07:16:12 2015 +0100 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 5b582a4a0350c253d729efb31b710851ae9a958e -Merge: 1d4aa67242 27ad21254f +Merge: 1d4aa6724 27ad21254 Author: Adam Jackson <ajax@redhat.com> Date: Mon Oct 19 12:23:22 2015 -0400 @@ -28246,7 +29172,7 @@ Date: Fri Sep 25 14:04:34 2015 +0100 Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> commit dca5770af9e20bb1148374ebfd60931a81b148a2 -Merge: a31bbc450a 21f384b7b8 +Merge: a31bbc450 21f384b7b Author: Adam Jackson <ajax@redhat.com> Date: Fri Sep 25 10:23:28 2015 -0400 @@ -28880,7 +29806,7 @@ Date: Mon Sep 21 15:23:23 2015 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit b25f7d0c165c4d32c73fbdf9080012503d319ba1 -Merge: db1089eafc 1ba4fde101 +Merge: db1089eaf 1ba4fde10 Author: Adam Jackson <ajax@redhat.com> Date: Mon Sep 21 17:34:48 2015 -0400 @@ -29503,7 +30429,7 @@ Date: Tue Jul 7 18:19:50 2015 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7ecdfbf0af3547295b245efa754123db65cabb43 -Merge: bca4f4b56c a0b4f30b1f +Merge: bca4f4b56 a0b4f30b1 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 17 18:53:25 2015 -0700 @@ -29750,7 +30676,7 @@ Date: Thu Jul 16 15:12:52 2015 -0700 Signed-off-by: Eric Anholt <eric@anholt.net> commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc -Merge: cb695b0f3b 7b0f940625 +Merge: cb695b0f3 7b0f94062 Author: Eric Anholt <eric@anholt.net> Date: Fri Jul 17 10:15:01 2015 -0700 @@ -30357,7 +31283,7 @@ Date: Tue Jun 30 14:54:42 2015 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 991712f1e8deeb6289ee0abd9910e279d6396246 -Merge: 0cd228073a 3c859112d3 +Merge: 0cd228073 3c859112d Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 8 10:43:31 2015 -0700 @@ -30909,28 +31835,28 @@ Date: Tue May 12 14:19:15 2015 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8a8d51358cea782147bb9b5b2e0902b1e47fcf4a -Merge: b22534d8e6 13c7d53df8 +Merge: b22534d8e 13c7d53df 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: 0a625adeec 780a69aff0 +Merge: 0a625adee 780a69aff 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: 84128c10bb 790311cec3 +Merge: 84128c10b 790311cec 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: 9003a3e5c5 8c86dd5160 +Merge: 9003a3e5c 8c86dd516 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 29 20:59:31 2015 -0700 @@ -31954,14 +32880,14 @@ Date: Tue Mar 17 10:21:12 2015 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0409b6e6d63e9cfb5dc71bb27de4b1ed0152dd9b -Merge: c39c3a9750 23702dd268 +Merge: c39c3a975 23702dd26 Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 16:50:43 2015 -0700 Merge remote-tracking branch 'evelikov/master' commit c39c3a97508dc384c0757a0990c07b5d7b2fe97a -Merge: 6b65e96189 7470578520 +Merge: 6b65e9618 747057852 Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 16:34:48 2015 -0700 @@ -31980,7 +32906,7 @@ Date: Wed May 6 15:07:21 2015 +1200 Signed-off-by: Keith Packard <keithp@keithp.com> commit d7091a21d90cf463ae39ec5e8741123218ec5686 -Merge: c3ce9d8fd4 8fb8bbb306 +Merge: c3ce9d8fd 8fb8bbb30 Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 15:49:34 2015 -0700 @@ -32048,7 +32974,7 @@ Date: Sat Apr 25 21:19:25 2015 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b -Merge: 28ff661e73 c7b49bdbb9 +Merge: 28ff661e7 c7b49bdbb Author: Keith Packard <keithp@keithp.com> Date: Mon May 11 15:36:53 2015 -0700 @@ -32712,7 +33638,7 @@ Date: Tue Dec 30 09:13:15 2014 -0800 Acked-by: Alex Deucher <alexander.deucher@amd.com> commit e608f3521eaaab972a3eea62aa04a65958351c1c -Merge: d3b9c47c84 5de1383070 +Merge: d3b9c47c8 5de138307 Author: Keith Packard <keithp@keithp.com> Date: Tue Mar 31 09:06:08 2015 -0700 @@ -32784,7 +33710,7 @@ Date: Tue Mar 31 11:18:44 2015 +1000 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 7088816fee0ca7d609c7bca41ef8c3fc938556f5 -Merge: 95e83ff87a e977b404d7 +Merge: 95e83ff87 e977b404d Author: Keith Packard <keithp@keithp.com> Date: Fri Mar 27 06:45:56 2015 -0700 @@ -34273,7 +35199,7 @@ Date: Thu Jan 15 22:03:18 2015 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5f2e8ac51ccbf7c02f25c8cb7617df0238418cd1 -Merge: 4e12d7b6f4 4301479508 +Merge: 4e12d7b6f 430147950 Author: Keith Packard <keithp@keithp.com> Date: Sat Jan 10 14:51:57 2015 +1300 @@ -34357,7 +35283,7 @@ Date: Sun Jan 4 19:13:35 2015 -0800 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 1c01633877caa4239f901f02fbe113926318d030 -Merge: 3573855514 e774663fa5 +Merge: 357385551 e774663fa Author: Keith Packard <keithp@keithp.com> Date: Sun Jan 4 17:02:25 2015 -0800 @@ -35100,7 +36026,7 @@ Date: Mon Dec 1 16:06:17 2014 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6704bb0ed7a10dabe8ef3bb3adf8b8a7f29a78f0 -Merge: 8aa23f27c7 1559a94395 +Merge: 8aa23f27c 1559a9439 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 9 11:47:11 2014 -0800 @@ -35698,14 +36624,14 @@ Date: Fri Jan 17 18:54:03 2014 -0800 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3e7218a6c23354d66f508b18164cac98a346b3ee -Merge: 6f4c398a0e bc71081f0e +Merge: 6f4c398a0 bc71081f0 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: aae6460694 5920433c3a +Merge: aae646069 5920433c3 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 8 18:04:08 2014 -0800 @@ -36023,7 +36949,7 @@ Date: Tue Nov 11 12:30:07 2014 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit ec0ac8970b508adcbc3d104b14a127118e4979d0 -Merge: 65cc0982af 0f88d4e793 +Merge: 65cc0982a 0f88d4e79 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 24 15:39:51 2014 -0800 @@ -36569,7 +37495,7 @@ Date: Tue Oct 21 15:03:55 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 3a123fbdda56b24dc01a2308137144dc960e0d61 -Merge: 9b29fa957a 7ea4a21fee +Merge: 9b29fa957 7ea4a21fe Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 27 15:39:26 2014 -0700 @@ -36612,7 +37538,7 @@ Date: Mon Oct 27 15:28:14 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 59b12c454d9c4b5a26c6ad87c53abc671b15ce37 -Merge: 5574a0a07e cac4b064f9 +Merge: 5574a0a07 cac4b064f Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 27 14:48:55 2014 -0700 @@ -37090,7 +38016,7 @@ Date: Thu Oct 9 09:58:06 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit de55aafa8f6a9e0dec364bec920d6f91ef2b39f0 -Merge: 462bf87c4d c79f824bf6 +Merge: 462bf87c4 c79f824bf Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 23 17:28:24 2014 -0700 @@ -37329,21 +38255,21 @@ Date: Thu Oct 9 15:17:17 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit d634ecdf82f244ff8ce75d351fc175792d254e5c -Merge: 6622f0cb17 7ebf480f5e +Merge: 6622f0cb1 7ebf480f5 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: f12e7f4980 5ecd7866f7 +Merge: f12e7f498 5ecd7866f 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: da887726ee aaf5e2d643 +Merge: da887726e aaf5e2d64 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 9 14:21:19 2014 +0200 @@ -37721,7 +38647,7 @@ Date: Thu Oct 2 10:26:53 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit e9651e3dbc32650fcaf90888b4cbef81da77cfcd -Merge: 9bc01dfc70 4433bc6d53 +Merge: 9bc01dfc7 4433bc6d5 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 2 10:24:33 2014 -0700 @@ -37793,7 +38719,7 @@ Date: Thu Sep 25 15:27:22 2014 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 78c27d12e1f4857bfcfc92afbb69d5dd989232b9 -Merge: 6e50bfa706 1d6334dd0c +Merge: 6e50bfa70 1d6334dd0 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 29 13:04:49 2014 -0700 @@ -38250,7 +39176,7 @@ Date: Wed Sep 17 07:41:27 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit eaee6572beefca240c42791f9a3a6e547bedd410 -Merge: e3aa13b8d6 b84d25fd53 +Merge: e3aa13b8d b84d25fd5 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 17 15:49:24 2014 -0700 @@ -38937,7 +39863,7 @@ Date: Wed Sep 10 16:20:45 2014 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 54a1d4db825be90fb7be138e3267a15922d62f03 -Merge: 8f8dcfee20 f92df22a03 +Merge: 8f8dcfee2 f92df22a0 Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 11 18:27:41 2014 -0700 @@ -39236,7 +40162,7 @@ Date: Fri Jun 13 16:16:51 2014 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 35dc7c75150733dbcef8a18b6796f49a7c48ebee -Merge: 3a51418b2d 5f3485b06e +Merge: 3a51418b2 5f3485b06 Author: Eric Anholt <eric@anholt.net> Date: Mon Aug 25 15:52:58 2014 -0700 @@ -39447,7 +40373,7 @@ Date: Mon Aug 11 15:23:02 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d09c9ddb866dea31e2adf82be329d5d3489718f5 -Merge: 606b701c56 ab32ee3589 +Merge: 606b701c5 ab32ee358 Author: Keith Packard <keithp@keithp.com> Date: Tue Aug 12 16:34:24 2014 -0700 @@ -40454,7 +41380,7 @@ Date: Tue Jul 22 17:55:25 2014 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 556cdf8fe870bc23e0393c0eed15c86f49a0b9f8 -Merge: 83701c4ee8 1faa766705 +Merge: 83701c4ee 1faa76670 Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 24 16:51:00 2014 -0700 @@ -40685,14 +41611,14 @@ Date: Fri Jul 18 09:13:54 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5c2e9fa3d6c4bdf626fededce866056ba8eca502 -Merge: e678b4971b 6d49548849 +Merge: e678b4971 6d4954884 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: 9ddcb20f47 55f5bfb578 +Merge: 9ddcb20f4 55f5bfb57 Author: Eric Anholt <eric@anholt.net> Date: Thu Jul 17 18:00:44 2014 -0700 @@ -41224,7 +42150,7 @@ Date: Mon Jul 7 08:27:44 2014 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3 -Merge: 9308eafb7d a5499870e2 +Merge: 9308eafb7 a5499870e Author: Keith Packard <keithp@keithp.com> Date: Mon Jul 7 16:53:07 2014 -0700 @@ -41475,7 +42401,7 @@ Date: Mon Jun 16 08:06:53 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 736bed2aaf4bb672b6c7b33146fe84700baf22bd -Merge: ce581ac3fa d90b5f8301 +Merge: ce581ac3f d90b5f830 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 23 14:18:03 2014 -0700 @@ -41514,7 +42440,7 @@ Date: Mon Feb 24 11:36:54 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit ea47341792cf06eda5bbdf0aca48aacc024a5be0 -Merge: 334faabe68 a11bbd875f +Merge: 334faabe6 a11bbd875 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 23 13:50:54 2014 -0700 @@ -42245,7 +43171,7 @@ Date: Wed May 28 08:13:59 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit b5526141f78df15bc5df2497bc4b4a17f1a6368d -Merge: dc8d068847 a205ec3ab7 +Merge: dc8d06884 a205ec3ab Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 2 13:08:23 2014 -0700 @@ -42262,7 +43188,7 @@ Date: Mon Jun 2 01:17:31 2014 +0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit a6ffdc69c4ac45bc39924159c7fab5f02f720f1f -Merge: 63c48de63b 1c10b37380 +Merge: 63c48de63 1c10b3738 Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 2 11:30:24 2014 -0700 @@ -42287,7 +43213,7 @@ Date: Fri May 30 16:50:35 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit ab47ec9636b21a7f542d2e8612834915e7c8cc64 -Merge: 0df871cf34 cfaf2abbac +Merge: 0df871cf3 cfaf2abba Author: Keith Packard <keithp@keithp.com> Date: Mon Jun 2 11:22:48 2014 -0700 @@ -42667,7 +43593,7 @@ Date: Wed Apr 30 10:55:26 2014 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit d60724b752613ce2ad11c6ae102bf4513f9768ff -Merge: a5b9757142 15460eaed2 +Merge: a5b975714 15460eaed Author: Keith Packard <keithp@keithp.com> Date: Thu May 8 12:58:41 2014 -0700 @@ -42879,7 +43805,7 @@ Date: Thu Apr 24 13:38:28 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6bd7ad914470322ddd02b50078e159234ebec643 -Merge: b92a9289fe e06fbe4dc8 +Merge: b92a9289f e06fbe4dc Author: Keith Packard <keithp@keithp.com> Date: Tue Apr 29 09:37:37 2014 -0700 @@ -43662,7 +44588,7 @@ Date: Mon Apr 21 16:30:49 2014 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit ba5c2b6c876a15fe18bc1ff1ab4e773c46bc9009 -Merge: 9c86d5f4f6 66b6024740 +Merge: 9c86d5f4f 66b602474 Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 21 14:59:51 2014 -0700 @@ -44082,7 +45008,7 @@ Date: Tue Apr 8 01:01:28 2014 -0700 Reviewed-by: Eric Anholt <eric@anholt.net> commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 -Merge: bd3de10f86 ec6007e6f7 +Merge: bd3de10f8 ec6007e6f Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 9 21:59:17 2014 -0700 @@ -44176,7 +45102,7 @@ Date: Thu Apr 3 18:22:50 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit b4d0bec22c15930abf13a7fb9d684208ccd56b1d -Merge: 3c34dd3603 6e539d8817 +Merge: 3c34dd360 6e539d881 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 3 15:35:01 2014 -0700 @@ -44445,7 +45371,7 @@ Date: Fri Mar 21 13:13:27 2014 -0700 Reviewed-by: Julien Cristau <jcristau@debian.org> commit 84f977467b514af88019ab2791bf7a74530b54df -Merge: 9d20d18fb9 98924719d5 +Merge: 9d20d18fb 98924719d Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 3 10:44:28 2014 -0700 @@ -44606,7 +45532,7 @@ Date: Wed Mar 26 12:24:49 2014 +0100 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3 -Merge: 8468e24430 bc348bd2c4 +Merge: 8468e2443 bc348bd2c Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 31 23:24:56 2014 -0700 @@ -45129,7 +46055,7 @@ Date: Tue Mar 25 13:48:52 2014 -0400 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit bda6fdc71c25b0c3f3747f445103a1995a5713f4 -Merge: e46820fb89 78167a98a8 +Merge: e46820fb8 78167a98a Author: Keith Packard <keithp@keithp.com> Date: Tue Mar 25 16:06:03 2014 -0700 @@ -45248,7 +46174,7 @@ Date: Sat Mar 22 14:30:04 2014 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d9fdae5f4a648a10653e18dbc602646f3e22e522 -Merge: 99bee6c054 0e5d2996ac +Merge: 99bee6c05 0e5d2996a Author: Keith Packard <keithp@keithp.com> Date: Sat Mar 22 14:09:00 2014 -0700 @@ -45282,7 +46208,7 @@ Date: Fri Jan 17 09:54:01 2014 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1782316744866a181ed92486bb4dca6ac46d40bd -Merge: 4fb31e4824 2b77b208da +Merge: 4fb31e482 2b77b208d Author: Keith Packard <keithp@keithp.com> Date: Sat Mar 22 13:46:15 2014 -0700 @@ -45516,7 +46442,7 @@ Date: Wed Mar 19 10:27:39 2014 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 4fb31e4824d46edc80bb49b4065152899faa5ac6 -Merge: d18d3f6d18 0e531fbb97 +Merge: d18d3f6d1 0e531fbb9 Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 19 06:43:14 2014 -0700 @@ -45532,7 +46458,7 @@ Date: Wed Mar 12 16:31:25 2014 +1000 Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> commit d18d3f6d18aa7827748f7ba14efd405b525883d0 -Merge: 81a4952d3d 6649d0059e +Merge: 81a4952d3 6649d0059 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 17 17:29:56 2014 -0700 @@ -46191,7 +47117,7 @@ Date: Fri Mar 7 14:32:28 2014 -0800 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4 -Merge: 96a28e9c91 795066477e +Merge: 96a28e9c9 795066477 Author: Keith Packard <keithp@keithp.com> Date: Tue Mar 11 22:04:36 2014 -0700 @@ -46551,7 +47477,7 @@ Date: Mon Mar 10 08:58:37 2014 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1c61d38528a573caadee2468ee59ea558c822e09 -Merge: 5350ae1d38 bf3543739d +Merge: 5350ae1d3 bf3543739 Author: Keith Packard <keithp@keithp.com> Date: Fri Mar 7 22:07:19 2014 -0800 @@ -47090,7 +48016,7 @@ Date: Sun Feb 9 11:20:59 2014 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1940508a4af33d44a7a8ef24bbdcd1e31e228dab -Merge: c85ea92af1 ddeca92749 +Merge: c85ea92af ddeca9274 Author: Keith Packard <keithp@keithp.com> Date: Mon Feb 24 16:27:52 2014 -0800 @@ -47105,7 +48031,7 @@ Date: Mon Feb 24 09:51:39 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0840a303c47b9b10ba8e24e62956da0f1675e963 -Merge: 0f10cfd4b9 3d71df48e7 +Merge: 0f10cfd4b 3d71df48e Author: Keith Packard <keithp@keithp.com> Date: Mon Feb 24 09:40:23 2014 -0800 @@ -47471,7 +48397,7 @@ Date: Sun Feb 9 16:56:40 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5300212ce8e9364ba26497605f3edc089af20130 -Merge: ae796d43c9 0b193b3ac9 +Merge: ae796d43c 0b193b3ac Author: Keith Packard <keithp@keithp.com> Date: Sun Feb 9 16:05:42 2014 -0800 @@ -48034,14 +48960,14 @@ Date: Tue Jan 28 20:27:49 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit da1660deeb9032ecca61f4bcdc9fc2eec2ada445 -Merge: 0fbb3d711e 9fc19168e7 +Merge: 0fbb3d711 9fc19168e 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: 7ddef4f703 b98e49379c +Merge: 7ddef4f70 b98e49379 Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 27 14:11:09 2014 -0800 @@ -48529,14 +49455,14 @@ Date: Wed Dec 11 11:55:37 2013 -0800 Reviewed-by: Eric Anholt <eric@anholt.net> commit 25ebb9dbc9df659dec2bf6c27654a5bad2d11f94 -Merge: 409e8e29fb 71baa466b1 +Merge: 409e8e29f 71baa466b 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: 457bc83549 d6c8d75097 +Merge: 457bc8354 d6c8d7509 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:32:35 2014 -0800 @@ -48564,21 +49490,21 @@ Date: Sat Jan 4 00:09:45 2014 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 044a6ef2ff5f2c83a80b11e747f62f48830b526b -Merge: 0b932cf47a 77df653ae3 +Merge: 0b932cf47 77df653ae Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:28:54 2014 -0800 Merge remote-tracking branch 'jeremyhu/master' commit 0b932cf47a4df8ea0f7488e285d218fe7c10dd77 -Merge: 1d76b02fac 295d41fa2a +Merge: 1d76b02fa 295d41fa2 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: 771f390efd 4dd62d7807 +Merge: 771f390ef 4dd62d780 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 22 11:22:35 2014 -0800 @@ -49513,7 +50439,7 @@ Date: Thu Dec 19 14:31:07 2013 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0 -Merge: 4d62646142 929795d50d +Merge: 4d6264614 929795d50 Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 19 14:14:59 2013 -0800 @@ -52788,7 +53714,7 @@ Date: Wed Nov 2 13:44:50 2011 +0800 Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com> commit 2dbbe2565052cc024ce0e98918ed34c1239b780a -Merge: 4d62646142 7982eca622 +Merge: 4d6264614 7982eca62 Author: Eric Anholt <eric@anholt.net> Date: Wed Dec 18 11:21:07 2013 -0800 @@ -52806,7 +53732,7 @@ Date: Wed Dec 18 11:16:15 2013 -0800 support code outside of glamor for now. commit 4d62646142718024b0981eb4f1fd0131e829161f -Merge: f4bfb14f53 81ba89d670 +Merge: f4bfb14f5 81ba89d67 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 16 09:27:57 2013 -0800 @@ -53873,7 +54799,7 @@ Date: Fri Nov 15 13:26:36 2013 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a -Merge: 0492deb8f8 8ff7e32c3e +Merge: 0492deb8f 8ff7e32c3 Author: Keith Packard <keithp@keithp.com> Date: Thu Nov 14 17:02:04 2013 +0900 @@ -54137,7 +55063,7 @@ Date: Thu Nov 7 15:18:28 2013 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit a239e6faf3fce848ac0d10c48f8e817db68a493c -Merge: 43e5a43fa8 f70a8bf371 +Merge: 43e5a43fa f70a8bf37 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 11 15:26:12 2013 -0800 @@ -54374,7 +55300,7 @@ Date: Fri Nov 1 01:43:59 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3 -Merge: 66c5ee0ff4 f36f5a65f6 +Merge: 66c5ee0ff f36f5a65f Author: Keith Packard <keithp@keithp.com> Date: Fri Nov 1 00:34:18 2013 -0700 @@ -54573,7 +55499,7 @@ Date: Tue Oct 8 17:45:40 2013 -0400 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 95bf478b78e466002c382bcde7d4d62591e9215d -Merge: abf5d5ac12 bb745f2b45 +Merge: abf5d5ac1 bb745f2b4 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 31 18:18:19 2013 -0700 @@ -54595,7 +55521,7 @@ Date: Thu Oct 31 08:57:56 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit e4636072949a76477fe7c9d54662a0b3536b1372 -Merge: 17ed7ac1fe 5c5c1b7798 +Merge: 17ed7ac1f 5c5c1b779 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 31 17:05:48 2013 -0700 @@ -54859,7 +55785,7 @@ Date: Wed Oct 30 13:33:49 2013 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f -Merge: 04ab07ca19 9f4afe7e83 +Merge: 04ab07ca1 9f4afe7e8 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 29 21:00:13 2013 -0700 @@ -54907,7 +55833,7 @@ Date: Thu Oct 17 18:26:28 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b32a4c91ccd479638c2bd2c0143b6ea170c717d1 -Merge: be6680967a c671e935e7 +Merge: be6680967 c671e935e Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 29 09:37:30 2013 -0700 @@ -55181,7 +56107,7 @@ Date: Fri Oct 18 17:31:01 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit e3220d7bae4548bf64e5879c981ad070ac1f78f7 -Merge: 73b2660d72 2523a445a0 +Merge: 73b2660d7 2523a445a Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 18 17:22:52 2013 -0700 @@ -55191,7 +56117,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: 7cf1b595c8 2523a445a0 +Merge: 7cf1b595c 2523a445a Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Oct 18 16:50:12 2013 +1000 @@ -55574,7 +56500,7 @@ Date: Sun Oct 6 16:45:52 2013 +0100 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 6a9bd103cb993e873cb82664b677ceed73c0bd85 -Merge: ea3b7db4b7 8aae28e3cb +Merge: ea3b7db4b 8aae28e3c Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 7 17:29:38 2013 -0700 @@ -55763,7 +56689,7 @@ Date: Sat Sep 28 15:26:33 2013 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit f3b529bf25db2700addbafc7aa4fc5b126ba9929 -Merge: 4399bd3832 abc2bfca16 +Merge: 4399bd383 abc2bfca1 Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 4 14:04:48 2013 -0700 @@ -55780,14 +56706,14 @@ Date: Mon Sep 30 13:30:46 2013 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 9ccb4a63982942fdce19609d2cadbd8e51708462 -Merge: 5d2ec6933f da5e20127a +Merge: 5d2ec6933 da5e20127 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: 7d3d4ae55d 6ee4d9f94a +Merge: 7d3d4ae55 6ee4d9f94 Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 4 13:50:04 2013 -0700 @@ -56445,7 +57371,7 @@ Date: Wed Aug 21 14:12:52 2013 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit 47ff382d1fce25a8b097d45b79489e891f1f1228 -Merge: 6f89ae3e64 3752a81580 +Merge: 6f89ae3e6 3752a8158 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 9 15:13:42 2013 -0700 @@ -57376,7 +58302,7 @@ Date: Sat Aug 17 12:17:36 2013 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit f67d022523c59a27f3bf8791aa9ca6624318b1fd -Merge: 5a36cdd915 9680f6a12d +Merge: 5a36cdd91 9680f6a12 Author: Keith Packard <keithp@keithp.com> Date: Tue Aug 6 07:12:12 2013 +0200 @@ -57501,7 +58427,7 @@ Date: Wed Jul 31 11:24:48 2013 +1000 Signed-off-by: Dave Airlie <airlied@redhat.com> commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 -Merge: bdd1e22cbd 4360514d1c +Merge: bdd1e22cb 4360514d1 Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 25 22:50:27 2013 -0700 @@ -57804,7 +58730,7 @@ Date: Mon Sep 3 15:19:43 2012 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit d5ebe20f9ba9569351c4a41449866679fd60ba45 -Merge: 21ea7ebb6a 33f7e60785 +Merge: 21ea7ebb6 33f7e6078 Author: Keith Packard <keithp@keithp.com> Date: Mon Jul 22 20:34:41 2013 -0700 @@ -58153,7 +59079,7 @@ Date: Mon Jun 17 15:51:19 2013 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 227015d6544115258b74c31b700f9bd163540e24 -Merge: d9005d58c0 80054fcafb +Merge: d9005d58c 80054fcaf Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 18 10:53:08 2013 -0700 @@ -58328,21 +59254,21 @@ Date: Mon May 27 13:46:49 2013 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit cb3018d8a15add48efb3335e1f79b66378166008 -Merge: c76a1b343d 6589f3b55e +Merge: c76a1b343 6589f3b55 Author: Keith Packard <keithp@keithp.com> Date: Thu May 23 19:58:46 2013 -0600 Merge remote-tracking branch 'whot/unreviewed' commit c76a1b343d6a56aa9529e87f0eda8d61355d562b -Merge: 891123ce9d 9a5ad65330 +Merge: 891123ce9 9a5ad6533 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: 7e97166c4f 49521edaf8 +Merge: 7e97166c4 49521edaf Author: Keith Packard <keithp@keithp.com> Date: Thu May 23 10:30:15 2013 -0600 @@ -59115,14 +60041,14 @@ Date: Fri Feb 15 11:19:10 2013 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 2746c681639f9512e6e45fb8d0151b996b6aff7f -Merge: 1e6cf8ec20 9878e097a7 +Merge: 1e6cf8ec2 9878e097a Author: Keith Packard <keithp@keithp.com> Date: Mon May 6 10:52:40 2013 -0700 Merge remote-tracking branch 'alanc/master' commit 1e6cf8ec20d07b73a11116564aba71b4e4291dcd -Merge: dbfeaf7062 5860408a19 +Merge: dbfeaf706 5860408a1 Author: Keith Packard <keithp@keithp.com> Date: Mon May 6 10:20:21 2013 -0700 @@ -59489,21 +60415,21 @@ Date: Sun Feb 10 10:24:59 2013 -0800 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> commit 7ab98bafc9a3426fd40f8ae693430491333ba4fc -Merge: 53da26afb7 5ab260317a +Merge: 53da26afb 5ab260317 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 24 14:14:45 2013 -0700 Merge remote-tracking branch 'geertu/master' commit 53da26afb76bcce70b91c5df23d25e7e85c010cf -Merge: 5ece86e921 d8d3c78b6e +Merge: 5ece86e92 d8d3c78b6 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: ef0a726bc8 22cab8a28a +Merge: ef0a726bc 22cab8a28 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 24 10:23:51 2013 -0700 @@ -60223,7 +61149,7 @@ Date: Sat Feb 23 13:14:45 2013 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit c2ede8f92f0d6f15b1b2a04889cb54cd1728780b -Merge: 190b032151 7050aae69c +Merge: 190b03215 7050aae69 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 18 11:26:24 2013 -0700 @@ -60247,7 +61173,7 @@ Date: Thu Feb 14 15:06:57 2013 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 116f020102fd6c2a603069a639b113dfa31b48b7 -Merge: cf89aa5374 0f537da72d +Merge: cf89aa537 0f537da72 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 18 11:18:58 2013 -0700 @@ -60516,7 +61442,7 @@ Date: Tue Mar 5 10:14:29 2013 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 604169af8b67afc74a292cdb9070a3a1f2d7c536 -Merge: 8f4640bdb9 6ea59dc2d8 +Merge: 8f4640bdb 6ea59dc2d Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 4 21:09:59 2013 -0800 @@ -60715,7 +61641,7 @@ Date: Mon Feb 27 16:43:10 2012 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit 88517ced1fa2e621be2d05a319b522b3111da516 -Merge: 82425c66e7 73974dd7ea +Merge: 82425c66e 73974dd7e Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Feb 15 11:58:52 2013 +1000 @@ -60838,7 +61764,7 @@ Date: Thu Feb 14 10:02:02 2013 +1000 Reviewed-by: Mark Kettenis <kettenis@openbsd.org> commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e -Merge: 9a35d4240e eda7dbff5a +Merge: 9a35d4240 eda7dbff5 Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 14 11:05:48 2013 -0800 @@ -61074,7 +62000,7 @@ Date: Fri Jan 25 11:47:32 2013 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 0d5bb882600ee7734af034fbea935a79d21d1e70 -Merge: b33fcb1497 61a99aff9d +Merge: b33fcb149 61a99aff9 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Feb 8 14:10:52 2013 +1000 @@ -61506,14 +62432,14 @@ Date: Tue Jan 22 07:39:53 2013 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362 -Merge: 591c06277b d6dcde7a03 +Merge: 591c06277 d6dcde7a0 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: 6703a7c7cf fa6ab7d9b2 +Merge: 6703a7c7c fa6ab7d9b Author: Keith Packard <keithp@keithp.com> Date: Sun Jan 20 15:52:26 2013 -0800 @@ -61696,7 +62622,7 @@ Date: Wed Oct 26 17:03:25 2011 -0500 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit fa6ab7d9b2d7fd8184f1e068360607845f5c33ab -Merge: adde4e6448 0e1ab433f4 +Merge: adde4e644 0e1ab433f Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Jan 11 14:58:17 2013 +1000 @@ -62113,14 +63039,14 @@ Date: Wed Dec 19 12:47:35 2012 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 2a0b544f5c09f79e4ab04ea8103a5ecf59ee2e7b -Merge: 0eb1559eb2 ba4bb3bc1b +Merge: 0eb1559eb ba4bb3bc1 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:26:00 2012 -0800 Merge remote-tracking branch 'jeremyhu/master' commit 0eb1559eb29d11e63c2b33e317590a88d86fe313 -Merge: 386e4d76ba ea1d76d1b6 +Merge: 386e4d76b ea1d76d1b Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:21:31 2012 -0800 @@ -62130,14 +63056,14 @@ Date: Wed Dec 19 12:21:31 2012 -0800 whitespace. commit 386e4d76baaffe226d2d561ff936509454eb0ac2 -Merge: 014a5c8a9d 9ff2e83151 +Merge: 014a5c8a9 9ff2e8315 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:17:59 2012 -0800 Merge remote-tracking branch 'alanc/master' commit 014a5c8a9d86f2f992183bff9106354fac2c3b0e -Merge: f793b5fd3e 2eefa5d6e8 +Merge: f793b5fd3 2eefa5d6e Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 19 12:09:31 2012 -0800 @@ -62299,7 +63225,7 @@ Date: Wed Dec 12 11:02:19 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6d508b81857edaed03c7ee06410434ea56d9b701 -Merge: d982d87743 bb6f3514ca +Merge: d982d8774 bb6f3514c Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 17 11:45:45 2012 -0800 @@ -62309,7 +63235,7 @@ Date: Mon Dec 17 11:45:45 2012 -0800 reviewed them... commit d982d877436377597b8ed04bca1438d2edaf53ee -Merge: da3eaf6bdb 6b4aa8a359 +Merge: da3eaf6bd 6b4aa8a35 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 17 10:56:12 2012 -0800 @@ -62659,14 +63585,14 @@ Date: Thu Nov 1 14:14:13 2012 -0400 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit bb6f3514ca17d993c1af380e8d4480d61e5bbcae -Merge: f961c3a3b9 08da994a08 +Merge: f961c3a3b 08da994a0 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: 36740d02b9 39f19b3f3b +Merge: 36740d02b 39f19b3f3 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Dec 12 17:25:23 2012 +1000 @@ -62867,7 +63793,7 @@ Date: Tue Dec 4 15:03:37 2012 +1000 Tested-by: Frank Roscher <Frank-Roscher@gmx.net> commit b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 -Merge: e9ea96d6a8 ce6b652929 +Merge: e9ea96d6a ce6b65292 Author: Keith Packard <keithp@keithp.com> Date: Fri Nov 30 09:31:46 2012 -0800 @@ -62889,7 +63815,7 @@ Date: Fri Nov 30 20:54:38 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit ce6b6529290f7d42717aad3fd8a83aaaaf8962de -Merge: 6e18599d69 3b9f1c7017 +Merge: 6e18599d6 3b9f1c701 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Nov 29 14:49:22 2012 +1000 @@ -63002,7 +63928,7 @@ Date: Thu Nov 8 14:28:09 2012 +0100 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 1712a45422a63f11b2146541279616fcfda09ec6 -Merge: e54f71a2c7 338bec3005 +Merge: e54f71a2c 338bec300 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 28 07:54:13 2012 -0800 @@ -63135,7 +64061,7 @@ Date: Wed Oct 17 12:06:47 2012 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit d50a94568e06a06df682a0028579d37a7b209d15 -Merge: 87b60efb85 cf05db8dde +Merge: 87b60efb8 cf05db8dd Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 27 15:14:26 2012 -0800 @@ -63540,7 +64466,7 @@ Date: Sat Oct 13 22:43:26 2012 -0400 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea -Merge: 14c9e245ba 6f145084d5 +Merge: 14c9e245b 6f145084d Author: Keith Packard <keithp@keithp.com> Date: Sun Nov 18 21:50:20 2012 -0800 @@ -63650,7 +64576,7 @@ Date: Sat Nov 17 11:52:10 2012 -0500 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> commit 011f8458805e443ac9130865d2840a929a00cabf -Merge: 54ba26cb1f b4e44b285e +Merge: 54ba26cb1 b4e44b285 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 5 17:16:07 2012 -0800 @@ -63977,7 +64903,7 @@ Date: Wed Oct 24 23:57:11 2012 -0500 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 04f980ead5e9af066143a921e0a0e98f26f28ee5 -Merge: a194630f7f a4941ce496 +Merge: a194630f7 a4941ce49 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 5 08:45:21 2012 -0800 @@ -64027,7 +64953,7 @@ Date: Tue Sep 4 17:28:16 2012 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit a194630f7f7b287cb4ea4a459df0745f4c0d4c1a -Merge: 74a3130426 d511a3016a +Merge: 74a313042 d511a3016 Author: Keith Packard <keithp@keithp.com> Date: Thu Nov 1 13:38:54 2012 -0700 @@ -64062,7 +64988,7 @@ Date: Thu Oct 25 15:03:50 2012 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 74a3130426d7e1b456e45daa517769cd3e4b58c0 -Merge: 1ca096d5e0 f32ad6dd31 +Merge: 1ca096d5e f32ad6dd3 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 29 09:09:16 2012 -0700 @@ -64216,14 +65142,14 @@ Date: Sun Oct 14 23:38:20 2012 -0500 Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> commit 53830281b4da096f9c13107d73ec9c76ff1d14cc -Merge: abc2ef590c 9cbcb5bd6a +Merge: abc2ef590 9cbcb5bd6 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: 0e85e5e628 c5396ec05a +Merge: 0e85e5e62 c5396ec05 Author: Keith Packard <keithp@keithp.com> Date: Fri Oct 26 17:11:58 2012 -0700 @@ -65034,7 +65960,7 @@ Date: Thu Oct 4 14:42:37 2012 -0700 Reviewed-by: Julien Cristau <jcristau@debian.org> commit 8367dd9736d74eca971da345c2bf559ce5bbf649 -Merge: 36c18bb81b 7998e26159 +Merge: 36c18bb81 7998e2615 Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 4 13:08:35 2012 -0700 @@ -65098,7 +66024,7 @@ Date: Thu Oct 4 11:42:22 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit f179b13b91c8891254d31345ee04e773839e6b87 -Merge: 4dd5989d15 3d2b768efa +Merge: 4dd5989d1 3d2b768ef Author: Keith Packard <keithp@keithp.com> Date: Thu Oct 4 11:39:46 2012 -0700 @@ -65250,7 +66176,7 @@ Date: Fri Sep 7 18:10:35 2012 +0100 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> commit 4dd5989d15465f3f3480b521d4e36673972fa24a -Merge: 0b02150c27 506e3437c7 +Merge: 0b02150c2 506e3437c Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 24 11:43:01 2012 -0700 @@ -65286,7 +66212,7 @@ Date: Mon Sep 24 14:03:31 2012 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7722bcbab2507d263c7685b15cccbfdd52fc3a24 -Merge: 4dc2a76740 f54987de97 +Merge: 4dc2a7674 f54987de9 Author: Keith Packard <keithp@keithp.com> Date: Sun Sep 23 16:04:13 2012 -0700 @@ -65532,7 +66458,7 @@ Date: Thu Jun 16 17:40:24 2011 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit d01921ec18c21f21d377b60626cc2d3418b84a7c -Merge: 70e5766874 245e7e0361 +Merge: 70e576687 245e7e036 Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 20 17:26:48 2012 +0200 @@ -65719,7 +66645,7 @@ Date: Wed Sep 5 14:45:08 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 856f80c8d7f22b979c72d9c70b70187df6004a03 -Merge: 0db936a5b7 b8ab93dfbc +Merge: 0db936a5b b8ab93dfb Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 5 11:02:58 2012 -0700 @@ -65864,7 +66790,7 @@ Date: Mon Aug 27 17:15:19 2012 -0700 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit a557edca6152ad09c685a00e01534c35a1f00f2e -Merge: 6619f5c0e1 24ffcfcded +Merge: 6619f5c0e 24ffcfcde Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 27 08:06:09 2012 -0700 @@ -66056,7 +66982,7 @@ Date: Thu Jul 19 22:15:10 2012 +0000 Signed-off-by: Adam Jackson <ajax@redhat.com> commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734 -Merge: 16d8da5ca9 99b94af1ff +Merge: 16d8da5ca 99b94af1f Author: Keith Packard <keithp@keithp.com> Date: Wed Aug 15 13:29:17 2012 -0700 @@ -66197,21 +67123,21 @@ Date: Sat Jul 14 16:07:51 2012 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 02f94b2d446f6700f791f318c551ac835af8445a -Merge: 360fa7736b 7f09126e06 +Merge: 360fa7736 7f09126e0 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: 2100e72388 ac09a4a091 +Merge: 2100e7238 ac09a4a09 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: 4a6f42dda0 c37c65052f +Merge: 4a6f42dda c37c65052 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 16:40:54 2012 -0700 @@ -66427,21 +67353,21 @@ Date: Tue Jul 10 23:29:53 2012 -0700 Reviewed-by: Keith Packard <keithp@keithp.com> commit 94b514d5e4b376d05e106eb3853da511256e8545 -Merge: 7d87545ba7 7328900042 +Merge: 7d87545ba 732890004 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: ad707a7dcc 988d7ace19 +Merge: ad707a7dc 988d7ace1 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 15:11:13 2012 -0700 Merge remote-tracking branch 'jturney/master' commit ad707a7dcc65c30e030c7600b54f734090e56a91 -Merge: 5a51cb86f3 884f51e977 +Merge: 5a51cb86f 884f51e97 Author: Keith Packard <keithp@keithp.com> Date: Mon Aug 6 15:08:01 2012 -0700 @@ -66912,7 +67838,7 @@ Date: Thu Jul 19 15:00:03 2012 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 20b4d90f32b3ca5def5be2fdf04a91ae6c47f125 -Merge: 83df169538 fd228d3184 +Merge: 83df16953 fd228d318 Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 25 13:52:35 2012 -0700 @@ -67007,14 +67933,14 @@ Date: Tue Jul 17 15:47:39 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit beeea70495a8d5c4afc1b1eb2cc06a24ab1a986d -Merge: 6e438a0e18 6910280297 +Merge: 6e438a0e1 691028029 Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 17 12:17:39 2012 -0700 Merge remote-tracking branch 'alanc/master' commit 6e438a0e183f5a6c22070746c038af53d5b935ca -Merge: 5884e7dede 75966a4186 +Merge: 5884e7ded 75966a418 Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 17 12:12:53 2012 -0700 @@ -67379,7 +68305,7 @@ Date: Fri Jul 13 00:47:24 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 746193a7f10f11cccae05c98b933aadf58fc7375 -Merge: a2d0829531 2b74949ad0 +Merge: a2d082953 2b74949ad Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 12 15:10:51 2012 -0700 @@ -67431,7 +68357,7 @@ Date: Thu Jul 12 00:36:43 2012 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 656e5fea6c9ca15f932889edcc590dd01c881945 -Merge: 8b820f221a 1720cd9bad +Merge: 8b820f221 1720cd9ba Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 12 08:26:35 2012 -0700 @@ -67633,7 +68559,7 @@ Date: Tue Jul 10 01:14:13 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6e12cb147da58bd12a158807b2cd5afac32ae70f -Merge: 532fbc29c9 023127915e +Merge: 532fbc29c 023127915 Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 10 00:52:11 2012 -0700 @@ -69316,7 +70242,7 @@ Date: Thu Jul 5 21:11:16 2012 +0100 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 4d24192bd24fb20d16d0054d77bffda883faeb79 -Merge: 7c9d8cbd36 74b786f7ce +Merge: 7c9d8cbd3 74b786f7c Author: Keith Packard <keithp@keithp.com> Date: Fri Jul 6 12:17:17 2012 -0700 @@ -69848,7 +70774,7 @@ Date: Thu Jun 28 17:17:12 2012 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit d84f0f823eeeecdf0498aadd3fbb1d11dabc0837 -Merge: 12bfb4cf1b d04dfe3f75 +Merge: 12bfb4cf1 d04dfe3f7 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Jul 4 21:23:48 2012 +1000 @@ -69966,7 +70892,7 @@ Date: Fri Jun 22 13:02:40 2012 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 24525d96a3b9dba67eb75042500b2f208a2cc246 -Merge: 4cd91bd4c6 35e3d22915 +Merge: 4cd91bd4c 35e3d2291 Author: Keith Packard <keithp@keithp.com> Date: Mon Jul 2 22:35:39 2012 -0700 @@ -70286,14 +71212,14 @@ Date: Thu Jun 28 12:07:11 2012 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8b4f0a4fdd6c15f49458bc3a8c3135b8c389240d -Merge: 59294a2179 d642e71287 +Merge: 59294a217 d642e7128 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 28 10:38:26 2012 -0700 Merge remote-tracking branch 'jturney/master' commit 59294a2179bd5bb996693af004b470932df00ac6 -Merge: 855003c333 191b630656 +Merge: 855003c33 191b63065 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 28 10:11:44 2012 -0700 @@ -70525,7 +71451,7 @@ Date: Fri Jun 24 13:32:10 2011 +0100 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 3ef3ce069d52dcfa932c90ccd30854a8d9daa15a -Merge: a0c8716cdc ff541e0a1f +Merge: a0c8716cd ff541e0a1 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 21 08:52:34 2012 -0700 @@ -70664,14 +71590,14 @@ Date: Thu Jun 7 16:52:20 2012 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit 8dc70acbf3d82611ac9ec1ec2a52edcc01934850 -Merge: ffb47a123d b59adc9c24 +Merge: ffb47a123 b59adc9c2 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 14 13:04:29 2012 -0700 Merge remote-tracking branch 'alanc/master' commit ffb47a123ddd1233fb4229cf23483652065c5e82 -Merge: db9d2b8a50 b840ba5f54 +Merge: db9d2b8a5 b840ba5f5 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 14 13:01:17 2012 -0700 @@ -70690,7 +71616,7 @@ Date: Thu Jun 7 15:01:59 2012 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6d86b64dbaef5a16712fd1fdc3157f716d238877 -Merge: 812786f4d4 4c68f5d395 +Merge: 812786f4d 4c68f5d39 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 14 11:05:22 2012 -0700 @@ -71327,7 +72253,7 @@ Date: Fri Apr 6 12:44:07 2012 -0700 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3476eb38063473a7a5fcd78e2095e284118de839 -Merge: 78f0d9cdc4 42ae2e8199 +Merge: 78f0d9cdc 42ae2e819 Author: Keith Packard <keithp@keithp.com> Date: Sun Jun 3 20:24:24 2012 -0700 @@ -71638,7 +72564,7 @@ Date: Tue May 22 21:19:40 2012 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 457fc77691b2df66f6dd3ba10ce7c1b61b9b42a3 -Merge: 2e237c838f 5a3a98fcb7 +Merge: 2e237c838 5a3a98fcb Author: Keith Packard <keithp@keithp.com> Date: Tue May 22 10:32:29 2012 -0700 @@ -71858,7 +72784,7 @@ Date: Thu Jan 26 15:44:40 2012 -0800 Reviewed-by: Dave Airlie <airlied@redhat.com> commit ba883a0f3435d5da82a8134e696c4905eea70f23 -Merge: ae1c48ebc8 acdc4f54ee +Merge: ae1c48ebc acdc4f54e Author: Keith Packard <keithp@keithp.com> Date: Thu May 17 16:49:19 2012 -0700 @@ -72213,7 +73139,7 @@ Date: Tue Apr 24 18:11:16 2012 +0200 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 3a94b338aaa48b656aae1bb3a5a9d64300c0a093 -Merge: afc153a5b4 c91d00e0f3 +Merge: afc153a5b c91d00e0f Author: Keith Packard <keithp@keithp.com> Date: Wed May 9 21:17:16 2012 -0700 @@ -72396,7 +73322,7 @@ Date: Wed Apr 18 17:51:50 2012 +0800 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 97041364a6acb2b66b5cfd06757c90a006ad50e9 -Merge: 19082726cb ee542b8559 +Merge: 19082726c ee542b855 Author: Keith Packard <keithp@keithp.com> Date: Wed May 2 20:47:25 2012 -0700 @@ -72788,7 +73714,7 @@ Date: Thu Apr 19 16:51:46 2012 -0700 Tested-By: Michal Suchanek <hramrach@gmail.com> commit d77eb7ee49ef19c2c4c7381d56e9d0f9c3fbc890 -Merge: 31e3c0ff7f c7b1625558 +Merge: 31e3c0ff7 c7b162555 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 19 15:48:34 2012 -0500 @@ -72807,7 +73733,7 @@ Date: Thu Apr 19 15:25:41 2012 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit e6308e32fe2b5f74133d4d238ffa512257f6327c -Merge: 3720aa33ee 51a8d8dd19 +Merge: 3720aa33e 51a8d8dd1 Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 19 10:45:07 2012 -0500 @@ -72816,7 +73742,7 @@ Date: Thu Apr 19 10:45:07 2012 -0500 Touch input changes from Chase commit 51a8d8dd19d7496fe84b37a1f0a7a03658120539 -Merge: ebf214876a 00cf1c40b2 +Merge: ebf214876 00cf1c40b Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Apr 19 17:03:54 2012 +1000 @@ -73224,7 +74150,7 @@ Date: Tue Apr 17 11:48:03 2012 +0100 cursor: hide cursors on LeaveVT commit 80fefc42f5e67e6b4a4b440d8991bee7e5f38359 -Merge: 9779b904c7 12188c8a8a +Merge: 9779b904c 12188c8a8 Author: Keith Packard <keithp@keithp.com> Date: Sun Apr 15 21:05:30 2012 -0700 @@ -73593,7 +74519,7 @@ Date: Fri Mar 23 08:20:22 2012 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 7f3997b01a8813c1d7055317eb06111aed8572c9 -Merge: 92d50c38b2 31646d8fa9 +Merge: 92d50c38b 31646d8fa Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 26 16:41:52 2012 -0700 @@ -74012,7 +74938,7 @@ Date: Fri Mar 23 14:54:05 2012 +0000 modesetting: fix build against older Xext commit a7eac500e652f30deffd9dc5e623fab701077738 -Merge: bf876c87a9 d645edd11e +Merge: bf876c87a d645edd11 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Mar 22 13:13:07 2012 +1000 @@ -74146,7 +75072,7 @@ Date: Wed Mar 14 17:22:18 2012 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit bf876c87a9099fdfa63ed599f8ed9a954dd023d9 -Merge: 908ab3d580 c0b0a9bce9 +Merge: 908ab3d58 c0b0a9bce Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Mar 22 11:34:43 2012 +1000 @@ -74778,7 +75704,7 @@ Date: Sun Feb 19 08:34:25 2012 -0500 Signed-off-by: Dave Airlie <airlied@redhat.com> commit 71594746c7da32e1c7986341a0da30f241a7a2be -Merge: d53235af85 eaba06a27c +Merge: d53235af8 eaba06a27 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 22 18:07:20 2012 +1300 @@ -75023,7 +75949,7 @@ Date: Sat Feb 11 16:13:44 2012 +1300 Signed-off-by: Keith Packard <keithp@keithp.com> commit 42b6756463ee0476340656707f1088dc6c2fd220 -Merge: 7674d00b04 ca64912c02 +Merge: 7674d00b0 ca64912c0 Author: Keith Packard <keithp@keithp.com> Date: Sat Feb 11 15:36:43 2012 +1300 @@ -75802,14 +76728,14 @@ Date: Thu Jan 12 12:09:34 2012 -0800 ABI change pended for 1.13 commit e722ad6c3efa57b806ca0f2dc13114bd3619a88c -Merge: e476af417d 4e44580efd +Merge: e476af417 4e44580ef 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: f4956faab9 146008358e +Merge: f4956faab 146008358 Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 13:17:37 2012 -0800 @@ -75944,21 +76870,21 @@ Date: Fri Jan 6 07:21:37 2012 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0b113f7cdf5228dccd51a749a339c8669e3f20ff -Merge: 0b2c6491c5 777bf90abe +Merge: 0b2c6491c 777bf90ab Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 13:07:25 2012 -0800 Merge commit '777bf90abeac37087a3d0538b847742523d5acf2' commit 0b2c6491c5e5e1c9ba067299f3de61f5acee263b -Merge: 1f5587e144 6b19436536 +Merge: 1f5587e14 6b1943653 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: a97252db24 6269977c91 +Merge: a97252db2 6269977c9 Author: Keith Packard <keithp@keithp.com> Date: Mon Jan 9 11:37:59 2012 -0800 @@ -76463,7 +77389,7 @@ Date: Tue Dec 27 14:02:01 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8dedf9831bd80514d800f0085213296a3726dba7 -Merge: cfc4c3d7fa cf96183122 +Merge: cfc4c3d7f cf9618312 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 27 13:13:48 2011 -0800 @@ -76562,7 +77488,7 @@ Date: Thu Dec 22 10:00:15 2011 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit e395efc25f9fd60377f32c2bf1a9153d70908236 -Merge: 2bb282cd45 fcda98c486 +Merge: 2bb282cd4 fcda98c48 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Dec 22 09:29:59 2011 +1000 @@ -77000,14 +77926,14 @@ Date: Mon Dec 19 14:52:41 2011 +1000 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> commit 2d34b34ed7547b829979756ccfb2cff79368d0a4 -Merge: e4b4d83fad 1deede3c48 +Merge: e4b4d83fa 1deede3c4 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 20 00:23:33 2011 -0800 Merge remote-tracking branch 'jeremyhu/master' commit e4b4d83fad37bb737e25f7226dbcd15b892f9528 -Merge: 4df65d247b d26cb70272 +Merge: 4df65d247 d26cb7027 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 19 22:36:31 2011 -0800 @@ -77521,7 +78447,7 @@ Date: Wed Dec 14 10:34:19 2011 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7da7aa96a0acb895e1fe57a9d3f2d093479cf2a2 -Merge: b79de3f42f 7528a6b88e +Merge: b79de3f42 7528a6b88 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 14 11:40:10 2011 -0800 @@ -77539,7 +78465,7 @@ Date: Wed Dec 14 10:31:23 2011 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c -Merge: f0de5e3990 898d976729 +Merge: f0de5e399 898d97672 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue Dec 13 14:19:54 2011 +1000 @@ -78419,7 +79345,7 @@ Date: Thu Dec 8 21:52:07 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 522f8bcc0360d6a117e929a004bc956ab92037e9 -Merge: 6369b59668 2abe83df68 +Merge: 6369b5966 2abe83df6 Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 8 20:57:26 2011 -0800 @@ -78620,14 +79546,14 @@ Date: Thu Dec 1 16:24:32 2011 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 3ab8ee32470f7cf1223e04238bb8c5f74ed52fc3 -Merge: 22a666f995 98c4a888a4 +Merge: 22a666f99 98c4a888a 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: 3824f558cc e89b0324da +Merge: 3824f558c e89b0324d Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 7 12:27:23 2011 -0800 @@ -79041,14 +79967,14 @@ Date: Tue Nov 8 10:13:15 2011 -0800 Reviewed-by: Jamey Sharp <jamey@minilop.net> commit 05f09354a30a4f5edd421220e1aa97be754c71bb -Merge: 3197b773c8 08ec4da6a7 +Merge: 3197b773c 08ec4da6a 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: 2dc5ba4a1b dfcec1d3f9 +Merge: 2dc5ba4a1 dfcec1d3f Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 1 14:36:58 2011 +0000 @@ -79924,7 +80850,7 @@ Date: Fri Nov 4 23:26:25 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit bfa2a1857a1efda7f171f10e855d200ca0dbcc1a -Merge: f0d50cc665 e7cb8f802a +Merge: f0d50cc66 e7cb8f802 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 14 09:07:06 2011 -0800 @@ -80087,7 +81013,7 @@ Date: Thu Nov 3 13:18:46 2011 +0000 Not needed in here commit 548c6fe044068ffba9b5306dc6b11f2ba22782a4 -Merge: 3881b0bf1c ffe8ec86db +Merge: 3881b0bf1 ffe8ec86d Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 2 21:35:31 2011 -0700 @@ -80106,14 +81032,14 @@ Date: Tue Nov 1 07:17:07 2011 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit d91aa0e6601bdf3e2cfa57b3412ab14ac486edc4 -Merge: 8df3a9ca5a 401150d7dc +Merge: 8df3a9ca5 401150d7d 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: 8329afa59d ef895484c8 +Merge: 8329afa59 ef895484c Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 2 21:18:16 2011 -0700 @@ -80268,7 +81194,7 @@ Date: Mon Oct 31 15:01:12 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 132545ff576cc69ed63f5a08127151fe550de4c3 -Merge: d0c6732a99 d7c44a7c97 +Merge: d0c6732a9 d7c44a7c9 Author: Keith Packard <keithp@keithp.com> Date: Sun Oct 30 16:57:58 2011 -0700 @@ -80494,7 +81420,7 @@ Date: Tue Oct 25 23:48:16 2011 -0700 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit 5701ab4a441eb113abd0851b0d71b82d12112854 -Merge: 7d50211ab5 a41214bc9a +Merge: 7d50211ab a41214bc9 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 24 22:09:00 2011 -0700 @@ -80719,7 +81645,7 @@ Date: Mon Oct 24 18:47:06 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d9d3a01ffca5e2de650d098231e16205781804c5 -Merge: 17416e88dc fb55f8f790 +Merge: 17416e88d fb55f8f79 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 24 18:12:23 2011 -0700 @@ -80896,21 +81822,21 @@ Date: Thu Oct 20 14:28:56 2011 -0700 Reviewed-by: Julien Cristau <jcristau@debian.org> commit ff61592441916b83aeb778c74352bb5b26247f84 -Merge: af3f64fb77 525d4172b2 +Merge: af3f64fb7 525d4172b 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: 15bbdc103b df0dd36dee +Merge: 15bbdc103 df0dd36de Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 19 17:33:07 2011 -0700 Merge remote-tracking branch 'hramrach/pull' commit 15bbdc103b34b6b374815698946e6c409421a644 -Merge: a5266dcb3a 323869f329 +Merge: a5266dcb3 323869f32 Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 19 17:26:50 2011 -0700 @@ -81017,7 +81943,7 @@ Date: Tue Aug 23 15:19:59 2011 -0700 Signed-off-by: Aaron Plattner <aplattner@nvidia.com> commit c8413362049cee8c30e0a9d67f78f9ebefe8e71f -Merge: 64d2d1bef1 b67581cf82 +Merge: 64d2d1bef b67581cf8 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 18 07:45:24 2011 -0700 @@ -81164,14 +82090,14 @@ Date: Fri Sep 30 10:59:47 2011 +1000 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 64d2d1bef14c7ec7156bb3aae64eff69f9f7be54 -Merge: fb84be47db 679c84bce9 +Merge: fb84be47d 679c84bce Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 17 14:36:34 2011 -0700 Merge remote-tracking branch 'jeremyhu/master' commit fb84be47db7cdaff406792c08e34670e8e0cbda9 -Merge: fae7ed62ad 32b289e46c +Merge: fae7ed62a 32b289e46 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 17 13:50:25 2011 -0700 @@ -81933,14 +82859,14 @@ Date: Tue Aug 30 13:37:31 2011 +1000 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 6378d0233d21088b6429755627b4253859892c72 -Merge: 6e965d8a18 98b230669f +Merge: 6e965d8a1 98b230669 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 13:56:06 2011 -0700 Merge remote-tracking branch 'herrb/master' commit 6e965d8a185087a55b2100b817e18f05b3ce5a00 -Merge: 466e4b3f17 ac5881d6d0 +Merge: 466e4b3f1 ac5881d6d Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 13:47:49 2011 -0700 @@ -82076,14 +83002,14 @@ Date: Mon Sep 26 22:38:44 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 9a55b3661b4172f9a32cd6fefb254e06edb1a88a -Merge: cf11ca360c 84bb0207f6 +Merge: cf11ca360 84bb0207f Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 11:49:23 2011 -0700 Merge remote-tracking branch 'alanc/master' commit cf11ca360c2ded5ca309faa9d039160947387bb8 -Merge: 463dd87062 6eae9fa284 +Merge: 463dd8706 6eae9fa28 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 11:44:59 2011 -0700 @@ -82106,7 +83032,7 @@ Date: Thu Sep 22 18:38:53 2011 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit f5d50b46ddeb039ab6564141f61261e94ee67637 -Merge: 57cd32e934 524e5445c0 +Merge: 57cd32e93 524e5445c Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 3 11:36:28 2011 -0700 @@ -82242,7 +83168,7 @@ Date: Sun Sep 25 20:44:26 2011 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 4c6bc0e76599dbe5ede2e1f48c9936a0e996b638 -Merge: 057cc92ebf 3304bbff9b +Merge: 057cc92eb 3304bbff9 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Sep 30 09:24:56 2011 +1000 @@ -82451,7 +83377,7 @@ Date: Thu Sep 29 11:49:26 2011 +0100 server recycling. commit 057cc92ebfeebe81b7d01ff2c6aa2c066c8d1a64 -Merge: afb1fe695d 52c9b59a9f +Merge: afb1fe695 52c9b59a9 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Sep 29 14:18:35 2011 +1000 @@ -82966,7 +83892,7 @@ Date: Thu Sep 22 18:55:19 2011 -0700 Reviewed-by: Aaron Plattner <aplattner@nvidia.com> commit afb1fe695d197187a301c19863a128a65389b15c -Merge: 7fb4bef039 c7163fdd30 +Merge: 7fb4bef03 c7163fdd3 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 26 20:24:15 2011 -0700 @@ -85285,21 +86211,21 @@ Date: Thu Sep 1 16:48:37 2011 -0700 Reviewed-by: Matt Dew <marcoz@osource.org> commit 7fb4bef0394a5d09680985d34bce8252b61493cb -Merge: 98f4940093 c90903b4f7 +Merge: 98f494009 c90903b4f 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: b018b81533 c8eacae4f8 +Merge: b018b8153 c8eacae4f Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 21 14:30:19 2011 -0700 Merge remote-tracking branch 'alanc/master' commit b018b815333b256b5e06dd6251b2e539f09f89fa -Merge: 03d032991d 0f380a5005 +Merge: 03d032991 0f380a500 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 21 14:17:14 2011 -0700 @@ -85629,7 +86555,7 @@ Date: Wed Sep 7 17:47:56 2011 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit c92c83523ede8bc361526ac93d09d089fbbdae08 -Merge: 4ad271d06c 24b2b43e85 +Merge: 4ad271d06 24b2b43e8 Author: Keith Packard <keithp@keithp.com> Date: Wed Sep 21 13:32:06 2011 -0700 @@ -86679,7 +87605,7 @@ Date: Fri Jul 29 16:12:06 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b8f61c11c94708d4f17720a55945dee4621315a4 -Merge: 5596f10cce f51e42f583 +Merge: 5596f10cc f51e42f58 Author: Keith Packard <keithp@keithp.com> Date: Fri Jul 29 14:58:58 2011 -0700 @@ -86995,7 +87921,7 @@ Date: Wed Jul 13 12:08:03 2011 +0100 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 01dbf2514aa0cc8c40a876a24e3cb0737c41da19 -Merge: 5a801af689 af0fbc37e3 +Merge: 5a801af68 af0fbc37e Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 13 11:44:15 2011 -0700 @@ -87161,7 +88087,7 @@ Date: Mon Oct 11 16:21:40 2010 +0100 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> commit d4096abb591353405417e53816e5c46e904e7b25 -Merge: 61f87a75f2 87d4f90bfc +Merge: 61f87a75f 87d4f90bf Author: Keith Packard <keithp@keithp.com> Date: Fri Jul 1 15:45:45 2011 -0700 @@ -87399,14 +88325,14 @@ Date: Tue Jun 7 21:22:15 2011 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 61f87a75f2bcda939a1778d39be8cfa5c886e6d8 -Merge: 0d2153a46c 72d914335c +Merge: 0d2153a46 72d914335 Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 29 20:14:51 2011 -0700 Merge remote-tracking branch 'jturney/master' commit 0d2153a46cc72d5f2e6a9081a3cf153aa3eb7787 -Merge: b631c39a21 932513e23b +Merge: b631c39a2 932513e23 Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 29 20:08:32 2011 -0700 @@ -87427,7 +88353,7 @@ Date: Thu Jun 23 13:37:45 2011 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit d5ca33ca2dd08e8436439da926d2dedaabc268fa -Merge: 38d55f06cf 4edf49d032 +Merge: 38d55f06c 4edf49d03 Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 29 18:54:33 2011 -0700 @@ -87590,7 +88516,7 @@ Date: Tue Jun 28 09:33:25 2011 -0700 after 'make clean' causing 'make distcheck' to fail. commit f968f4ace9410d827fb6b68c4e38ea9516641309 -Merge: 4dbed26254 163441fe53 +Merge: 4dbed2625 163441fe5 Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 28 09:10:14 2011 -0700 @@ -87665,7 +88591,7 @@ Date: Tue Jun 14 17:21:48 2011 -0700 Tested-by: Peter Hutterer <peter.hutterer@who-t.net> commit 8ac651552bb70ba36238f430adab2f7a7f24db6e -Merge: 945b2ff814 47b6ba3204 +Merge: 945b2ff81 47b6ba320 Author: Keith Packard <keithp@keithp.com> Date: Wed Jun 22 11:03:37 2011 -0700 @@ -88240,14 +89166,14 @@ Date: Fri May 27 11:40:56 2011 +1000 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 02d11af01211da55e9d93fe0e1851a0c6fe57472 -Merge: bf9fd0a83e ab0df72cd3 +Merge: bf9fd0a83 ab0df72cd Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 7 12:31:15 2011 -0700 Merge remote-tracking branch 'kibi/master' commit bf9fd0a83eef771ee018438f05e2d9f20b43539b -Merge: 21eec367d0 0d140567ba +Merge: 21eec367d 0d140567b Author: Keith Packard <keithp@keithp.com> Date: Tue Jun 7 07:45:22 2011 -0700 @@ -88597,14 +89523,14 @@ Date: Wed Jun 1 11:20:10 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0643c056512d10be8db223d18d6563292d57e916 -Merge: a2e6cfc18a d45f5b2493 +Merge: a2e6cfc18 d45f5b249 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: bc04065b5c 8d84fd2566 +Merge: bc04065b5 8d84fd256 Author: Keith Packard <keithp@keithp.com> Date: Tue May 31 23:42:52 2011 -0700 @@ -88740,7 +89666,7 @@ Date: Tue May 24 16:02:42 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 4725d6b0dbb6371af4a1b2fbef851dcfe155514a -Merge: 1b2d17748f b5d828789c +Merge: 1b2d17748 b5d828789 Author: Keith Packard <keithp@keithp.com> Date: Wed May 25 09:40:51 2011 -0600 @@ -89182,21 +90108,21 @@ Date: Fri May 6 18:18:15 2011 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit ba5540221f2a46133371b4ff0d527b1a0a1443b1 -Merge: 6347a0b802 728d0bf20e +Merge: 6347a0b80 728d0bf20 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: 4d02c53971 f144fb771f +Merge: 4d02c5397 f144fb771 Author: Keith Packard <keithp@keithp.com> Date: Fri May 13 13:54:29 2011 -0700 Merge remote-tracking branch 'jeremyhu/master' commit 4d02c5397114ac4d15e794908f0708427e258261 -Merge: 043c175865 eac37f32b8 +Merge: 043c17586 eac37f32b Author: Keith Packard <keithp@keithp.com> Date: Fri May 13 13:52:18 2011 -0700 @@ -89898,7 +90824,7 @@ Date: Sat Apr 23 18:09:11 2011 -0700 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit 5cb31cd0cbf83fff5f17a475e7b0e45246b19bf3 -Merge: 0f284f0f42 4d8735d388 +Merge: 0f284f0f4 4d8735d38 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 29 09:59:49 2011 -0700 @@ -89953,14 +90879,14 @@ Date: Wed Apr 27 22:12:59 2011 -0700 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit f6d4e75ec55ac6812f9dead42ecdffb9614578c7 -Merge: ec9ea40178 4318e6a147 +Merge: ec9ea4017 4318e6a14 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 27 12:08:51 2011 -0700 Merge remote-tracking branch 'jturney/master' commit ec9ea4017885cefe5519a4e890b0ff1a5518235a -Merge: c6cb70be1e 6f29dbf5e3 +Merge: c6cb70be1 6f29dbf5e Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 27 12:01:56 2011 -0700 @@ -90674,7 +91600,7 @@ Date: Mon Mar 28 11:38:11 2011 -0400 Signed-off-by: Søren Sandmann <ssp@redhat.com> commit 918a9c99cf2ebc73acb34b95f597904b93c690d9 -Merge: 88c4622b59 5f496bc919 +Merge: 88c4622b5 5f496bc91 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 22 11:20:16 2011 -0700 @@ -90704,7 +91630,7 @@ Date: Mon Apr 18 08:23:48 2011 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 302bdc3c9678c028bed71dbe9c5ba04997626b6b -Merge: 001b6b8b70 6f97fe5df1 +Merge: 001b6b8b7 6f97fe5df Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 22 10:48:37 2011 -0700 @@ -91434,14 +92360,14 @@ Date: Wed Apr 6 14:51:45 2011 -0400 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3085b178626c957854385c7a88a05ec3c7eb74f3 -Merge: c9d89cec14 3c45b59e67 +Merge: c9d89cec1 3c45b59e6 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 6 08:34:10 2011 -0700 Merge remote-tracking branch 'jturney/master' commit c9d89cec1407550cb2568f4cef146c93607bbae6 -Merge: a52049de2f bc61787a20 +Merge: a52049de2 bc61787a2 Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 4 11:57:39 2011 -0700 @@ -91688,7 +92614,7 @@ Date: Wed Mar 23 18:06:51 2011 +0200 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit a52049de2f846fe984d4db5ac8d2c1826c7b2d0b -Merge: d044d36756 266ea63bc3 +Merge: d044d3675 266ea63bc Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Mon Apr 4 09:58:53 2011 +1000 @@ -91864,7 +92790,7 @@ Date: Tue Mar 29 14:27:41 2011 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit e0a2ad51dfb7373aa602335490d9666d6101b5ea -Merge: 327e1d8801 3d688316af +Merge: 327e1d880 3d688316a Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 30 10:51:27 2011 -0700 @@ -92093,14 +93019,14 @@ Date: Mon Mar 28 17:18:39 2011 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit a095a6d4e8f5090907e8d3d66018636216300846 -Merge: a22486f848 ef9d04f8ad +Merge: a22486f84 ef9d04f8a 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: 2ef4ff45ef 633b81e8ba +Merge: 2ef4ff45e 633b81e8b Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 27 18:27:10 2011 -0700 @@ -92308,7 +93234,7 @@ Date: Tue Mar 22 19:01:48 2011 -0700 Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> commit 03f45df93469f6aef391e97007b9614e0770cc4c -Merge: efcb7275ce 5fb329a04a +Merge: efcb7275c 5fb329a04 Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 23 13:38:37 2011 +0900 @@ -92497,7 +93423,7 @@ Date: Sun Mar 13 20:01:30 2011 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0ac4931753a5d5925fc844c8cbec08585aea57a7 -Merge: a8146f6bec d7f8011418 +Merge: a8146f6be d7f801141 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 14 13:06:41 2011 -0700 @@ -92817,7 +93743,7 @@ Date: Wed Mar 9 15:11:42 2011 +1000 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> commit c3c0e2fdd326214e271ce144e8fc2725cbd738ef -Merge: a19771e433 73555555a4 +Merge: a19771e43 73555555a Author: Keith Packard <keithp@keithp.com> Date: Wed Mar 9 14:25:54 2011 -0800 @@ -93186,28 +94112,28 @@ Date: Fri Mar 4 01:12:01 2011 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6c90e839d9872a37d371578c9c423e8213922044 -Merge: 0bc95d5b06 edcceedbd3 +Merge: 0bc95d5b0 edcceedbd Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 14:41:44 2011 -0800 Merge remote branch 'whot/for-keith' commit 0bc95d5b06dcea65a1aa193ea907b50f7dd168b5 -Merge: 3f41f4adea 69a9171dbb +Merge: 3f41f4ade 69a9171db Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 14:33:08 2011 -0800 Merge remote branch 'jeremyhu/master' commit 3f41f4adea4bbb90d4bda4dab600595b655e3ed8 -Merge: 8e4c3ce55b dae24abcd4 +Merge: 8e4c3ce55 dae24abcd Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 14:12:36 2011 -0800 Merge remote branch 'sandmann/for-keithp' commit 8e4c3ce55b0f186bc6ba4039e30629669b6087b7 -Merge: f3d19c0cf3 296561506a +Merge: f3d19c0cf 296561506 Author: Keith Packard <keithp@keithp.com> Date: Thu Mar 3 13:42:07 2011 -0800 @@ -93281,7 +94207,7 @@ Date: Mon Feb 28 12:32:53 2011 -0500 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit c2207d11f243900bc2f641e08d80da63d84e97a8 -Merge: 00779932de 579ee8f5d8 +Merge: 00779932d 579ee8f5d Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Mon Feb 28 11:26:09 2011 +1000 @@ -93536,7 +94462,7 @@ Date: Fri Feb 25 11:08:19 2011 +1000 Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org> commit 229b055bdbc53370944401649234e8a38183f4fb -Merge: 6178959e3d b17fc99cb9 +Merge: 6178959e3 b17fc99cb Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 24 19:44:35 2011 -0800 @@ -93590,7 +94516,7 @@ Date: Thu Feb 24 19:18:35 2011 -0800 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit 83861595782aaa05907f9cf7b236d50261d404d9 -Merge: a1cc0e52b0 4102a00962 +Merge: a1cc0e52b 4102a0096 Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 24 18:59:07 2011 -0800 @@ -93610,7 +94536,7 @@ Date: Tue Nov 30 21:17:19 2010 +0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 365ad68fb9f7029550505b7c276a808050cada9c -Merge: 0801afbd7c 720c895db9 +Merge: 0801afbd7 720c895db Author: Keith Packard <keithp@keithp.com> Date: Thu Feb 24 18:49:40 2011 -0800 @@ -93944,7 +94870,7 @@ Date: Wed Feb 23 14:44:23 2011 +0100 Signed-off-by: Cyril Brulebois <kibi@debian.org> commit 579ee8f5d84c3a523b7b3e3941eabb226d1d19e2 -Merge: b636893137 17265ccb02 +Merge: b63689313 17265ccb0 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Feb 23 08:44:42 2011 +1000 @@ -94250,14 +95176,14 @@ Date: Fri Feb 18 14:46:33 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 2c77aeb39f59f1a94cc603a2e6256a62ce785c36 -Merge: 816d67de2b 402b329c3a +Merge: 816d67de2 402b329c3 Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 14:29:32 2011 -0800 Merge remote branch 'jcristau/for-keith' commit 816d67de2ba9bdfe652da32cb6447a3056342b98 -Merge: a73c28f0bd 3bbb70a1a7 +Merge: a73c28f0b 3bbb70a1a Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 12:20:26 2011 -0800 @@ -94277,14 +95203,14 @@ Date: Thu Feb 10 16:27:29 2011 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0bc9b15a622377c57e617411ccd26c4b5bf8cba4 -Merge: d1123b66eb 93cd4b1034 +Merge: d1123b66e 93cd4b103 Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 12:04:41 2011 -0800 Merge remote branch 'ajax/for-keithp' commit d1123b66ebbcf96dd816236f54befc568a5f7c68 -Merge: 5d020c3135 f6e4ace9ea +Merge: 5d020c313 f6e4ace9e Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 18 11:59:25 2011 -0800 @@ -94999,7 +95925,7 @@ Date: Thu Jan 13 20:19:18 2011 +0200 Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com> commit ea1ffd3e60bdcedbec5a6f28929f8677bf45d450 -Merge: 12b0f7df2c 53602c3621 +Merge: 12b0f7df2 53602c362 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 15:19:55 2011 -0800 @@ -95090,21 +96016,21 @@ Date: Sun Jan 30 14:06:14 2011 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 246d40b685292fa6393ba22127152137494af2af -Merge: 70f2d39fbd 8c1f75a1d4 +Merge: 70f2d39fb 8c1f75a1d Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 14:51:33 2011 -0800 Merge remote branch 'jeremyhu/master' commit 70f2d39fbde38d0baa687f1755b6c4c686f23052 -Merge: 3a91c2d21c a9d3c43a57 +Merge: 3a91c2d21 a9d3c43a5 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 14:43:19 2011 -0800 Merge remote branch 'jturney/master' commit 3a91c2d21c3231e2a011d95c3cfc01785430c1cf -Merge: ac0a00a840 82b1eaa6ca +Merge: ac0a00a84 82b1eaa6c Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 2 14:37:00 2011 -0800 @@ -95357,21 +96283,21 @@ Date: Thu Jan 13 16:08:29 2011 -0800 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> commit be3be7580b6f6fd2f7fa4d4abfe5e1ab19470223 -Merge: 57a1d9b853 a1d885fdd6 +Merge: 57a1d9b85 a1d885fdd Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 20 21:21:21 2011 -0800 Merge remote branch 'ajax/for-keithp' commit 57a1d9b85331f6fe19d5111f5163139572ffbf02 -Merge: 24ce650cf4 6423769799 +Merge: 24ce650cf 642376979 Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 20 21:16:24 2011 -0800 Merge remote branch 'whot/for-keith' commit 24ce650cf4f0c6fa72faecd38c53d40703e6c959 -Merge: bbdf81a056 09fd010902 +Merge: bbdf81a05 09fd01090 Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 20 21:11:53 2011 -0800 @@ -95879,14 +96805,14 @@ Date: Sat Jan 15 12:13:39 2011 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit abfea17342da774aa4e3a351a73c8f2af6e6fd28 -Merge: 361128389e e65c3f8bcc +Merge: 361128389 e65c3f8bc Author: Keith Packard <keithp@keithp.com> Date: Tue Jan 18 15:19:34 2011 -0800 Merge remote branch 'ajax/for-keithp' commit 361128389e5cb0101cbd091ff8de77cf34608f6c -Merge: 65ceaadbf0 d9225b9602 +Merge: 65ceaadbf d9225b960 Author: Keith Packard <keithp@keithp.com> Date: Tue Jan 18 15:18:08 2011 -0800 @@ -96224,7 +97150,7 @@ Date: Tue Nov 23 11:38:50 2010 -0800 Acked-by: Gaetan Nadon <memsize@videotron.ca> commit 8456625d64bb0013a496f3b56ea3aa20cf7a6142 -Merge: aa30a86583 ce74e7562d +Merge: aa30a8658 ce74e7562 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Jan 7 09:35:07 2011 +1000 @@ -96569,14 +97495,14 @@ Date: Wed Jan 5 20:41:04 2011 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0dede200c9ac7adbe8b8c16efacc3edc1f183cd9 -Merge: 7714357f50 2e781457d4 +Merge: 7714357f5 2e781457d Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 5 08:51:46 2011 -0800 Merge remote branch 'vsyrjala/misc_fixes' commit 7714357f506782973d25e270f85140b42507ed35 -Merge: 02e18c9fb5 b01dd9d336 +Merge: 02e18c9fb b01dd9d33 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 5 08:43:18 2011 -0800 @@ -97269,7 +98195,7 @@ Date: Wed Dec 15 14:59:13 2010 -0500 Signed-off-by: Adam Jackson <ajax@redhat.com> commit e7dc253452a1ba64718a08fdc070405b494f53cd -Merge: d1107918d4 d5b0d58573 +Merge: d1107918d d5b0d5857 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 20 00:48:45 2010 -0800 @@ -97371,14 +98297,14 @@ Date: Fri Dec 10 00:08:24 2010 +0000 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> commit f1542f1d716723cba7c323849086585635121893 -Merge: 9716d31247 8a8fdd762a +Merge: 9716d3124 8a8fdd762 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 14 15:04:12 2010 -0800 Merge remote branch 'whot/for-keith' commit 9716d3124799c6db0d1c782aa72c72f972d5a158 -Merge: 03ea0b7726 f641e4b34a +Merge: 03ea0b772 f641e4b34 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 14 15:01:36 2010 -0800 @@ -97555,7 +98481,7 @@ Date: Wed Dec 8 18:54:30 2010 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 519d243f0c8e3c80226701f71d2cfa62e42dbff7 -Merge: 9f9c732311 446482efaa +Merge: 9f9c73231 446482efa Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 7 13:39:58 2010 -0800 @@ -98013,14 +98939,14 @@ Date: Sun Jun 6 15:23:37 2010 -0700 Reviewed-by: Aaron Plattner <aplattner@nvidia.com> commit f5b8bd620f91214c0b87e9b04d57015655792352 -Merge: 01e9fa7da3 8127c83c81 +Merge: 01e9fa7da 8127c83c8 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:51:06 2010 -0800 Merge remote branch 'jajones/for-keith' commit 01e9fa7da389fc7ab834b4234b8484514144b7f4 -Merge: 79870dbf72 68a1b0de95 +Merge: 79870dbf7 68a1b0de9 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:45:11 2010 -0800 @@ -98043,14 +98969,14 @@ Date: Sat Dec 4 16:13:29 2010 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit c4a7a5917ab828d4a0bd825a98e4d641bcb378f1 -Merge: 5de312a60d 714b68d9e5 +Merge: 5de312a60 714b68d9e Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:28:07 2010 -0800 Merge remote branch 'jeremyhu/master' commit 5de312a60d8227ed670849ecf888ea878aa81430 -Merge: 311cad3315 8f42b2b693 +Merge: 311cad331 8f42b2b69 Author: Keith Packard <keithp@keithp.com> Date: Mon Dec 6 19:22:52 2010 -0800 @@ -98401,7 +99327,7 @@ Date: Wed Nov 24 00:11:11 2010 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 3824417335ec00a87b51f8d05e592099b8507680 -Merge: dab064fa5e f4f41c812d +Merge: dab064fa5 f4f41c812 Author: Keith Packard <keithp@keithp.com> Date: Thu Dec 2 08:39:33 2010 -0800 @@ -98651,14 +99577,14 @@ Date: Sat Nov 27 00:14:51 2010 -0800 Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> commit 02449ee24b484c9fea501df5274d95a9f87cab23 -Merge: afd6eb66d5 b85f9063c2 +Merge: afd6eb66d b85f9063c Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 30 13:30:59 2010 -0800 Merge remote branch 'ajax/for-keithp' commit afd6eb66d5ef6a59be4c03da4588aaa2ee47b9ad -Merge: b16964910d ffcbfa0063 +Merge: b16964910 ffcbfa006 Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 30 13:28:13 2010 -0800 @@ -99176,14 +100102,14 @@ Date: Wed Nov 24 14:20:30 2010 +1000 Reviewed-by: Keith Packard <keithp@keithp.com> commit 4e0f8f666e61390206c42ad2087477a912525bc7 -Merge: 400ddf2f58 639600fa7e +Merge: 400ddf2f5 639600fa7 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 24 11:47:33 2010 -0800 Merge remote branch 'whot/for-keith' commit 400ddf2f58ce673c74d4e8ee829729cd3c75f8c9 -Merge: 7250f078c1 e074f745a8 +Merge: 7250f078c e074f745a Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 24 11:46:18 2010 -0800 @@ -99533,21 +100459,21 @@ Date: Tue Jun 22 19:45:26 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 38c46ccf796462d068d95acb9022de2acfc3a1f7 -Merge: 3051dd5135 c8998af3eb +Merge: 3051dd513 c8998af3e Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 15 09:06:33 2010 +0800 Merge remote branch 'whot/for-keith' commit 3051dd5135962283fc6c7de377a7c819d8a04e7f -Merge: ed547a9fc8 c5975722a9 +Merge: ed547a9fc c5975722a Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 15 08:58:02 2010 +0800 Merge remote branch 'jeremyhu/master' commit ed547a9fc8a4f5cd95ef882b656a376c163eda6d -Merge: 78f94f19aa 84e8de1271 +Merge: 78f94f19a 84e8de127 Author: Keith Packard <keithp@keithp.com> Date: Mon Nov 15 08:51:27 2010 +0800 @@ -99818,7 +100744,7 @@ Date: Wed Nov 10 21:35:58 2010 -0800 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 88cb61e1e55c54982b90e2a77465faaac6a0ba89 -Merge: 19f43836d1 4ed4915bc0 +Merge: 19f43836d 4ed4915bc Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Nov 11 12:54:46 2010 +1000 @@ -99831,7 +100757,7 @@ Date: Thu Nov 11 12:54:46 2010 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9 -Merge: 291c39dfef ec1bfbc669 +Merge: 291c39dfe ec1bfbc66 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 16:58:21 2010 -0800 @@ -99891,14 +100817,14 @@ Date: Sat Sep 11 17:55:57 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit c9c0f93f8ed42413a05193ee71c69fa6b41f6a03 -Merge: 73f6de1ad8 4132b1c591 +Merge: 73f6de1ad 4132b1c59 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 16:11:29 2010 -0800 Merge remote branch 'whot/for-keith' commit 73f6de1ad8b5e1641102b54ff48a36ebb99ccacb -Merge: 333b6ed26e 3dc3aefb88 +Merge: 333b6ed26 3dc3aefb8 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 16:02:22 2010 -0800 @@ -100059,7 +100985,7 @@ Date: Mon May 17 19:39:54 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit acba00c0c1129fe4ef7655f018cd21dbb1ee9a1f -Merge: 383dfe23f1 44e8165414 +Merge: 383dfe23f 44e816541 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 10 14:41:08 2010 -0800 @@ -100253,7 +101179,7 @@ Date: Thu Nov 4 12:53:18 2010 +1000 Reviewed-by: Julien Cristau <jcristau@debian.org> commit a52efb096e166e325deb3d6b502671f339a4fa15 -Merge: fe8d122b13 f72aadd38b +Merge: fe8d122b1 f72aadd38 Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 3 06:50:45 2010 -0700 @@ -100655,7 +101581,7 @@ Date: Sun Oct 17 09:58:50 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit d738175eaf1098e29b8afb6de8e99b5098e366a7 -Merge: 8806a04f7f 9872e0f011 +Merge: 8806a04f7 9872e0f01 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 19 22:50:15 2010 -0700 @@ -101071,7 +101997,7 @@ Date: Tue Mar 23 16:34:26 2010 +0000 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> commit 5aff712a8d2eb9f965ecbb93216cc0bcdc327ae6 -Merge: 5b98c6267f e354ccac36 +Merge: 5b98c6267 e354ccac3 Author: Keith Packard <keithp@keithp.com> Date: Mon Oct 18 17:16:23 2010 -0700 @@ -101282,7 +102208,7 @@ Date: Mon Sep 27 13:58:40 2010 -0400 Signed-off-by: Adam Jackson <ajax@redhat.com> commit eaf0b6a4d83d49930d21d5191f335fcac962632e -Merge: 693e92d404 23229c7ce5 +Merge: 693e92d40 23229c7ce Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Oct 15 13:46:59 2010 +1000 @@ -101689,7 +102615,7 @@ Date: Sat Sep 25 10:05:10 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit 5532687a929426c4b1c4667f4591ed362f097c9b -Merge: 9df4fb0adf 682a3ee608 +Merge: 9df4fb0ad 682a3ee60 Author: Keith Packard <keithp@keithp.com> Date: Tue Sep 28 08:15:07 2010 -0700 @@ -101865,7 +102791,7 @@ Date: Tue Sep 21 15:13:30 2010 +0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 98197d931b266674557b52b4a7099c6470114e55 -Merge: 01ad3725a8 402942cdbc +Merge: 01ad3725a 402942cdb Author: Keith Packard <keithp@keithp.com> Date: Thu Sep 23 15:30:37 2010 -0700 @@ -102117,7 +103043,7 @@ Date: Sun May 30 19:12:31 2010 +0300 Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> commit c768cdda92696b636c10bb2df64167d5274b4b99 -Merge: 5a725385fb 2079853632 +Merge: 5a725385f 207985363 Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 13 16:48:33 2010 -0700 @@ -102507,7 +103433,7 @@ Date: Wed Sep 8 16:08:24 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit bbffb85461eb63bfb1e01e2cb9674607b9221604 -Merge: 9a1a4ccbe0 71972c2534 +Merge: 9a1a4ccbe 71972c253 Author: Keith Packard <keithp@keithp.com> Date: Fri Sep 10 11:55:34 2010 -0700 @@ -102546,7 +103472,7 @@ Date: Mon Aug 30 21:24:30 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit ca0d578d29f37b61e62556fff59732741885625b -Merge: cf88363db0 08adf41f63 +Merge: cf88363db 08adf41f6 Author: Keith Packard <keithp@keithp.com> Date: Fri Sep 10 11:50:27 2010 -0700 @@ -102576,7 +103502,7 @@ Date: Fri Aug 27 10:20:29 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit fa22f97af65efc2a147e9be0b7f288848965ff60 -Merge: 6edbdb7f9e 6546665293 +Merge: 6edbdb7f9 654666529 Author: Keith Packard <keithp@keithp.com> Date: Fri Sep 10 11:47:41 2010 -0700 @@ -104201,7 +105127,7 @@ Date: Sat Jun 19 23:40:37 2010 -0700 Reviewed-by: Patrick E. Kane <pekane52@gmail.com> commit 9fbbff3c0456f1969d45cc957d3260723caf62d7 -Merge: 95756f410c 9ac8e206ff +Merge: 95756f410 9ac8e206f Author: Keith Packard <keithp@keithp.com> Date: Wed Jul 21 11:56:39 2010 -0700 @@ -104286,7 +105212,7 @@ Date: Wed Jul 14 12:57:29 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0fc02c0bf92f694889589e3648acc08d4684de37 -Merge: 0540c46066 9d8ec712a6 +Merge: 0540c4606 9d8ec712a Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 13 15:05:36 2010 -0700 @@ -104383,7 +105309,7 @@ Date: Fri Jul 9 10:36:12 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 2307ab5bc9365ebbe04568edb7c7620a23689b70 -Merge: c65280ce8d fd4f5059f0 +Merge: c65280ce8 fd4f5059f Author: Keith Packard <keithp@keithp.com> Date: Tue Jul 6 23:54:54 2010 -0400 @@ -104546,7 +105472,7 @@ Date: Thu Jun 3 19:00:53 2010 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 69b2b5c85ec079ef49f84722daa5f148cedc2e1b -Merge: b90faa7156 1432785839 +Merge: b90faa715 143278583 Author: Keith Packard <keithp@keithp.com> Date: Thu Jul 1 23:46:53 2010 -0400 @@ -105363,7 +106289,7 @@ Date: Thu Jun 10 19:21:18 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit a41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9 -Merge: 7e8f100121 f4190feb25 +Merge: 7e8f10012 f4190feb2 Author: Keith Packard <keithp@keithp.com> Date: Fri Jun 11 10:08:13 2010 -0700 @@ -105516,7 +106442,7 @@ Date: Fri Jun 4 16:58:58 2010 +0700 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> commit 620ca54aaa0b363fcf68cec1bd6c37e68c988352 -Merge: fd69234db0 8ff9b502cf +Merge: fd69234db 8ff9b502c Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 10 19:18:53 2010 -0700 @@ -105588,7 +106514,7 @@ Date: Thu Jun 3 19:17:14 2010 -0700 Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> commit 07a093add0b7e40c4d9b9b59273e3ff9e14a88a7 -Merge: 84190d2095 dc614484f9 +Merge: 84190d209 dc614484f Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 10 18:39:10 2010 -0700 @@ -105740,7 +106666,7 @@ Date: Thu Jun 10 06:11:10 2010 -0700 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 84190d20954ef7888e4d96832c2a4b3225b4dfa2 -Merge: 4172aa137c 5e1ef1f4dd +Merge: 4172aa137 5e1ef1f4d Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 10 13:36:35 2010 -0700 @@ -106068,7 +106994,7 @@ Date: Fri Jun 4 14:22:06 2010 +0700 Reviewed-by: Daniel Stone <daniel@fooishbar.org> commit 5d4e2c594059ffb536c8e506c2623320d3c6a787 -Merge: eacc42132e 793dd39946 +Merge: eacc42132 793dd3994 Author: Keith Packard <keithp@keithp.com> Date: Sat Jun 5 22:20:28 2010 -0700 @@ -106473,7 +107399,7 @@ Date: Fri Jun 4 11:09:46 2010 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0f12e86e600522768f5f64eafc1230526e700ab7 -Merge: aa7c09f7d0 f114f54986 +Merge: aa7c09f7d f114f5498 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 3 15:09:32 2010 -0700 @@ -106655,7 +107581,7 @@ Date: Wed Jun 2 14:31:56 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b13d7a8e09c8e3eb5003420c3c0484431e5a052b -Merge: f0ab726d89 dcceb90b1d +Merge: f0ab726d8 dcceb90b1 Author: Keith Packard <keithp@keithp.com> Date: Thu Jun 3 07:01:26 2010 -0700 @@ -107120,7 +108046,7 @@ Date: Mon May 24 09:14:27 2010 -0700 Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> commit b11465a6ecdc2b8373e6fc8af427edc4602bcaa1 -Merge: 7c085aebfe 0abf065e38 +Merge: 7c085aebf 0abf065e3 Author: Keith Packard <keithp@keithp.com> Date: Mon May 24 22:18:31 2010 -0700 @@ -107259,7 +108185,7 @@ Date: Tue May 18 19:35:10 2010 +0300 Reviewed-by: Alex Deucher <alexdeucher@gmail.com> commit 2ffffb4daf6161e6a22d81442ecf6209acc9e975 -Merge: b5e0f6d8f4 d5306084b5 +Merge: b5e0f6d8f d5306084b Author: Keith Packard <keithp@keithp.com> Date: Sun May 23 23:22:08 2010 -0700 @@ -107634,14 +108560,14 @@ Date: Fri May 14 19:31:56 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit 103507af0c0ce7d7482a67163249864af36a2374 -Merge: 8bd8d81dc4 99fcf655bd +Merge: 8bd8d81dc 99fcf655b Author: Keith Packard <keithp@keithp.com> Date: Wed May 19 22:27:53 2010 -0700 Merge remote branch 'vignatti/bus-cleanup' commit 8bd8d81dc473bf72ea108b1896a55e32defa02e2 -Merge: c620a1c0a4 66d5ecc5fd +Merge: c620a1c0a 66d5ecc5f Author: Keith Packard <keithp@keithp.com> Date: Wed May 19 22:27:20 2010 -0700 @@ -107661,7 +108587,7 @@ Date: Thu May 20 10:26:56 2010 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8b6c1809c09f832051327d86e1a25dc0ec5cc878 -Merge: d88ba7721d c38552d115 +Merge: d88ba7721 c38552d11 Author: Keith Packard <keithp@keithp.com> Date: Wed May 19 12:58:02 2010 -0700 @@ -108137,7 +109063,7 @@ Date: Fri May 14 16:25:43 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit f87002cb7d8729b1da4cbefe7653f4cfd3a2d956 -Merge: a4fbc0feda 890f536f8d +Merge: a4fbc0fed 890f536f8 Author: Keith Packard <keithp@keithp.com> Date: Fri May 14 11:46:29 2010 -0700 @@ -108175,7 +109101,7 @@ Date: Thu May 13 07:12:43 2010 +0300 Reviewed-by: Keith Packard <keithp@keithp.com> commit 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534 -Merge: f2a0c324e3 92ed75ac59 +Merge: f2a0c324e 92ed75ac5 Author: Keith Packard <keithp@keithp.com> Date: Thu May 13 18:22:49 2010 -0700 @@ -108457,7 +109383,7 @@ Date: Sat May 8 15:19:03 2010 -0700 Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> commit 59857ee5da5f1f3f4900292581b9586477513211 -Merge: 21ceae9002 432cbbec19 +Merge: 21ceae900 432cbbec1 Author: Keith Packard <keithp@keithp.com> Date: Wed May 12 16:48:08 2010 -0700 @@ -108678,7 +109604,7 @@ Date: Tue May 11 09:08:40 2010 -0700 Reviewed-by: Adam Jackson <ajax@redhat.com> commit 3df22b293c1f1d27e7ce16662744c578d35b5aba -Merge: fa6c701257 9de0e31746 +Merge: fa6c70125 9de0e3174 Author: Keith Packard <keithp@keithp.com> Date: Tue May 11 08:38:44 2010 -0700 @@ -108808,7 +109734,7 @@ Date: Mon May 10 14:00:49 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 95074538cce93abc1739a4d9dd78b0500fb8fec9 -Merge: c0799779df 2160ff5240 +Merge: c0799779d 2160ff524 Author: Keith Packard <keithp@keithp.com> Date: Mon May 10 13:49:33 2010 -0700 @@ -109036,7 +109962,7 @@ Date: Fri Apr 30 12:18:09 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit a80b1f888f2f7674a715d512ab950eeadee20448 -Merge: 4971099860 0efd7b8d82 +Merge: 497109986 0efd7b8d8 Author: Keith Packard <keithp@keithp.com> Date: Sun May 2 16:35:17 2010 -0700 @@ -109145,7 +110071,7 @@ Date: Wed Apr 28 12:37:08 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 986d46144b183a36b4e98aed95eca0c55a8b4251 -Merge: a974c8e7cb b5b8f91b82 +Merge: a974c8e7c b5b8f91b8 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:40:53 2010 -0700 @@ -109155,21 +110081,21 @@ Date: Fri Apr 30 12:40:53 2010 -0700 hw/xfree86/common/xf86xv.c commit a974c8e7cba40c8d7d1b91e07de8c414627b71a2 -Merge: 6581bc4591 02e86221b8 +Merge: 6581bc459 02e86221b Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:33:00 2010 -0700 Merge remote branch 'whot/for-keith' commit 6581bc4591746c906d97f8b868f946c47bc6d756 -Merge: 0e91e19f78 d073e51bee +Merge: 0e91e19f7 d073e51be Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:29:52 2010 -0700 Merge remote branch 'yselkowitz/master' commit 0e91e19f783d21198fc2e210203e0f10040a9cd0 -Merge: 81a081c1f0 edbc56c088 +Merge: 81a081c1f edbc56c08 Author: Keith Packard <keithp@keithp.com> Date: Fri Apr 30 12:27:51 2010 -0700 @@ -109363,7 +110289,7 @@ Date: Sat Apr 17 21:36:23 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit 3f63db89191701139d45332ca80b9d6eb327c773 -Merge: 41bdb6c003 54e51de8cd +Merge: 41bdb6c00 54e51de8c Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 26 20:18:13 2010 -0700 @@ -109760,7 +110686,7 @@ Date: Wed Apr 21 18:28:13 2010 +0300 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7ac6a6b7d0dfc5e021270b2898accd3425aa008a -Merge: 0782894b57 f7ef6fd9a1 +Merge: 0782894b5 f7ef6fd9a Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 21 16:07:38 2010 -0700 @@ -110018,7 +110944,7 @@ Date: Mon Apr 19 09:26:10 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit b3ab978df861c08298f57529e3db980489055c35 -Merge: a92b2c2c8d 0ad022a729 +Merge: a92b2c2c8 0ad022a72 Author: Keith Packard <keithp@keithp.com> Date: Sun Apr 18 22:01:40 2010 -0700 @@ -110180,7 +111106,7 @@ Date: Wed Apr 14 17:27:51 2010 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit e424d5812300e82de375d83dc0b490a76d865016 -Merge: 5b0faf3554 0e7703f9b1 +Merge: 5b0faf355 0e7703f9b Author: Keith Packard <keithp@keithp.com> Date: Thu Apr 15 15:01:34 2010 -0700 @@ -110366,7 +111292,7 @@ Date: Fri Apr 9 10:58:48 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit ab60975fe28cb135b4183c57b7f50d3615921c1f -Merge: adbbc66108 59edde7c28 +Merge: adbbc6610 59edde7c2 Author: Keith Packard <keithp@keithp.com> Date: Mon Apr 12 21:40:41 2010 -0700 @@ -110426,7 +111352,7 @@ Date: Tue Feb 16 08:11:41 2010 -0800 Reviewed-by: Keith Packard <keithp@keithp.com> commit d7c98c1c81ae272f66edb05fde20f4c616604add -Merge: 82cf3a4ae0 03ccbd2579 +Merge: 82cf3a4ae 03ccbd257 Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 7 22:25:51 2010 -0700 @@ -110594,14 +111520,14 @@ Date: Mon Apr 5 19:12:22 2010 -0400 Signed-off-by: Keith Packard <keithp@keithp.com> commit cbda58c963af5bb9c4643e9017dd4eec589ceff3 -Merge: a7698a6776 c983f40fe4 +Merge: a7698a677 c983f40fe Author: Keith Packard <keithp@keithp.com> Date: Wed Apr 7 15:51:38 2010 -0700 Merge remote branch 'yselkowitz/master' commit a7698a677682a32960b885c22fdba2add70f4658 -Merge: 495cec794d 165a4a9c7d +Merge: 495cec794 165a4a9c7 Author: Keith Packard <keithp@keithp.com> Date: Tue Apr 6 12:36:15 2010 -0700 @@ -110748,14 +111674,14 @@ Date: Fri Mar 26 09:33:20 2010 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 57cb1a854a1b6d91d214b3fa250a7df2ed20d433 -Merge: 4b3d67a764 28a5f14b40 +Merge: 4b3d67a76 28a5f14b4 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 29 11:46:00 2010 -0700 Merge remote branch 'jeremyhu/master' commit 4b3d67a7647f696957727948f9757a261e15d14e -Merge: 579715f830 aa91508356 +Merge: 579715f83 aa9150835 Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 29 11:44:07 2010 -0700 @@ -111172,7 +112098,7 @@ Date: Mon Mar 22 18:01:17 2010 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit b29220dc765cb6f878c5466e00e4bd21f3bd803d -Merge: c3da76643a ed31d50b5f +Merge: c3da76643 ed31d50b5 Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 21 23:01:58 2010 -0700 @@ -111420,7 +112346,7 @@ Date: Sun Mar 21 17:23:46 2010 -0700 Bump to 1.7.99.902 -- 1.8 RC2 commit 235fa5030428084368e5be57fca695647b7b79c4 -Merge: 1c612acca8 fa5103a02b +Merge: 1c612acca fa5103a02 Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 21 15:38:40 2010 -0700 @@ -111446,7 +112372,7 @@ Date: Wed Mar 17 14:32:38 2010 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 95ca39b981624df5338a16b506289014c431ae82 -Merge: e7ff956638 bf181915e1 +Merge: e7ff95663 bf181915e Author: Keith Packard <keithp@keithp.com> Date: Sun Mar 21 15:24:06 2010 -0700 @@ -111634,7 +112560,7 @@ Date: Fri Mar 12 16:52:56 2010 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit df9b6f16b27398545cd4cff8a56dd59a3813351d -Merge: 5f169f5493 5172253bae +Merge: 5f169f549 5172253ba Author: Keith Packard <keithp@keithp.com> Date: Mon Mar 15 08:26:58 2010 -0700 @@ -111959,7 +112885,7 @@ Date: Wed Jan 27 20:38:38 2010 +0000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 780c95caf9888fa4548dfe4c1c78a7e7ce99a9ed -Merge: 018b177591 758f697175 +Merge: 018b17759 758f69717 Author: Keith Packard <keithp@keithp.com> Date: Wed Feb 24 09:59:19 2010 -0800 @@ -112127,7 +113053,7 @@ Date: Mon Feb 15 14:18:00 2010 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit ca9c2472d74c7107ccc117e2c9c723c168d2eccf -Merge: e40ba5798c 02d1116e7e +Merge: e40ba5798 02d1116e7 Author: Keith Packard <keithp@keithp.com> Date: Mon Feb 22 13:26:06 2010 -0800 @@ -112465,7 +113391,7 @@ Date: Fri Feb 12 13:46:03 2010 -0800 Bump to 1.7.99.901 -- 1.8 RC1 commit 57ffeb3f2b3313dcef92a396f1f55fdbc064b2c5 -Merge: c6d9bc092c c76248fda9 +Merge: c6d9bc092 c76248fda Author: Keith Packard <keithp@keithp.com> Date: Fri Feb 12 13:36:32 2010 -0800 @@ -113192,7 +114118,7 @@ Date: Wed Jan 27 11:34:45 2010 -0800 Signed-off-by: Keith Packard <keithp@keithp.com> commit 0b21a0416b4cb2c32da5e3fda05a0682eb97d56e -Merge: 1e6fd65d0b 837bd2bbc0 +Merge: 1e6fd65d0 837bd2bbc Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 27 14:14:15 2010 -0800 @@ -113511,7 +114437,7 @@ Date: Mon Jan 11 18:02:55 2010 -0800 Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> commit 44f9c3d16c9c9b3362306a9ba26ee52e7baafeca -Merge: 032f97808c 84956ca43b +Merge: 032f97808 84956ca43 Author: Keith Packard <keithp@keithp.com> Date: Wed Jan 13 10:19:21 2010 -0800 @@ -113667,7 +114593,7 @@ Date: Thu Jan 7 14:12:34 2010 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 8ab4749aaefb3727b9fc58bb37b50a2d07eb1531 -Merge: 8d53d84485 9437504b21 +Merge: 8d53d8448 9437504b2 Author: Keith Packard <keithp@keithp.com> Date: Thu Jan 7 10:32:21 2010 -0800 @@ -114030,14 +114956,14 @@ Date: Wed Dec 23 16:05:16 2009 +1000 Signed-off-by: Julien Cristau <jcristau@debian.org> commit 9fad8f06fb89ac2ae05bea0fa24cab3df7677297 -Merge: 871bbe1d87 42e8c9224e +Merge: 871bbe1d8 42e8c9224 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 30 09:28:19 2009 -0800 Merge remote branch 'dbn/inputclass' commit 871bbe1d87fa3c7ebd075e1d1eec33e45b08493d -Merge: db2c6f7c91 e1165632bd +Merge: db2c6f7c9 e1165632b Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 30 09:16:45 2009 -0800 @@ -114352,7 +115278,7 @@ Date: Tue Dec 22 15:40:40 2009 +1000 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7dc78db79edd15b971110acaf16bbe7f69e40bdb -Merge: 81a623f036 b44c9be244 +Merge: 81a623f03 b44c9be24 Author: Keith Packard <keithp@keithp.com> Date: Tue Dec 22 21:25:18 2009 -0800 @@ -114533,14 +115459,14 @@ Date: Mon Dec 14 08:41:18 2009 +1000 Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> commit 0cb638dc6822e54567a1731ea1cf588475a226e9 -Merge: 6a6a041c2d fbdf493a3e +Merge: 6a6a041c2 fbdf493a3 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 16 21:58:44 2009 -0800 Merge remote branch 'alanc/master' commit 6a6a041c2d8d32f6355db77cd59cff371038c683 -Merge: 8127465f44 d503195504 +Merge: 8127465f4 d50319550 Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 16 21:57:32 2009 -0800 @@ -114807,7 +115733,7 @@ Date: Tue Dec 1 11:04:06 2009 -0800 Acked-by: Soeren Sandmann <sandmann@daimi.au.dk> commit d3e054ac07dae12a82ad764b0622fddbef4b9ec5 -Merge: 12fb31815d 97a6454ea5 +Merge: 12fb31815 97a6454ea Author: Keith Packard <keithp@keithp.com> Date: Fri Dec 11 09:22:22 2009 -0800 @@ -115026,7 +115952,7 @@ Date: Wed Dec 2 20:24:02 2009 +0100 Signed-off-by: Keith Packard <keithp@keithp.com> commit 98c8b752254a27ab1aaf881b36bfda0f74929d0a -Merge: 0e084d8c71 91c1bd78f7 +Merge: 0e084d8c7 91c1bd78f Author: Keith Packard <keithp@keithp.com> Date: Wed Dec 2 15:28:07 2009 -0800 @@ -116024,7 +116950,7 @@ Date: Wed Nov 4 15:35:37 2009 +0200 Signed-off-by: Keith Packard <keithp@keithp.com> commit 7442f3355ab8f0bb2b1a270da18c65d8d315d4dd -Merge: 0573042cdd 7897b6c2d4 +Merge: 0573042cd 7897b6c2d Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 4 08:55:20 2009 -0800 @@ -116285,7 +117211,7 @@ Date: Wed Oct 28 11:44:27 2009 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit deb72fc61464250af8185dab2da8ee09f13c55d8 -Merge: 55f4c80a4c a60e676f1f +Merge: 55f4c80a4 a60e676f1 Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 28 10:54:13 2009 -0700 @@ -116436,7 +117362,7 @@ Date: Thu Oct 22 00:00:35 2009 +0900 Signed-off-by: Keith Packard <keithp@keithp.com> commit 1228e2d052f0bb98175c55c194340773b5fedb40 -Merge: 08e7f62faf 52bc6d9449 +Merge: 08e7f62fa 52bc6d944 Author: Keith Packard <keithp@keithp.com> Date: Wed Oct 21 22:46:53 2009 +0900 @@ -116866,7 +117792,7 @@ Date: Tue Oct 13 20:14:58 2009 -0500 Signed-off-by: Keith Packard <keithp@keithp.com> commit 6e158003e80534ce007290f75c89d698aec1d00b -Merge: 2b14e14203 5e762f0e2f +Merge: 2b14e1420 5e762f0e2 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 13 18:40:42 2009 -0700 @@ -117108,7 +118034,7 @@ Date: Wed Oct 7 09:07:03 2009 -0700 Signed-off-by: Keith Packard <keithp@keithp.com> commit 68304215e25876ee639015969b4f07e1c9c515e0 -Merge: 6676f49e34 315aaef557 +Merge: 6676f49e3 315aaef55 Author: Keith Packard <keithp@keithp.com> Date: Tue Oct 6 22:41:42 2009 -0700 @@ -124511,7 +125437,7 @@ Date: Thu Jun 4 17:33:25 2009 -0400 xace: fix a bad send access hook call. commit 993daf06497c85bb6a1e70592df380503d721dfb -Merge: 2bda50ee14 e1e8c7ddd7 +Merge: 2bda50ee1 e1e8c7ddd Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu Jun 4 15:11:36 2009 +1000 @@ -124574,7 +125500,7 @@ Date: Wed Jun 3 13:37:32 2009 -0400 s/MIN/min/, s/MAX/max/ (#2968) commit 6de67d3206f0a4e307070714564c19efc84da2ec -Merge: af4e658401 7f027d9dc0 +Merge: af4e65840 7f027d9dc Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Jun 3 16:11:33 2009 +1000 @@ -124969,7 +125895,7 @@ Date: Thu May 28 15:32:03 2009 -0400 These have been nops since 2006 and functionally void since 7.0. commit d7aef3f663f4b5d861799f8615dcd301d5ce2906 -Merge: a25f248fc3 e08c6a0752 +Merge: a25f248fc e08c6a075 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Thu May 28 17:20:58 2009 +1000 @@ -125021,7 +125947,7 @@ Date: Mon May 4 19:24:47 2009 -0500 Signed-off-by: Federico Mena Quintero <federico@novell.com> commit b12010e10f38951358b48ff1076c026f943b7cc3 -Merge: 6e69272473 f1441b8353 +Merge: 6e6927247 f1441b835 Author: Søren Sandmann Pedersen <sandmann@redhat.com> Date: Wed May 27 15:56:30 2009 -0400 @@ -126855,7 +127781,7 @@ Date: Thu Apr 23 08:42:38 2009 -0700 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> commit 057fc9a4f89282e440b5e11458f1dd8655879dd8 -Merge: 95628b797e 932d6bcbb6 +Merge: 95628b797 932d6bcbb Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri Apr 24 16:15:47 2009 +1000 @@ -127031,7 +127957,7 @@ Date: Fri Apr 17 15:22:57 2009 +0200 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> commit d5ad14c8ed4d8360e1df8cd0bacf6a7c9c31df91 -Merge: 54716fd3db 0e0642ee94 +Merge: 54716fd3d 0e0642ee9 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Sun Apr 19 22:28:22 2009 +1000 @@ -127858,7 +128784,7 @@ Date: Thu Mar 26 22:22:32 2009 -0700 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> commit 6c3b633299f12051fcf37fb8439f358de876cf03 -Merge: adf21dba76 0cfd481308 +Merge: adf21dba7 0cfd48130 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue Apr 7 19:36:27 2009 +1000 @@ -134359,7 +135285,7 @@ Date: Thu Dec 4 09:47:25 2008 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> commit 22d4ddcc3d63b7fbf2a23f5162075e4ee06db781 -Merge: d2dad384f5 c3bf15ba85 +Merge: d2dad384f c3bf15ba8 Author: Matthieu Herrb <matthieu@crux.(none)> Date: Sun Dec 7 23:56:15 2008 +0100 @@ -135315,7 +136241,7 @@ Date: Tue Nov 25 23:15:35 2008 -0800 New version of dolt commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b -Merge: 9ffc671939 ed597f19fd +Merge: 9ffc67193 ed597f19f Author: Keith Packard <keithp@keithp.com> Date: Tue Nov 25 22:19:08 2008 -0800 @@ -136196,7 +137122,7 @@ Date: Fri Nov 21 12:21:45 2008 +1000 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> commit 387563b77743d92be83420d982eaf57f5459a883 -Merge: 85f650c9b7 f6e01fa1b8 +Merge: 85f650c9b f6e01fa1b Author: Matthieu Herrb <matthieu.herrb@laas.fr> Date: Sun Nov 23 13:15:46 2008 +0100 @@ -136598,7 +137524,7 @@ Date: Fri Nov 14 12:36:20 2008 -0500 Signed-off-by: James Cloos <cloos@jhcloos.com> commit ba4e08244ed3923eecf26842dfc1df17c696e053 -Merge: 81fd17f5f4 5bad5d2abe +Merge: 81fd17f5f 5bad5d2ab Author: Alex Deucher <alexdeucher@gmail.com> Date: Thu Nov 13 15:04:18 2008 -0500 @@ -143702,7 +144628,7 @@ Date: Mon May 26 17:56:08 2008 +0930 Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709 -Merge: 5fe57787fa 29586101dc +Merge: 5fe57787f 29586101d Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon May 26 17:37:31 2008 +0930 @@ -144181,7 +145107,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: 2ae3bed337 dfb7de6571 +Merge: 2ae3bed33 dfb7de657 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Wed May 21 16:25:35 2008 +0930 @@ -144241,7 +145167,7 @@ Date: Tue May 20 10:54:32 2008 +0930 fb: shut up two compiler warnings. commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958 -Merge: fc7e2566cc 0178b6a4ab +Merge: fc7e2566c 0178b6a4a Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue May 20 10:20:14 2008 +0930 @@ -144841,7 +145767,7 @@ Date: Fri May 9 15:38:44 2008 -0700 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475> commit 7b3066d9b9099135d9c49e0682161d5568fc535b -Merge: 2a3d1421e0 315f089056 +Merge: 2a3d1421e 315f08905 Author: Drew Parsons <drew@emerall.com> Date: Sat May 10 00:01:15 2008 +1000 @@ -144941,7 +145867,7 @@ Date: Thu May 8 16:04:24 2008 -0400 Bug #13104: Remove broken XAA a1 glyph fast path. commit ddaecfa13cefee7c66b39b606c8640c6544d4943 -Merge: 9c2e0871cf cf20df39cc +Merge: 9c2e0871c cf20df39c Author: Adam Jackson <ajax@redhat.com> Date: Thu May 8 14:33:58 2008 -0400 @@ -145199,7 +146125,7 @@ Date: Fri May 2 14:56:58 2008 +0930 xfree86: don't try to repaint the cursor before cursors exist. commit 334456952930cb3e55c02fcdada2d0c074cd0520 -Merge: 8e56fd9728 3b8d53452c +Merge: 8e56fd972 3b8d53452 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Fri May 2 11:00:14 2008 +0930 @@ -146108,7 +147034,7 @@ Date: Mon Apr 21 22:06:38 2008 -0700 (cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44) commit 8190ef87547b704848231bde10b1cdffc6442790 -Merge: 179a082c26 2ddbfd3457 +Merge: 179a082c2 2ddbfd345 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Apr 22 18:04:05 2008 +0930 @@ -146746,7 +147672,7 @@ Date: Mon Apr 14 09:58:49 2008 +0200 EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8. commit 1a9d7205cd5640eb65f019336097d86301942ea7 -Merge: 90f491cf8e 6866e84e3c +Merge: 90f491cf8 6866e84e3 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Apr 14 16:25:58 2008 +0930 @@ -146931,7 +147857,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: cbe01b3083 b4380d8030 +Merge: cbe01b308 b4380d803 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Fri Apr 11 08:29:52 2008 +0930 @@ -147124,7 +148050,7 @@ Date: Tue Apr 8 20:37:25 2008 -0700 (cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9) commit cbe01b3083eb65c9d4259b1071683febebf11600 -Merge: 5ffbcfec3d 389dae73cc +Merge: 5ffbcfec3 389dae73c Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Wed Apr 9 10:46:46 2008 +0930 @@ -147224,7 +148150,7 @@ Date: Thu Apr 3 14:50:05 2008 -0400 EXA: Fix TS origin computation when implementing RenderComposite with tiling. commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab -Merge: b46a009186 6c0cfe3d43 +Merge: b46a00918 6c0cfe3d4 Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> Date: Mon Apr 7 07:56:41 2008 +0930 @@ -147236,7 +148162,7 @@ Date: Mon Apr 7 07:56:41 2008 +0930 dix/dispatch.c commit 539bf3c2836727e7560c64144071b086f8ea32fe -Merge: 3ab33e7cd4 6c0cfe3d43 +Merge: 3ab33e7cd 6c0cfe3d4 Author: Sascha Hlusiak <saschahlusiak@arcor.de> Date: Mon Apr 7 00:10:16 2008 +0200 @@ -147697,7 +148623,7 @@ Date: Thu Mar 27 15:18:39 2008 +1000 RH BZ 435216 commit 9df915b84d45d39aed7557c98883b20a66da2e96 -Merge: 47eb658e80 333e7123dc +Merge: 47eb658e8 333e7123d Author: Sascha Hlusiak <saschahlusiak@arcor.de> Date: Tue Mar 25 17:50:50 2008 +0100 @@ -148239,7 +149165,7 @@ Date: Tue Mar 4 02:44:48 2008 -0500 XACE: Check the return value of the selection create hook call. commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd -Merge: 23ae68a4c7 453661a9e1 +Merge: 23ae68a4c 453661a9e Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Mar 4 18:11:10 2008 +1030 @@ -149698,7 +150624,7 @@ Date: Fri Feb 1 14:13:29 2008 +1030 Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au> commit e5e531ce96264518f278f572a4d0bfcd345aa618 -Merge: 6c38682084 1692dcf197 +Merge: 6c3868208 1692dcf19 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Jan 31 16:36:17 2008 +1030 @@ -149815,14 +150741,14 @@ Date: Mon Jan 28 12:18:43 2008 -0800 (cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff) commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f -Merge: 1a88aed5c8 e915a26397 +Merge: 1a88aed5c e915a2639 Author: David Nusinow <dnusinow@debian.org> Date: Sat Jan 26 16:13:25 2008 -0500 Merge commit 'upstream/master' commit 0ac175597712edfeae676f536746a4d26d625e30 -Merge: 210eeef495 e915a26397 +Merge: 210eeef49 e915a2639 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sat Jan 26 13:55:07 2008 +1030 @@ -150276,7 +151202,7 @@ Date: Wed Jan 9 19:52:00 2008 -0800 More Xv extension byte swapping fixes commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca -Merge: 4e85c7c322 0883e838e2 +Merge: 4e85c7c32 0883e838e Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Jan 10 13:38:46 2008 +1030 @@ -150512,7 +151438,7 @@ Date: Thu Jan 3 18:09:56 2008 +1030 dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc. commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d -Merge: eace88989c ae869fc766 +Merge: eace88989 ae869fc76 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Jan 3 17:04:54 2008 +1030 @@ -151151,7 +152077,7 @@ Date: Fri Dec 14 00:53:54 2007 -0500 Bump video driver ABI and extension ABI for devPrivates rework. commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629 -Merge: 1c1a4bc970 cb0d7e2c26 +Merge: 1c1a4bc97 cb0d7e2c2 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Dec 14 00:32:24 2007 -0500 @@ -151199,7 +152125,7 @@ Date: Thu Dec 13 15:55:28 2007 -0800 (cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4) commit c8feb73f5841e7812d8dfdb91f1064e2033d028c -Merge: 9a7ce57363 a125ce4a84 +Merge: 9a7ce5736 a125ce4a8 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Dec 13 18:38:25 2007 -0500 @@ -152666,7 +153592,7 @@ Date: Mon Nov 19 21:01:22 2007 -0500 during merge conflict resolution. commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94 -Merge: 60be452c2e ea9c63e93b +Merge: 60be452c2 ea9c63e93 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Nov 19 18:10:46 2007 -0500 @@ -152994,7 +153920,7 @@ Date: Thu Nov 8 17:25:36 2007 -0500 Don't sleep(1) at server exit. commit 1603130236c55ddabc3854d4ba62d544debcf1f5 -Merge: f207e69d62 f7dd0c72b8 +Merge: f207e69d6 f7dd0c72b Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Nov 14 13:35:50 2007 -0500 @@ -153371,7 +154297,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: a8808ac3d0 0b729051c0 +Merge: a8808ac3d 0b729051c Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Nov 8 09:34:35 2007 +1030 @@ -153382,7 +154308,7 @@ Date: Thu Nov 8 09:34:35 2007 +1030 Xi/opendev.c commit e94ab0b502160376d1956345196f7e1c7e2e886f -Merge: 26e1fc7b42 9bee1c6912 +Merge: 26e1fc7b4 9bee1c691 Author: Dodji Seketeli <dodji@openedhand.com> Date: Wed Nov 7 19:04:24 2007 +0100 @@ -153421,7 +154347,7 @@ Date: Wed Nov 7 18:43:16 2007 +0100 XNEST_LIBS contains the right thing. commit 0b729051c04da7068f1e6dd319190bd0a362b2c0 -Merge: b7ee005d32 d7c5e8bfc1 +Merge: b7ee005d3 d7c5e8bfc Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Wed Nov 7 15:37:23 2007 +1030 @@ -153520,7 +154446,7 @@ Date: Tue Nov 6 16:26:09 2007 -0500 on the x11perf benchmark. commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500 -Merge: 868e303630 ddce48ede0 +Merge: 868e30363 ddce48ede Author: Dodji Seketeli <dodji@openedhand.com> Date: Tue Nov 6 16:25:40 2007 +0100 @@ -153547,7 +154473,7 @@ Date: Tue Nov 6 09:40:14 2007 +0000 to subsequent assertion failure in libdbus. commit a52c9b2a59f27266557ff9d5d2c08492e04135a6 -Merge: c7e18beb3c 58332894c0 +Merge: c7e18beb3 58332894c Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Nov 5 19:08:36 2007 -0500 @@ -153575,7 +154501,7 @@ Date: Mon Nov 5 15:01:13 2007 -0500 xselinux: Register SELinux extension protocol names. commit 632c33c5c18b3e091c4fce98280af4d583e99640 -Merge: 4113f040c5 dda10c9066 +Merge: 4113f040c dda10c906 Author: Dodji Seketeli <dodji@openedhand.com> Date: Mon Nov 5 17:52:33 2007 +0100 @@ -154245,7 +155171,7 @@ Date: Thu Oct 25 12:35:01 2007 -0400 xselinux: Label the default device directly with the process context. commit b633d54b94d746d26e13014634d9f63bbb7e8f7d -Merge: 4b05f19cb9 48ca5961ca +Merge: 4b05f19cb 48ca5961c Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Oct 25 12:19:30 2007 -0400 @@ -154447,7 +155373,7 @@ Date: Fri Oct 19 16:34:54 2007 -0700 they should be. commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a -Merge: a358b87f45 7e1cada6c6 +Merge: a358b87f4 7e1cada6c Author: Eric Anholt <eric@anholt.net> Date: Fri Oct 19 15:44:17 2007 -0700 @@ -154653,7 +155579,7 @@ Date: Wed Oct 17 16:09:40 2007 -0400 Need to merge so this type of thing stops happening. commit c3f7b862550fa8f46633162f83db8c27e46fc672 -Merge: af4dde0ac1 feac075952 +Merge: af4dde0ac feac07595 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Oct 17 15:00:54 2007 -0400 @@ -155233,7 +156159,7 @@ Date: Sun Oct 14 14:59:12 2007 -0400 Fix GLX byteswapping. commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8 -Merge: ccda4b66bd 17ffc34ad5 +Merge: ccda4b66b 17ffc34ad Author: Kristian Høgsberg <krh@redhat.com> Date: Fri Oct 12 19:28:39 2007 -0400 @@ -155513,7 +156439,7 @@ Date: Fri Oct 5 12:19:03 2007 +0930 regardless of who is the pairing client. commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8 -Merge: ab11bad547 3549a12823 +Merge: ab11bad54 3549a1282 Author: Dodji Seketeli <dodji@openedhand.com> Date: Thu Oct 4 13:07:50 2007 +0200 @@ -155586,7 +156512,7 @@ Date: Thu Oct 4 11:38:01 2007 +0200 it for them completely. commit 604ebb5a6de372e6a8a96e0ee997db7929126860 -Merge: 1365aeff54 4ba76a7e2b +Merge: 1365aeff5 4ba76a7e2 Author: Dodji Seketeli <dodji@openedhand.com> Date: Wed Oct 3 16:13:16 2007 +0200 @@ -155724,7 +156650,7 @@ Date: Tue Oct 2 13:13:51 2007 -0700 Also fix incorrect library inclusion by kdrive which broke the build. commit 439edc768eea17667846ce573c843b8377e0dfb4 -Merge: c8ccf469dc 93ae6fe18c +Merge: c8ccf469d 93ae6fe18 Author: Eric Anholt <eric@anholt.net> Date: Tue Oct 2 12:14:04 2007 -0700 @@ -156657,7 +157583,7 @@ Date: Thu Sep 27 11:44:03 2007 +0930 This is hopefully better than hardcodey calling CoreProcessPointerEvent. commit 27612748e0ec20f3a23839f0a12e39f598dd722c -Merge: b61461425e 3b114f2603 +Merge: b61461425 3b114f260 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Sep 26 07:47:29 2007 -0400 @@ -157078,7 +158004,7 @@ Date: Wed Sep 19 04:46:10 2007 -0700 hey -- you have to start somewhere. ;) commit 97c150b61bbe436453b05d3c07cd2173870aac40 -Merge: 57907e0943 547ad2125e +Merge: 57907e094 547ad2125 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Sep 19 07:25:55 2007 -0400 @@ -157203,7 +158129,7 @@ Date: Sat Sep 15 14:01:57 2007 +0200 Initialize output->pendingProperties. commit b9f7aeb20015290a8acf938a11bf9272bf3527cf -Merge: e4d11e58ce 06d27f8045 +Merge: e4d11e58c 06d27f804 Author: Eric Anholt <eric@anholt.net> Date: Thu Sep 13 00:15:45 2007 +0000 @@ -157617,7 +158543,7 @@ Date: Wed Sep 5 17:46:23 2007 -0700 broken uses. commit e332335241af28ef0ab66b102d0cbc4e5c73ac68 -Merge: 7381e9149e accd71bda6 +Merge: 7381e9149 accd71bda Author: Ben Byer <bbyer@bbyer.apple.com> Date: Wed Sep 5 15:51:23 2007 -0700 @@ -157662,7 +158588,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: 8ba8c16af7 47300ed2be +Merge: 8ba8c16af 47300ed2b Author: Ben Byer <bbyer@bbyer.apple.com> Date: Wed Sep 5 13:56:08 2007 -0700 @@ -157812,7 +158738,7 @@ Date: Tue Sep 4 14:49:49 2007 -0700 Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart. commit bf5948518763b5e21eff806a0a9abc5f7757fa10 -Merge: 4062db4020 735da3dcd0 +Merge: 4062db402 735da3dcd Author: Matthieu Herrb <matthieu@bluenote.herrb.com> Date: Tue Sep 4 22:40:31 2007 +0200 @@ -158128,7 +159054,7 @@ Date: Tue Aug 28 09:28:25 2007 -0400 FontRec privates. commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 -Merge: 860a09cfb8 7d54399cfd +Merge: 860a09cfb 7d54399cf Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Aug 28 07:25:21 2007 -0400 @@ -158228,7 +159154,7 @@ Date: Fri Aug 24 16:00:31 2007 -0700 Bump video driver ABI for pci-rework. commit 91f358336f77c0e4f577be65cca977d17298e36c -Merge: b9a806f0b3 8b6b40b727 +Merge: b9a806f0b 8b6b40b72 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Aug 24 15:04:21 2007 -0700 @@ -158282,7 +159208,7 @@ Date: Fri Aug 24 13:04:48 2007 +0200 case. commit 8b6b40b7271acd81a9548f502c18f46f3b640640 -Merge: ab7a6d860d 3305d17195 +Merge: ab7a6d860 3305d1719 Author: Ian Romanick <idr@us.ibm.com> Date: Thu Aug 23 18:19:17 2007 -0700 @@ -158419,7 +159345,7 @@ Date: Wed Aug 22 16:54:29 2007 +0100 Fix <pixman.h> include to <pixman/pixman.h> commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0 -Merge: 53941c8e68 6ef4ecd826 +Merge: 53941c8e6 6ef4ecd82 Author: Søren Sandmann Pedersen <sandmann@redhat.com> Date: Tue Aug 21 14:26:34 2007 -0400 @@ -158731,7 +159657,7 @@ Date: Mon Aug 13 10:43:48 2007 -0400 current interface. commit f367285fd5825e0adc271982a529c9904ad65c89 -Merge: b1272eefd9 ff4bd3addb +Merge: b1272eefd ff4bd3add Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sun Aug 12 15:31:10 2007 +0930 @@ -159106,7 +160032,7 @@ Date: Wed Jul 25 14:57:13 2007 -0700 ProcRenderAddGlyphs: Convert while loops to for loops where more natural commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 -Merge: 32c0dcc8c0 f3955c0a02 +Merge: 32c0dcc8c f3955c0a0 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Aug 2 14:27:03 2007 -0400 @@ -160414,7 +161340,7 @@ Date: Wed Jun 20 18:42:00 2007 +0200 can't actually occur when swapped out. commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c -Merge: 5dee64fc99 2e7fef7d08 +Merge: 5dee64fc9 2e7fef7d0 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Jun 19 17:20:52 2007 +0930 @@ -160456,7 +161382,7 @@ Date: Tue Jun 19 11:28:07 2007 +0930 device to interact, so this seems like a reasonable solution. commit ab7a6d860d4a275a810a64b1ba7b13726ed10575 -Merge: e9130b8bac 2e7fef7d08 +Merge: e9130b8ba 2e7fef7d0 Author: Ian Romanick <idr@us.ibm.com> Date: Mon Jun 18 16:51:13 2007 -0700 @@ -160538,7 +161464,7 @@ Date: Mon Jun 11 21:25:42 2007 -0400 Delete fbBltmmx(). commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0 -Merge: 878cac71aa 3f9adb18f1 +Merge: 878cac71a 3f9adb18f Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Jun 11 15:29:11 2007 -0400 @@ -160862,7 +161788,7 @@ Date: Tue May 29 14:54:27 2007 -0600 Remove wscons keyboard handling stuff that doesn't belong there anymore. commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0 -Merge: 3a6549a163 2f13b7c113 +Merge: 3a6549a16 2f13b7c11 Author: Matthieu Herrb <matthieu@deville.herrb.com> Date: Tue May 29 12:14:49 2007 -0600 @@ -161035,7 +161961,7 @@ Date: Wed May 23 12:56:04 2007 -0400 Add missing offsets for window coordinates - reported by Colin Harrison commit 2a4aa63a23ddd816b647b851a01865861827a7eb -Merge: 9cee4ec5e6 cc648e609d +Merge: 9cee4ec5e cc648e609 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue May 22 14:50:26 2007 -0400 @@ -161586,7 +162512,7 @@ Date: Mon Apr 30 10:33:12 2007 -0600 fix __glXErrorCallBack() proto commit 6b33459bf5aac23c3ecc7002d091c02f327d907a -Merge: 18252a515d 3c91a993e8 +Merge: 18252a515 3c91a993e Author: Brian <brian@yutani.localnet.net> Date: Mon Apr 30 10:26:19 2007 -0600 @@ -161774,7 +162700,7 @@ Date: Fri Apr 27 08:13:08 2007 -0400 are both 0. commit f28eea0647f007c2e2415ecc6fceef46201faad4 -Merge: 339b73e710 ae04f2cb0a +Merge: 339b73e71 ae04f2cb0 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Fri Apr 27 16:34:36 2007 +0930 @@ -162305,7 +163231,7 @@ Date: Tue Apr 17 13:46:55 2007 -0400 security: remove debugging code. commit 1f06d32ef58749d0f0c062193d237ee98f60e90f -Merge: cf962a849d fc162c6cfa +Merge: cf962a849 fc162c6cf Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Apr 17 12:10:22 2007 -0400 @@ -162476,7 +163402,7 @@ Date: Thu Apr 12 11:16:19 2007 +0930 This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42 commit d4dad6f84f82a4ade5005c3aa93511c1295875b8 -Merge: f1f8b562aa 33a5d9605e +Merge: f1f8b562a 33a5d9605 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Thu Apr 12 11:11:03 2007 +0930 @@ -162730,7 +163656,7 @@ Date: Fri Apr 6 13:38:12 2007 +0300 GLcore: fix after moving xf86glx_util.[hc] to Mesa. commit cf962a849db2b259ca558c6265ea7e3328a4d312 -Merge: 5ad562565a 5a804f2e97 +Merge: 5ad562565 5a804f2e9 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Apr 5 14:41:39 2007 -0400 @@ -162876,7 +163802,7 @@ Date: Tue Apr 3 09:27:57 2007 -0600 about setting the XFree86Server symbol. commit 1cc8db72816cd079f30255046e10043c350bf683 -Merge: 645d87cf8e a39f297ada +Merge: 645d87cf8 a39f297ad Author: Matthieu Herrb <matthieu@roadrock.(none)> Date: Tue Apr 3 16:04:45 2007 +0200 @@ -162895,7 +163821,7 @@ Date: Tue Apr 3 19:02:14 2007 +0930 Delete all grabs from all devices when deleting a window. commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3 -Merge: 9b0b340668 f09ee168e2 +Merge: 9b0b34066 f09ee168e Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Apr 3 15:07:18 2007 +0930 @@ -163015,7 +163941,7 @@ Date: Mon Apr 2 12:26:27 2007 -0600 formatting fixes commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0 -Merge: a12054757d 96ce17aa94 +Merge: a12054757 96ce17aa9 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Apr 2 15:36:26 2007 +0930 @@ -163080,7 +164006,7 @@ Date: Fri Mar 30 16:05:46 2007 -0600 values of 1280 (my screen width). commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48 -Merge: 2c6d471088 92e8cdbd32 +Merge: 2c6d47108 92e8cdbd3 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Mar 30 13:39:15 2007 -0700 @@ -163217,7 +164143,7 @@ Date: Wed Mar 28 12:57:11 2007 -0400 xace: provide creation-time resource hook call in CreateWindow(). commit 99b220969f2f8ba829bc8294b27ca90fd9311be4 -Merge: 728ad64d97 82a8b99a6c +Merge: 728ad64d9 82a8b99a6 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Mar 28 12:54:04 2007 -0400 @@ -163230,7 +164156,7 @@ Date: Wed Mar 28 12:03:19 2007 -0400 Refuse to create tiny modes from EDID detailed timing. commit 2c6d47108880584f1221ff86c6c8947627f9f607 -Merge: c4fe1bcce1 8522044635 +Merge: c4fe1bcce 852204463 Author: Ian Romanick <idr@us.ibm.com> Date: Wed Mar 28 08:08:04 2007 -0700 @@ -163300,7 +164226,7 @@ Date: Mon Mar 26 16:04:50 2007 -0700 Fix indentation of fakexa help text. commit 728ad64d979fd9e5cca28e8c15118c18d707c431 -Merge: 0331c6a8fc 6a0bed16e8 +Merge: 0331c6a8f 6a0bed16e Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Mar 27 13:16:40 2007 -0400 @@ -163337,7 +164263,7 @@ Date: Mon Mar 26 12:44:58 2007 -0700 Update xorg.conf manpage for new RandR 1.2 monitor options. commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413 -Merge: 84a066cc88 f7c5aa0dc0 +Merge: 84a066cc8 f7c5aa0dc Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Mar 26 10:28:05 2007 -0400 @@ -163702,7 +164628,7 @@ Date: Mon Mar 19 16:11:01 2007 +1030 by the evdev driver). commit 015d728bcde5b16a72a976579755421e3023626b -Merge: 65b0eb60b0 b167583fe2 +Merge: 65b0eb60b b167583fe Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Mar 19 09:42:56 2007 +1030 @@ -164009,7 +164935,7 @@ Date: Wed Mar 7 09:57:02 2007 -0500 devPrivates rework: move reset functions into a single call. commit bb111291d854b4329e47367ce3c67e8a2785e6e9 -Merge: 74175e0af7 e9bfb2b3d7 +Merge: 74175e0af e9bfb2b3d Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Mar 7 09:03:46 2007 -0500 @@ -164081,7 +165007,7 @@ Date: Tue Mar 6 11:09:30 2007 -0800 updated todo list commit 81d581e655fc989da3be4256b83849a63b8607b7 -Merge: a05ffca8dd d5aba03fef +Merge: a05ffca8d d5aba03fe Author: Ben Byer <bbyer@bbyer.(none)> Date: Tue Mar 6 10:37:29 2007 -0800 @@ -164112,7 +165038,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: ec1ef8a56d 9b6bb06f13 +Merge: ec1ef8a56 9b6bb06f1 Author: Ben Byer <bbyer@bbyer.(none)> Date: Tue Mar 6 01:04:50 2007 -0800 @@ -164187,7 +165113,7 @@ Date: Mon Mar 5 12:34:37 2007 -0500 devPrivates rework: remove some debugging code from dixFreePrivates. commit 23fc429aad5b2721911862617772c314e1036bb0 -Merge: e684824709 fe7b8f4237 +Merge: e68482470 fe7b8f423 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Mon Mar 5 12:18:54 2007 -0500 @@ -164233,7 +165159,7 @@ Date: Mon Feb 26 09:40:00 2007 +1100 modes: add commit/prepare hooks commit 1f0075786fedde538a95e2f39681052e25021d88 -Merge: 57aa5e908d 12175b668a +Merge: 57aa5e908 12175b668 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Mon Mar 5 12:37:17 2007 +1030 @@ -164434,7 +165360,7 @@ Date: Wed Feb 28 15:43:06 2007 +1030 between coordinates stored in device and coordinates sent by the event. commit d9bcb22d199e8444b9762a35754e04d327dd5915 -Merge: 272d9341d0 c16343ac2c +Merge: 272d9341d c16343ac2 Author: Ben Byer <bbyer@bbyer.apple.com> Date: Tue Feb 27 16:28:20 2007 -0800 @@ -164859,14 +165785,14 @@ Date: Thu Feb 15 17:07:42 2007 +0200 http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446 commit f452507ca9209598401d15da0039aaa4e1fed1a3 -Merge: 04632835b7 811675733e +Merge: 04632835b 811675733 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: 88f89b9ac1 9ecf79ca01 +Merge: 88f89b9ac 9ecf79ca0 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Feb 15 09:27:05 2007 -0500 @@ -164914,7 +165840,7 @@ Date: Wed Feb 14 17:09:33 2007 +1030 fix: WarpCursor needs to send MotionNotify. commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a -Merge: e540d572c5 d570ff7c81 +Merge: e540d572c d570ff7c8 Author: Ian Romanick <idr@us.ibm.com> Date: Wed Feb 14 15:39:52 2007 -0800 @@ -164978,7 +165904,7 @@ Date: Mon Feb 12 17:18:29 2007 -0500 Remove spurious LIBADD from xf4bpp commit 16eb7254f861465f988ae3861ac3449c2c966062 -Merge: 3814862a86 c4b7e9d1c1 +Merge: 3814862a8 c4b7e9d1c Author: Ian Romanick <idr@us.ibm.com> Date: Fri Feb 9 12:38:49 2007 -0800 @@ -165157,7 +166083,7 @@ Date: Mon Jan 29 17:30:59 2007 -0800 Typical results were failure to sync, and a black screen. commit 3814862a869ee83d307eb01225d5949039f435d8 -Merge: a216de9b7f 31f2d4a57e +Merge: a216de9b7 31f2d4a57 Author: Ian Romanick <idr@us.ibm.com> Date: Mon Jan 29 15:14:31 2007 -0800 @@ -165198,7 +166124,7 @@ Date: Mon Jan 29 16:10:03 2007 +1030 mi: Fix cursor rendering issues. commit 15a81b6325d359990017b8e9f17ce18a7eff1354 -Merge: 3759254c09 cc3d66d4a5 +Merge: 3759254c0 cc3d66d4a Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sun Jan 28 17:18:57 2007 +1030 @@ -165211,7 +166137,7 @@ Date: Wed Nov 15 17:50:02 2006 +1030 o fix minor error in comment for GetPointerEvents() commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9 -Merge: ba547d4f6a ca5ebe3971 +Merge: ba547d4f6 ca5ebe397 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Sun Jan 28 17:05:55 2007 +1030 @@ -165230,7 +166156,7 @@ Date: Fri Jan 26 13:00:45 2007 +0100 Xorg #9692 commit a216de9b7ff55e2b73c487d037f248f00bd2e63b -Merge: 24506ea65b cf7ca9d09c +Merge: 24506ea65 cf7ca9d09 Author: Ian Romanick <idr@us.ibm.com> Date: Thu Jan 25 10:17:32 2007 -0800 @@ -165265,7 +166191,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: 39b51e1bfc a53586eebc +Merge: 39b51e1bf a53586eeb Author: Ian Romanick <idr@us.ibm.com> Date: Wed Jan 24 14:49:39 2007 -0800 @@ -165293,7 +166219,7 @@ Date: Thu Jan 25 00:29:20 2007 +0800 Make Xinearama screen information reflect CRTC rotation. commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa -Merge: 637b19b3ee 788cfce911 +Merge: 637b19b3e 788cfce91 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Jan 23 13:25:56 2007 -0800 @@ -165335,7 +166261,7 @@ Date: Mon Jan 22 09:13:59 2007 -0800 ARCH_PCI_OS_INIT mechanism useless. Remove it. commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f -Merge: c279d5fdc5 2dc866252c +Merge: c279d5fdc 2dc866252 Author: Ian Romanick <idr@us.ibm.com> Date: Mon Jan 22 08:44:36 2007 -0800 @@ -165373,7 +166299,7 @@ Date: Fri Jan 19 14:52:23 2007 -0800 -ardelay and -arinterval, respectively. commit c279d5fdc53612a90f33fafe9e9c59ced008dd51 -Merge: 88f248e671 14d6a9b327 +Merge: 88f248e67 14d6a9b32 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Jan 19 12:59:54 2007 -0800 @@ -165666,7 +166592,7 @@ Date: Tue Jan 9 16:34:40 2007 -0800 Track rename of DamagePost -> DamageAdd. commit da09964a931cc64d05ab571bf545fdad35a6d395 -Merge: e1f73d2208 e3aa6ad201 +Merge: e1f73d220 e3aa6ad20 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Jan 9 15:27:34 2007 -0800 @@ -165751,7 +166677,7 @@ Date: Thu Jan 4 15:37:33 2007 -0800 Incorporate new byte-order related configure changes. commit 8dd5771a1b91c331860b667fb18e484452000aad -Merge: 45aa26ccb4 7d2ec92170 +Merge: 45aa26ccb 7d2ec9217 Author: Ian Romanick <idr@us.ibm.com> Date: Thu Jan 4 15:01:38 2007 -0800 @@ -165917,7 +166843,7 @@ Date: Thu Dec 28 13:15:11 2006 -0800 Export exaMove{In,Out}Pixmap(). commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b -Merge: 05f915050c 9563b2eea2 +Merge: 05f915050 9563b2eea Author: Eric Anholt <eric@anholt.net> Date: Wed Dec 27 16:11:31 2006 -0800 @@ -165958,7 +166884,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: 4b1c9ac3d1 d9e079d2a3 +Merge: 4b1c9ac3d d9e079d2a Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Dec 22 13:53:55 2006 -0500 @@ -166020,7 +166946,7 @@ Date: Tue Dec 19 16:38:34 2006 -0800 xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA" commit a81dbaae0597492f0245080c6f5af7158e05e2d0 -Merge: fb6d676de5 d442998e39 +Merge: fb6d676de d442998e3 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Dec 19 16:11:19 2006 -0500 @@ -166060,7 +166986,7 @@ Date: Tue Dec 19 18:45:25 2006 +0100 This affects drivers with no UploadToScreen or UploadToScreen failures. commit 4334860e69e7d5b156082bd05c7a86708e5bad4c -Merge: 7e4717683d fdcc22ca17 +Merge: 7e4717683 fdcc22ca1 Author: Michel Dänzer <michel@tungstengraphics.com> Date: Tue Dec 19 16:29:26 2006 +0100 @@ -166095,14 +167021,14 @@ Date: Tue Dec 19 15:24:19 2006 +0100 See https://bugs.freedesktop.org/show_bug.cgi?id=6772 . commit ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba -Merge: 4d07b50372 1b029fd896 +Merge: 4d07b5037 1b029fd89 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: d8b5394eda 1b029fd896 +Merge: d8b5394ed 1b029fd89 Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Dec 19 10:31:40 2006 +1030 @@ -166329,7 +167255,7 @@ Date: Tue Dec 12 15:59:08 2006 -0500 Split AssignClientState() into two routines, new routine is server-specific. commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6 -Merge: e124806994 f3c60900e5 +Merge: e12480699 f3c60900e Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Dec 12 13:54:33 2006 -0500 @@ -166433,7 +167359,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: 27d682fa03 d56249a15e +Merge: 27d682fa0 d56249a15 Author: Ian Romanick <idr@us.ibm.com> Date: Fri Dec 8 17:24:15 2006 -0800 @@ -166453,7 +167379,7 @@ Date: Fri Dec 8 17:24:15 2006 -0800 hw/xfree86/utils/scanpci/Makefile.am commit d56249a15ead51ad4d2117d5538ada24af05b693 -Merge: f1f8df1889 ec84f72d07 +Merge: f1f8df188 ec84f72d0 Author: Jeremy C. Reed <reed@glacier.reedmedia.net> Date: Fri Dec 8 15:52:37 2006 -0600 @@ -166615,7 +167541,7 @@ Date: Tue Dec 5 18:50:19 2006 +1030 Ironing some glitches caused by the merge commit 3c8f166022a2d19af14eb670fa382503ba1451cd -Merge: 2a511492f9 f9f7d7f3be +Merge: 2a511492f f9f7d7f3b Author: Peter Hutterer <peter@cs.unisa.edu.au> Date: Tue Dec 5 18:28:33 2006 +1030 @@ -166696,7 +167622,7 @@ Date: Fri Dec 1 15:56:52 2006 +1030 DeliverDeviceEvents() caters for MPX devices. commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0 -Merge: 9423ac134a 82912ad770 +Merge: 9423ac134 82912ad77 Author: Drew Parsons <drew@pug.localdomain> Date: Fri Dec 1 15:21:57 2006 +1100 @@ -166735,7 +167661,7 @@ Date: Wed Nov 29 22:19:57 2006 -0500 Add required root window context to config file. commit 143558500a89a5c887c75c03798bae68c953cac9 -Merge: e3d3d29db5 ee9bdd3f4a +Merge: e3d3d29db ee9bdd3f4 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Nov 29 20:41:41 2006 -0500 @@ -166869,7 +167795,7 @@ Date: Mon Nov 27 16:21:31 2006 -0800 Move mode handling helpers from ddcProperty.c to xf86Mode.c. commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618 -Merge: 64de3baf85 d6cd0313c7 +Merge: 64de3baf8 d6cd0313c Author: Eric Anholt <eric@anholt.net> Date: Mon Nov 27 15:43:15 2006 -0800 @@ -167088,7 +168014,7 @@ Date: Mon Nov 20 13:10:07 2006 +1030 bugfix in mipointer, semicolon after preprocessor statement commit ca2874b273232d9f51881b1cd754ed6847bfaf47 -Merge: c9a5f9d391 e2f6dacc73 +Merge: c9a5f9d39 e2f6dacc7 Author: Alan Hourihane <alanh@fairlite.demon.co.uk> Date: Sat Nov 18 19:56:32 2006 +0000 @@ -167261,7 +168187,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: 6facd958c2 f80a8ae6e6 +Merge: 6facd958c f80a8ae6e Author: Jeremy C. Reed <reed@glacier.reedmedia.net> Date: Mon Nov 13 20:32:26 2006 -0600 @@ -167585,7 +168511,7 @@ Date: Tue Nov 7 15:48:05 2006 -0800 A couple more cases of error message before freeing strings. commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58 -Merge: 3e7e0e3509 46af6d1e95 +Merge: 3e7e0e350 46af6d1e9 Author: Adam Jackson <ajax@benzedrine.nwnk.net> Date: Tue Nov 7 18:42:54 2006 -0500 @@ -167631,7 +168557,7 @@ Date: Tue Nov 7 01:29:51 2006 -0800 getevents.c commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8 -Merge: 028bbdc041 3d39c02fe6 +Merge: 028bbdc04 3d39c02fe Author: Keith Packard <keithp@neko.keithp.com> Date: Tue Nov 7 01:21:28 2006 -0800 @@ -167670,14 +168596,14 @@ Date: Mon Nov 6 00:30:09 2006 +0100 Fix typo in Xvesa: incorrect reporting of DAC capabilities. commit 028bbdc0417173803695808ba9f48498519273a3 -Merge: 50504c68e1 8deaaa312a +Merge: 50504c68e 8deaaa312 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: 8b87ce1974 cde8806c29 +Merge: 8b87ce197 cde8806c2 Author: Keith Packard <keithp@neko.keithp.com> Date: Sat Nov 4 17:43:19 2006 -0800 @@ -167757,7 +168683,7 @@ Date: Fri Oct 27 12:36:56 2006 -0700 and 1024x768@75 modes. commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4 -Merge: 49a26681b2 bd0c829654 +Merge: 49a26681b bd0c82965 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Fri Nov 3 12:54:56 2006 -0800 @@ -167870,7 +168796,7 @@ Date: Thu Nov 2 12:25:03 2006 +0100 Build with -D_PC on ix86 only. commit 543b397277d1f03b8091e44812010abcd5d80102 -Merge: 4056e6e79a 645d057620 +Merge: 4056e6e79 645d05762 Author: Keith Packard <keithp@neko.keithp.com> Date: Thu Nov 2 19:00:35 2006 -0800 @@ -167941,14 +168867,14 @@ Date: Thu Nov 2 03:22:09 2006 +0200 bump to 1.2.99.0 commit 18c246a13b887b865de6a17e6cd1c259b9bc383d -Merge: 794f2e7291 4843d823f4 +Merge: 794f2e729 4843d823f Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:21:37 2006 +0200 Merge branch 'input-hotplug' commit 4843d823f4d38d8bd468ce3a8feddbff229ed416 -Merge: ba9f5138fc a7b944f0d9 +Merge: ba9f5138f a7b944f0d Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:18:13 2006 +0200 @@ -167964,7 +168890,7 @@ Date: Thu Nov 2 03:16:10 2006 +0200 config file. commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9 -Merge: a2d6242106 6fdfd9dad9 +Merge: a2d624210 6fdfd9dad Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Nov 2 03:15:25 2006 +0200 @@ -168081,7 +169007,7 @@ Date: Sun Oct 29 17:49:46 2006 +0100 kill GNU-make'ism. commit 0107320fac0913aae2cb169992e31c670b4bd2f7 -Merge: 06b6b971d0 a34446f5b3 +Merge: 06b6b971d a34446f5b Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> Date: Sun Oct 29 15:23:35 2006 +0100 @@ -168152,7 +169078,7 @@ Date: Fri Oct 27 18:26:30 2006 +0200 Import libdrm functions for the drm memory manager. commit e3d3d29db5eef057b4e8294377c9c3147436bc2f -Merge: 92387e99d0 004d00e668 +Merge: 92387e99d 004d00e66 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Thu Oct 26 20:21:16 2006 -0400 @@ -168203,7 +169129,7 @@ Date: Thu Oct 26 20:38:58 2006 +0300 lnx_ia64.c. commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e -Merge: cdc8a4b7b2 004d00e668 +Merge: cdc8a4b7b 004d00e66 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Oct 26 15:21:22 2006 +0300 @@ -168221,7 +169147,7 @@ Date: Thu Oct 26 01:10:08 2006 +0300 The fallthrough to gettimeofday() is preserved. commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a -Merge: 3da918a16c d285833290 +Merge: 3da918a16 d28583329 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Oct 26 00:28:30 2006 +0300 @@ -168262,14 +169188,14 @@ Date: Wed Oct 25 11:39:27 2006 +0200 without pretending it's always on. commit 59511974db843fa7e11133894cfc10c20fdaf60f -Merge: 054f8cd267 598ac7a836 +Merge: 054f8cd26 598ac7a83 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: 828c34e83c 948a97b97e +Merge: 828c34e83 948a97b97 Author: Keith Packard <keithp@neko.keithp.com> Date: Tue Oct 24 17:23:12 2006 -0700 @@ -168368,7 +169294,7 @@ Date: Tue Oct 24 09:04:14 2006 -0700 Fix from HEAD accidentally reverted during merge. commit 8b909135664abb69ada522e8e39495d9eca717ac -Merge: 21291d6ca7 948a97b97e +Merge: 21291d6ca 948a97b97 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Oct 24 08:57:59 2006 -0700 @@ -168425,7 +169351,7 @@ Date: Mon Oct 23 05:12:15 2006 +0300 Remove unused xf86CheckButton. commit c5b5b046e86b159a9d32451308f38246cc4587f7 -Merge: fab1d37ecb 948a97b97e +Merge: fab1d37ec 948a97b97 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Oct 23 02:58:30 2006 +0300 @@ -168611,7 +169537,7 @@ Date: Sat Oct 21 22:06:43 2006 +1000 Minor typos in Xserver man page. commit e26a494f417c3c700636ee68892c3015b2e0f27a -Merge: 736b0d5078 aeba855b07 +Merge: 736b0d507 aeba855b0 Author: Zephaniah E. Hull <warp@agamemnon.b5> Date: Sat Oct 21 04:26:14 2006 -0400 @@ -168925,7 +169851,7 @@ Date: Fri Oct 13 17:34:53 2006 -0700 Separate configuration from layout changes to send correct events. commit 335b503c5e7041bb0c44611e496d1c46f554e630 -Merge: bd3d93be82 cf948b7b04 +Merge: bd3d93be8 cf948b7b0 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Oct 13 18:10:45 2006 +0300 @@ -168939,7 +169865,7 @@ Date: Fri Oct 13 14:48:10 2006 +0100 to avoid cursor movements signalling io. commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6 -Merge: 23f6f08b7b 042d4a407d +Merge: 23f6f08b7 042d4a407 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Oct 11 20:50:31 2006 -0400 @@ -169153,7 +170079,7 @@ Date: Sat Oct 7 14:16:51 2006 +0300 layer. commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db -Merge: 8382234a7f 49a70c8570 +Merge: 8382234a7 49a70c857 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Fri Oct 6 18:01:13 2006 -0700 @@ -169206,14 +170132,14 @@ Date: Thu Oct 5 16:07:26 2006 -0400 Improve error handling, messages during initialization. commit de63a469dcd0a8ae98554bca540ac0106cccf2a5 -Merge: 9c7440bdf5 8382234a7f +Merge: 9c7440bdf 8382234a7 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: c4f30c6353 8382234a7f +Merge: c4f30c635 8382234a7 Author: Keith Packard <keithp@neko.keithp.com> Date: Wed Oct 4 14:46:04 2006 -0700 @@ -169249,7 +170175,7 @@ Date: Tue Oct 3 17:48:50 2006 -0700 Don't insert RCS tag into generated pci id header files commit 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343 -Merge: 6926776f0e 20c0ceedfb +Merge: 6926776f0 20c0ceedf Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Oct 3 13:58:03 2006 -0400 @@ -169283,7 +170209,7 @@ Date: Mon Oct 2 02:17:14 2006 +0300 Use XkbCharToInt as that's what we're doing. commit 3c98cebb6e954855528794fec46830f456cbdec1 -Merge: fa1ac94178 2cf1098436 +Merge: fa1ac9417 2cf109843 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Oct 2 02:18:17 2006 +0300 @@ -169311,21 +170237,21 @@ Date: Sat Sep 30 17:05:46 2006 +0300 if built with --enable-debug. commit 20c0ceedfbce9ae5c70703900b52973917ac4cd0 -Merge: 49a70c8570 84eb2c0a06 +Merge: 49a70c857 84eb2c0a0 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: 5d99e05f05 84eb2c0a06 +Merge: 5d99e05f0 84eb2c0a0 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: ad631afcf3 5893375786 +Merge: ad631afcf 589337578 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Sep 29 00:35:07 2006 +0300 @@ -169349,7 +170275,7 @@ Date: Thu Sep 28 15:09:40 2006 -0600 Patch by Dan Nicholson. commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145 -Merge: cf6e9687ff f9542e7495 +Merge: cf6e9687f f9542e749 Author: Aaron Plattner <aplattner@nvidia.com> Date: Thu Sep 28 13:27:13 2006 -0700 @@ -169389,7 +170315,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: 5e9d33fe87 f7c1d94241 +Merge: 5e9d33fe8 f7c1d9424 Author: Daniel Stone <daniel@fooishbar.org> Date: Sun Sep 24 17:56:43 2006 +0300 @@ -169593,14 +170519,14 @@ Date: Sat Sep 16 03:49:11 2006 -0400 Thanks, automake. commit 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb -Merge: 6950267dd6 49a70c8570 +Merge: 6950267dd 49a70c857 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: d1110c5c83 05231e336d +Merge: d1110c5c8 05231e336 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Sep 15 15:26:57 2006 -0400 @@ -169828,7 +170754,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: 5e9d33fe87 65256109bb +Merge: 5e9d33fe8 65256109b Author: Zephaniah E. Hull <warp@agamemnon.b5> Date: Sun Sep 10 03:49:17 2006 -0400 @@ -169853,7 +170779,7 @@ Date: Fri Sep 8 15:31:18 2006 -0400 Add SELinux extension configure-time support. commit fb34c02861ab3629c1c85c156e73b158518db7c7 -Merge: 9c503f09ce d1110c5c83 +Merge: 9c503f09c d1110c5c8 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Sep 8 15:30:12 2006 -0400 @@ -169921,7 +170847,7 @@ Date: Thu Sep 7 15:35:16 2006 -0400 DRI locking between 2D and 3D drivers around VT switch. commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a -Merge: 629798c73a 64479fffa2 +Merge: 629798c73 64479fffa Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Sep 7 15:43:31 2006 +0300 @@ -169973,7 +170899,7 @@ Date: Tue Sep 5 15:23:54 2006 -0700 (unsigned long)(1 << 31) = bad news on x86_64. commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7 -Merge: 20c4ac6e03 c2813514cf +Merge: 20c4ac6e0 c2813514c Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Sep 5 18:03:25 2006 -0400 @@ -170039,7 +170965,7 @@ Date: Tue Aug 29 16:35:32 2006 -0700 appear in the server's string. commit 1c8851ad491dd02d1c79e620b46384956838ed42 -Merge: d59b52fc08 5ddbf4bcd4 +Merge: d59b52fc0 5ddbf4bcd Author: Ian Romanick <idr@us.ibm.com> Date: Tue Aug 29 16:34:04 2006 -0700 @@ -170075,7 +171001,7 @@ Date: Tue Aug 29 23:49:26 2006 +0300 Yeah. That was dumb. commit 942b4369990a255257f66835caf8671432c405a3 -Merge: 77d315bd2f 393dc0a338 +Merge: 77d315bd2 393dc0a33 Author: Ian Romanick <idr@us.ibm.com> Date: Tue Aug 29 13:30:37 2006 -0700 @@ -170135,7 +171061,7 @@ Date: Tue Aug 29 13:19:12 2006 +0300 couple of range-related thinkos in level name copying. commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2 -Merge: 8d77d44fda ebbdc1342a +Merge: 8d77d44fd ebbdc1342 Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Aug 29 15:16:01 2006 +0300 @@ -170148,14 +171074,14 @@ Date: Mon Aug 28 18:17:32 2006 -0400 Remove calls to LoaderCheckUnresolved(), since it's now a stub. commit 8d77d44fda3aacbae62864a3620e09095b79e92d -Merge: d6f36bd280 2fde560bbb +Merge: d6f36bd28 2fde560bb Author: Daniel Stone <daniel@fooishbar.org> Date: Sun Aug 27 23:08:49 2006 +0300 Merge branch 'origin' into input-hotplug commit 20c4ac6e038607ebbf6c04639670514c016d8597 -Merge: 13c6713c82 8d4f21ab53 +Merge: 13c6713c8 8d4f21ab5 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Fri Aug 25 18:49:46 2006 -0400 @@ -170188,7 +171114,7 @@ Date: Fri Aug 25 12:05:16 2006 -0700 GL_NV_{vertex,fragment}_program, and related extensions can be enabled. commit 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9 -Merge: 1a5561c4ec cd2da4e41e +Merge: 1a5561c4e cd2da4e41 Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Aug 25 09:34:21 2006 -0700 @@ -170203,7 +171129,7 @@ Date: Fri Aug 25 12:43:17 2006 +0300 best-effort attempt to keep configs working. commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709 -Merge: 393f8347ed cd2da4e41e +Merge: 393f8347e cd2da4e41 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 25 11:15:33 2006 +0300 @@ -170245,7 +171171,7 @@ Date: Thu Aug 24 17:58:52 2006 -0700 Add some missing bits of GL_SGI_color_table. commit ae608b2071d882966e9c7ede71f846b1ecec0b23 -Merge: 2c865277fe b879356ce9 +Merge: 2c865277f b879356ce Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Aug 24 14:56:33 2006 -0700 @@ -170268,7 +171194,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: db1ab1bdb2 b879356ce9 +Merge: db1ab1bdb b879356ce Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 24 23:35:28 2006 +0300 @@ -170306,7 +171232,7 @@ Date: Thu Aug 24 15:50:15 2006 -0400 More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER. commit 4ed311cf1c29090c53e474a3001c5702ff8409df -Merge: 73e58adda9 b29b236d88 +Merge: 73e58adda b29b236d8 Author: Matthias Hopf <mhopf@suse.de> Date: Thu Aug 24 20:17:10 2006 +0200 @@ -170339,7 +171265,7 @@ Date: Thu Aug 24 14:51:26 2006 +0300 Fix horrendous thinko. Indicators now work perfectly. commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813 -Merge: 33af05d58f 67bd672c88 +Merge: 33af05d58 67bd672c8 Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 24 10:59:33 2006 +0300 @@ -170358,7 +171284,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: 0623d3643f d9a86566c2 +Merge: 0623d3643 d9a86566c Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Aug 23 17:16:50 2006 -0700 @@ -170480,14 +171406,14 @@ Date: Wed Aug 23 14:33:41 2006 +0300 the moment), and use that instead of nasty pointer assignments. commit 52ba722e4c89c052609b4fc62e965d92778aa2dd -Merge: 9138d5a51e 05541259bd +Merge: 9138d5a51 05541259b 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: c2535f6792 a1ac0440bb +Merge: c2535f679 a1ac0440b Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Aug 21 13:07:41 2006 -0700 @@ -170503,7 +171429,7 @@ Date: Fri Aug 18 18:03:41 2006 +0300 configure time. commit 0704bb298cc826cd117815898c6bc015a693c2c9 -Merge: c14036977f a1ac0440bb +Merge: c14036977 a1ac0440b Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 18 17:30:14 2006 +0300 @@ -170523,14 +171449,14 @@ Date: Fri Aug 18 17:24:34 2006 +0300 input.h: add InitCoreDevices prototype commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412 -Merge: 633b6a69f5 70ddd0f39d +Merge: 633b6a69f 70ddd0f39 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 18 17:05:50 2006 +0300 Merge branch 'origin' into input-hotplug commit 19f673b7788d32c220e7e06734f1074b0e4a999c -Merge: cb0a565d2b 70ddd0f39d +Merge: cb0a565d2 70ddd0f39 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Aug 18 17:05:41 2006 +0300 @@ -170553,7 +171479,7 @@ Date: Fri Aug 18 14:43:10 2006 +0100 (Brett Stahlman & Colin Harrison) commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc -Merge: e1f4565be5 ee5e2cbd2b +Merge: e1f4565be ee5e2cbd2 Author: Alan Hourihane <alanh@fairlite.demon.co.uk> Date: Fri Aug 18 09:13:52 2006 +0100 @@ -170598,7 +171524,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: 95dbfcf882 7da51447ea +Merge: 95dbfcf88 7da51447e Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 17 21:25:14 2006 +0300 @@ -170706,21 +171632,21 @@ Date: Tue Aug 15 15:23:53 2006 +0300 Fix debug_events prototype. commit d003bada3352ec7d734498c4c732904876a9d1e2 -Merge: d6433be3cc a815b9b990 +Merge: d6433be3c a815b9b99 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: 37943e2f1a 984babe86b +Merge: 37943e2f1 984babe86 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: 2bf9e3dc1e 984babe86b +Merge: 2bf9e3dc1 984babe86 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Aug 12 21:50:52 2006 +0300 @@ -170779,7 +171705,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: 008aa7eb6e c4951e0a6b +Merge: 008aa7eb6 c4951e0a6 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Aug 12 18:58:18 2006 +0300 @@ -170808,7 +171734,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: c0cb8d1fb8 db82e12fac +Merge: c0cb8d1fb db82e12fa Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Thu Aug 10 10:37:59 2006 -0700 @@ -170830,7 +171756,7 @@ Date: Thu Aug 10 20:28:06 2006 +0300 auto. commit 1a5561c4ecccaf32b03c41373adf376100d457aa -Merge: 190f229ed7 db82e12fac +Merge: 190f229ed db82e12fa Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Aug 10 10:20:37 2006 -0700 @@ -170851,7 +171777,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: 3832a3d7db db82e12fac +Merge: 3832a3d7d db82e12fa Author: Daniel Stone <daniel@fooishbar.org> Date: Thu Aug 10 14:14:54 2006 +0300 @@ -170896,7 +171822,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: c4f5de6cc3 462bb61b0f +Merge: c4f5de6cc 462bb61b0 Author: Tilman Sauerbeck <tilman@code-monkey.de> Date: Wed Aug 9 20:23:30 2006 +0200 @@ -170914,7 +171840,7 @@ Date: Wed Aug 9 20:21:52 2006 +0200 hooks. commit 5506b4ad200745236f997c121e8200179c47b749 -Merge: 4be9abb850 462bb61b0f +Merge: 4be9abb85 462bb61b0 Author: Daniel Stone <daniel@fooishbar.org> Date: Wed Aug 9 07:21:01 2006 +0300 @@ -170975,7 +171901,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: ab3ebfefdb 12dbd8a02f +Merge: ab3ebfefd 12dbd8a02 Author: Daniel Stone <daniel@fooishbar.org> Date: Tue Aug 8 12:01:12 2006 +0300 @@ -171099,7 +172025,7 @@ Date: Mon Aug 7 16:51:09 2006 +0300 memcpy events into our event structure instead of doing pointer assignment. commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e -Merge: a406f6bfea f54b71b772 +Merge: a406f6bfe f54b71b77 Author: Daniel Stone <daniel@fooishbar.org> Date: Mon Aug 7 15:54:55 2006 +0300 @@ -171186,7 +172112,7 @@ Date: Wed Aug 2 09:55:32 2006 -0700 Remove pciConfigPtr and all of the associated cruft. commit 966ebd3d2d84b440e89504d055a0e937303ed11d -Merge: a94176627c 39169fd373 +Merge: a94176627 39169fd37 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Aug 2 08:14:58 2006 -0700 @@ -171241,14 +172167,14 @@ Date: Mon Jul 31 13:54:36 2006 -0700 Build fixes for last pull from HEAD. commit 65dc25d8f86b962f2adc765a9ff327419f98092b -Merge: 69533fc04f b74c845a12 +Merge: 69533fc04 b74c845a1 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: 3112a6c4f2 02daa6bb10 +Merge: 3112a6c4f 02daa6bb1 Author: Ian Romanick <idr@umwelt.(none)> Date: Mon Jul 31 10:26:06 2006 -0700 @@ -171272,7 +172198,7 @@ Date: Mon Jul 31 17:32:05 2006 +0100 and GC stripple and tile pixmaps. commit 69533fc04f38c67fd424776c5191a4ba57ba8c8f -Merge: ef1aecaaf6 24051ef974 +Merge: ef1aecaaf 24051ef97 Author: Ian Romanick <idr@umwelt.(none)> Date: Mon Jul 31 09:26:04 2006 -0700 @@ -171320,7 +172246,7 @@ Date: Sun Jul 30 11:08:47 2006 +0300 remove README (which doesn't exist) from EXTRA_DIST commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa -Merge: 3518e2d0de 654619d76c +Merge: 3518e2d0d 654619d76 Author: Daniel Stone <daniel@fooishbar.org> Date: Sun Jul 30 10:51:34 2006 +0300 @@ -171418,7 +172344,7 @@ Date: Wed Jul 26 13:25:13 2006 -0700 Pass correct pointer to xf86MapLegacyIO. commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216 -Merge: eb7733a48a 3821f6aeaa +Merge: eb7733a48 3821f6aea Author: Daniel Stone <daniel@fooishbar.org> Date: Wed Jul 26 11:29:21 2006 +0300 @@ -171445,7 +172371,7 @@ Date: Tue Jul 25 15:38:09 2006 -0700 pci_device_get_bridge_buses can be used. commit 380b51d605a82c98082a2cebd70a0d1d0735eaa7 -Merge: 82f6b7e75e 8977b07434 +Merge: 82f6b7e75 8977b0743 Author: Ian Romanick <idr@umwelt.(none)> Date: Tue Jul 25 11:30:04 2006 -0700 @@ -171543,7 +172469,7 @@ Date: Sun Jul 23 19:02:12 2006 -0400 Allow XOpenDevice on closed devices. commit e73e5e2a4d8f22889d840a7719479f9af686cb9c -Merge: a73cef1f00 8977b07434 +Merge: a73cef1f0 8977b0743 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Jul 22 13:56:30 2006 -0400 @@ -171556,7 +172482,7 @@ Date: Sun Jul 23 03:36:47 2006 +1000 glx: fix typo from tag removal commit a73cef1f005ca66db18e952e676ee5a21b829700 -Merge: 672ca156bf 70869fc677 +Merge: 672ca156b 70869fc67 Author: Daniel Stone <daniel@fooishbar.org> Date: Sat Jul 22 12:07:22 2006 -0400 @@ -171599,7 +172525,7 @@ Date: Fri Jul 21 19:16:38 2006 -0700 Fix stupid typos. commit 672ca156bfb11440e6e234650bfba9d38e1edb52 -Merge: d14d91f094 6cf844ab69 +Merge: d14d91f09 6cf844ab6 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:58:42 2006 -0400 @@ -171632,7 +172558,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: b73fb2ae35 0486d3966d +Merge: b73fb2ae3 0486d3966 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:36:25 2006 -0400 @@ -171647,7 +172573,7 @@ Date: Fri Jul 21 19:35:04 2006 -0400 XkbSA_XFree86Private. commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1 -Merge: e7ac27ad81 aff404f293 +Merge: e7ac27ad8 aff404f29 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:30:26 2006 -0400 @@ -171669,7 +172595,7 @@ Date: Fri Jul 21 19:10:26 2006 -0400 Ugh. commit 7465010d59ec435bd00b738f0cef766b352dc7eb -Merge: 1d31ed7782 0aaac95b0d +Merge: 1d31ed778 0aaac95b0 Author: Daniel Stone <daniel@fooishbar.org> Date: Fri Jul 21 19:05:41 2006 -0400 @@ -171695,7 +172621,7 @@ Date: Fri Jul 21 18:41:46 2006 -0400 Remove the loader's required and referenced symbol lists, dead code. commit 07ad92d2c4cb07db8487d76efc822fd7b88137cb -Merge: 18624a9b7c 22db3fdb54 +Merge: 18624a9b7 22db3fdb5 Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Jul 21 15:25:35 2006 -0700 @@ -171726,7 +172652,7 @@ Date: Thu Jul 20 18:19:07 2006 -0700 Fix the RandR failure path for rotated screens. commit 22db3fdb54d2f7f6b72638b46c186af6db04e214 -Merge: 2f98841fde 93cd53860c +Merge: 2f98841fd 93cd53860 Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Jul 21 13:55:37 2006 -0700 @@ -171969,7 +172895,7 @@ Date: Thu Jul 20 17:33:13 2006 -0400 Remove the DDXTIME conditional, for being unused. commit c69c00d6523a35232a32e54a533811fc2b37815a -Merge: 46369350d4 84683f19b4 +Merge: 46369350d 84683f19b Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 20 12:08:38 2006 -0700 @@ -172043,7 +172969,7 @@ Date: Thu Jul 13 21:10:48 2006 -0700 Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr. commit 12595a77d6c2f037f48dfe751bdc10505b3317df -Merge: 37838de62e 4c225a3a8b +Merge: 37838de62 4c225a3a8 Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 13 12:48:03 2006 -0700 @@ -172084,7 +173010,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: e805621894 39b2f7b218 +Merge: e80562189 39b2f7b21 Author: Matthew Allum <mallum@polystyrene.(none)> Date: Sat Jul 8 21:13:52 2006 +0100 @@ -172171,7 +173097,7 @@ Date: Thu Jul 6 17:39:14 2006 -0400 Switch the default mouse device on Linux to /dev/input/mice. commit 37838de62edc474f44c0a48bd56470a6c23f8956 -Merge: fd49a0dcc1 8d07ee070e +Merge: fd49a0dcc 8d07ee070 Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 6 13:01:57 2006 -0700 @@ -172197,7 +173123,7 @@ Date: Thu Jul 6 14:22:33 2006 -0400 Spotted by Aaron Plattner. commit fd49a0dcc13280cf195bd6c7ee0f23d0840cb665 -Merge: e66e7b48e1 28b95fd9d1 +Merge: e66e7b48e 28b95fd9d Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jul 6 09:52:15 2006 -0700 @@ -172255,7 +173181,7 @@ Date: Wed Jun 28 15:59:01 2006 -0400 DoGetDrawableAttributes and __glXQueryContextInfoEXT. commit e66e7b48e15543f3753951a19376f0446759963a -Merge: a9d4842893 eb35f812a5 +Merge: a9d484289 eb35f812a Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Jul 5 15:21:36 2006 -0700 @@ -172369,7 +173295,7 @@ Date: Sat Jul 1 12:34:36 2006 -0700 Missing close parenthesis in one of the setuid() fixes. commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea -Merge: d3d6c5f4d0 179737d4a0 +Merge: d3d6c5f4d 179737d4a Author: Keith Packard <keithp@neko.keithp.com> Date: Sat Jul 1 11:12:50 2006 -0700 @@ -172397,7 +173323,7 @@ Date: Wed Jun 7 01:46:00 2006 -0700 Move variable declarations to start of blocks as required by c89 commit a9d4842893b65232d61fe4c63f074d30e81021d2 -Merge: 66cac9b174 6bd4c25439 +Merge: 66cac9b17 6bd4c2543 Author: Ian Romanick <idr@umwelt.(none)> Date: Fri Jun 30 11:49:29 2006 -0700 @@ -172411,7 +173337,7 @@ Date: Mon Jun 26 01:52:24 2006 +0200 Updated for Solaris 10 changes to DDI commit 66cac9b17498497d939bfb7a4075bcee5a485e5f -Merge: 7c4e540253 54d9acd511 +Merge: 7c4e54025 54d9acd51 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Jun 28 14:11:49 2006 -0700 @@ -172448,14 +173374,14 @@ Date: Tue Jun 27 04:11:47 2006 +0200 cairo's clip-operator test. commit 7c4e54025345455f420cd2abaa7a40679689d3cb -Merge: 9d0a15dca5 ff6b59a0db +Merge: 9d0a15dca ff6b59a0d 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: b3c869304c 48c871564d +Merge: b3c869304 48c871564 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Mon Jun 26 13:02:33 2006 -0700 @@ -172538,7 +173464,7 @@ Date: Wed Jun 21 09:30:59 2006 -0700 Add a manpage for EXA. commit 9d0a15dca56b14821cad474f9db9c332acb3b1e6 -Merge: 6c514ca14c d67fd10696 +Merge: 6c514ca14 d67fd1069 Author: Ian Romanick <idr@umwelt.(none)> Date: Thu Jun 22 16:21:10 2006 -0700 @@ -172574,7 +173500,7 @@ Date: Wed Jun 21 18:12:41 2006 -0700 Use XACE, not XCSECURITY to decide if SecurityLookup* are exported commit 3177dc498a955cd58cd6054a7c7e69724db4a59b -Merge: 3f19803e0b 91dcac5295 +Merge: 3f19803e0 91dcac529 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Wed Jun 21 18:06:06 2006 -0700 @@ -172587,7 +173513,7 @@ Date: Wed Jun 21 18:05:51 2006 -0700 APPGROUP requires both X-ACE & XC-SECURITY now commit 91dcac5295486cc55a34ad91704bfa483bd31eeb -Merge: d8135eb9e4 77c947b900 +Merge: d8135eb9e 77c947b90 Author: Adam Jackson <ajax@benzedrine.nwnk.net> Date: Wed Jun 21 20:49:30 2006 -0400 @@ -172614,7 +173540,7 @@ Date: Wed Jun 21 16:24:20 2006 -0700 Correct ifdef - should be XACE, not XSECURITY commit 90af38fa0c46c2081d2becac262a614c26ba6ef1 -Merge: 3e098efa35 77c947b900 +Merge: 3e098efa3 77c947b90 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Wed Jun 21 16:23:31 2006 -0700 @@ -172641,7 +173567,7 @@ Date: Wed Jun 21 16:18:41 2006 -0700 of updates.) commit aa131c51e06e735d7b54cadf51205f703a3de4ef -Merge: 1708b0c7d9 77aa701e89 +Merge: 1708b0c7d 77aa701e8 Author: Ian Romanick <idr@umwelt.(none)> Date: Wed Jun 21 14:39:52 2006 -0700 @@ -172709,7 +173635,7 @@ Date: Tue Jun 20 19:01:34 2006 -0700 - Added X-ACE sources to Xext/Makefile.am commit a46c06dab8392cf8012c7cc0b916de9a9e569671 -Merge: 49b368c0bb d44b2a0a57 +Merge: 49b368c0b d44b2a0a5 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Tue Jun 20 18:40:18 2006 -0700 @@ -172741,7 +173667,7 @@ Date: Tue Jun 20 18:14:27 2006 -0700 Move Xserver API for security extension to securitysrv.h commit 49b368c0bb04816c4a3579071c596b2398cae3ec -Merge: 63f6e6bbfd 481d4012e7 +Merge: 63f6e6bbf 481d4012e Author: Alan Coopersmith <alanc@alf.(none)> Date: Tue Jun 20 16:22:39 2006 -0700 @@ -172754,7 +173680,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: 88ede2cec7 6df52fb774 +Merge: 88ede2cec 6df52fb77 Author: Alan Coopersmith <alanc@alf.(none)> Date: Tue Jun 20 16:03:34 2006 -0700 @@ -172767,7 +173693,7 @@ Date: Tue Jun 20 16:02:55 2006 -0700 Delete code that's been inside #if 0 since X11R6.7. commit 75398cff82b56c0a8fc301e84e2087f59a61a360 -Merge: 1f91b5726c 2b58685402 +Merge: 1f91b5726 2b5868540 Author: Ian Romanick <idr@umwelt.(none)> Date: Tue Jun 20 15:49:47 2006 -0700 @@ -172779,7 +173705,7 @@ Date: Tue Jun 20 15:49:47 2006 -0700 hw/xfree86/loader/xf86sym.c commit 88ede2cec79281a43cecb43ee6dec65770f82530 -Merge: 227a319340 2b58685402 +Merge: 227a31934 2b5868540 Author: Alan Coopersmith <alanc@alf.(none)> Date: Tue Jun 20 15:29:55 2006 -0700 @@ -172829,7 +173755,7 @@ Date: Wed May 5 20:07:37 2004 +0000 (cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit) commit 0707eb33d6826e1300a905edea28c12134600b12 -Merge: 37f0ae0245 98d17bba71 +Merge: 37f0ae024 98d17bba7 Author: Alan Coopersmith <alanc@alf.(none)> Date: Mon Jun 19 17:09:51 2006 -0700 @@ -172994,7 +173920,7 @@ Date: Fri Jun 16 10:14:30 2006 -0700 hadn't been bumped. commit 72ac20c0e878ad48ff61f7e846cbf1005a4eb435 -Merge: fc3e81473a b90088321e +Merge: fc3e81473 b90088321 Author: Ian Romanick <idr@localhost.localdomain> Date: Tue Jun 13 21:13:02 2006 -0700 @@ -173021,7 +173947,7 @@ Date: Mon Jun 12 20:12:31 2006 +0200 Provide option to report damage after operation is complete. commit fc3e81473a98d3b932faa73c0c01c21366a48a9e -Merge: 4bedaad17d 041ef23192 +Merge: 4bedaad17 041ef2319 Author: Ian Romanick <idr@localhost.localdomain> Date: Mon Jun 12 09:41:06 2006 -0700 @@ -173058,7 +173984,7 @@ Date: Fri Jun 9 16:08:06 2006 -0700 another function that was already in that file. commit 7810d87cd6ae9316d88f6a2e7696deb8837cec27 -Merge: dcfaa9f4f8 caad8b724b +Merge: dcfaa9f4f caad8b724 Author: Ian Romanick <idr@localhost.localdomain> Date: Fri Jun 9 15:16:50 2006 -0700 @@ -173130,7 +174056,7 @@ Date: Fri Jun 9 09:51:28 2006 -0700 based on FIXME in mi/miinitext.c commit dcfaa9f4f8fb10b75be50c9a49ccd88caf6d0f6a -Merge: af9afe4cc5 576e6fb112 +Merge: af9afe4cc 576e6fb11 Author: Ian Romanick <idr@localhost.localdomain> Date: Thu Jun 8 15:03:00 2006 -0700 @@ -173150,7 +174076,7 @@ Date: Thu Jun 8 17:46:53 2006 -0400 Bug #7121: fix clipboard handling in Xming (Colin Harrison) commit af9afe4cc50df973bea2293a803f7dfdefaa6411 -Merge: caffac3843 3930da3f62 +Merge: caffac384 3930da3f6 Author: Ian Romanick <idr@localhost.localdomain> Date: Thu Jun 8 11:37:09 2006 -0700 @@ -173227,7 +174153,7 @@ Date: Thu Jun 8 10:40:24 2006 -0700 if anyone really cares about this code. commit caffac38432009e8dc01e7d3e72a7fa6fba2f078 -Merge: c5b3aa120b 9fa73721f0 +Merge: c5b3aa120 9fa73721f Author: Ian Romanick <idr@localhost.localdomain> Date: Thu Jun 8 10:38:43 2006 -0700 @@ -173338,7 +174264,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: bc05158a5a 757f40fca5 +Merge: bc05158a5 757f40fca Author: Ian Romanick <idr@localhost.localdomain> Date: Wed Jun 7 17:03:48 2006 -0700 @@ -173375,7 +174301,7 @@ Date: Wed Jun 7 14:09:13 2006 -0700 updated the .gitignore file with more auto-generated files commit bc05158a5ab00c548e4b04b5638afe07bc702260 -Merge: 46f55f5dea cc465800dd +Merge: 46f55f5de cc465800d Author: Ian Romanick <idr@localhost.localdomain> Date: Wed Jun 7 14:09:12 2006 -0700 @@ -173395,7 +174321,7 @@ Date: Wed Jun 7 14:03:35 2006 -0700 Fix compiler warnings about SetVendorRelease and SetVendorString commit 785c9789704ed142fe98cd17b5995e4a95b7141f -Merge: 21ebcfd702 36d786e9f0 +Merge: 21ebcfd70 36d786e9f Author: Greg Kroah-Hartman <gregkh@suse.de> Date: Wed Jun 7 13:20:21 2006 -0700 diff --git a/xserver/Xext/panoramiXprocs.c b/xserver/Xext/panoramiXprocs.c index f31b1e054..32424fcbd 100644 --- a/xserver/Xext/panoramiXprocs.c +++ b/xserver/Xext/panoramiXprocs.c @@ -1105,6 +1105,10 @@ PanoramiXCopyArea(ClientPtr client) DixGetAttrAccess); if (rc != Success) return rc; + drawables[j]->pScreen->SourceValidate(drawables[j], 0, 0, + drawables[j]->width, + drawables[j]->height, + IncludeInferiors); } pitch = PixmapBytePad(width, drawables[0]->depth); @@ -2007,6 +2011,12 @@ PanoramiXGetImage(ClientPtr client) if (rc != Success) return rc; } + FOR_NSCREENS_FORWARD(i) { + drawables[i]->pScreen->SourceValidate(drawables[i], 0, 0, + drawables[i]->width, + drawables[i]->height, + IncludeInferiors); + } xgi = (xGetImageReply) { .type = X_Reply, diff --git a/xserver/Xext/shm.c b/xserver/Xext/shm.c index fa121f72c..96531390c 100644 --- a/xserver/Xext/shm.c +++ b/xserver/Xext/shm.c @@ -35,6 +35,9 @@ in this Software without prior written authorization from The Open Group. #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> +#ifdef HAVE_MEMFD_CREATE +#include <sys/mman.h> +#endif #include <unistd.h> #include <sys/stat.h> #include <fcntl.h> @@ -652,6 +655,9 @@ ProcShmGetImage(ClientPtr client) visual = wVisual(((WindowPtr) pDraw)); if (pDraw->type == DRAWABLE_WINDOW) pVisibleRegion = &((WindowPtr) pDraw)->borderClip; + pDraw->pScreen->SourceValidate(pDraw, stuff->x, stuff->y, + stuff->width, stuff->height, + IncludeInferiors); } else { if (stuff->x < 0 || @@ -860,6 +866,12 @@ ProcPanoramiXShmGetImage(ClientPtr client) return rc; } } + FOR_NSCREENS_FORWARD(i) { + drawables[i]->pScreen->SourceValidate(drawables[i], 0, 0, + drawables[i]->width, + drawables[i]->height, + IncludeInferiors); + } xgi = (xShmGetImageReply) { .type = X_Reply, @@ -1194,36 +1206,55 @@ ProcShmAttachFd(ClientPtr client) static int shm_tmpfile(void) { -#ifdef SHMDIR - int fd; - char template[] = SHMDIR "/shmfd-XXXXXX"; + const char *shmdirs[] = { + "/run/shm", + "/var/tmp", + "/tmp", + }; + int fd; + +#ifdef HAVE_MEMFD_CREATE + fd = memfd_create("xorg", MFD_CLOEXEC|MFD_ALLOW_SEALING); + if (fd != -1) { + fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK); + DebugF ("Using memfd_create\n"); + return fd; + } +#endif + #ifdef O_TMPFILE - fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); - if (fd >= 0) { - DebugF ("Using O_TMPFILE\n"); - return fd; - } - ErrorF ("Not using O_TMPFILE\n"); + for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) { + fd = open(shmdirs[i], O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); + if (fd >= 0) { + DebugF ("Using O_TMPFILE\n"); + return fd; + } + } + ErrorF ("Not using O_TMPFILE\n"); #endif + + for (int i = 0; i < ARRAY_SIZE(shmdirs); i++) { + char template[PATH_MAX]; + snprintf(template, ARRAY_SIZE(template), "%s/shmfd-XXXXXXXXXX", shmdirs[i]); #ifdef HAVE_MKOSTEMP - fd = mkostemp(template, O_CLOEXEC); + fd = mkostemp(template, O_CLOEXEC); #else - fd = mkstemp(template); + fd = mkstemp(template); #endif - if (fd < 0) - return -1; - unlink(template); + if (fd < 0) + continue; + unlink(template); #ifndef HAVE_MKOSTEMP - int flags = fcntl(fd, F_GETFD); - if (flags != -1) { - flags |= FD_CLOEXEC; - (void) fcntl(fd, F_SETFD, &flags); - } -#endif - return fd; -#else - return -1; + int flags = fcntl(fd, F_GETFD); + if (flags != -1) { + flags |= FD_CLOEXEC; + (void) fcntl(fd, F_SETFD, &flags); + } #endif + return fd; + } + + return -1; } static int diff --git a/xserver/Xext/sleepuntil.c b/xserver/Xext/sleepuntil.c index 68a7a9bee..334c2784a 100644 --- a/xserver/Xext/sleepuntil.c +++ b/xserver/Xext/sleepuntil.c @@ -125,8 +125,7 @@ ClientSleepUntil(ClientPtr client, static void ClientAwaken(ClientPtr client, void *closure) { - if (!client->clientGone) - AttendClient(client); + AttendClient(client); } static int diff --git a/xserver/Xext/sync.c b/xserver/Xext/sync.c index 8f22a865b..fd2ceb042 100644 --- a/xserver/Xext/sync.c +++ b/xserver/Xext/sync.c @@ -881,18 +881,21 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm * pAlarm, Mask mask, return Success; } -static SyncObject * +SyncObject * SyncCreate(ClientPtr client, XID id, unsigned char type) { SyncObject *pSync; + RESTYPE resType; switch (type) { case SYNC_COUNTER: pSync = malloc(sizeof(SyncCounter)); + resType = RTCounter; break; case SYNC_FENCE: pSync = (SyncObject *) dixAllocateObjectWithPrivates(SyncFence, PRIVATE_SYNC_FENCE); + resType = RTFence; break; default: return NULL; @@ -901,6 +904,11 @@ SyncCreate(ClientPtr client, XID id, unsigned char type) if (!pSync) return NULL; + pSync->initialized = FALSE; + + if (!AddResource(id, resType, (void *) pSync)) + return NULL; + pSync->client = client; pSync->id = id; pSync->pTriglist = NULL; @@ -923,13 +931,10 @@ SyncCreateFenceFromFD(ClientPtr client, DrawablePtr pDraw, XID id, int fd, BOOL status = miSyncInitFenceFromFD(pDraw, pFence, fd, initially_triggered); if (status != Success) { - dixFreeObjectWithPrivates(pFence, PRIVATE_SYNC_FENCE); + FreeResource(pFence->sync.id, RT_NONE); return status; } - if (!AddResource(id, RTFence, (void *) pFence)) - return BadAlloc; - return Success; #else return BadImplementation; @@ -957,8 +962,7 @@ SyncCreateCounter(ClientPtr client, XSyncCounter id, int64_t initialvalue) pCounter->value = initialvalue; pCounter->pSysCounterInfo = NULL; - if (!AddResource(id, RTCounter, (void *) pCounter)) - return NULL; + pCounter->sync.initialized = TRUE; return pCounter; } @@ -1137,21 +1141,26 @@ static int FreeCounter(void *env, XID id) { SyncCounter *pCounter = (SyncCounter *) env; - SyncTriggerList *ptl, *pnext; pCounter->sync.beingDestroyed = TRUE; - /* tell all the counter's triggers that the counter has been destroyed */ - for (ptl = pCounter->sync.pTriglist; ptl; ptl = pnext) { - (*ptl->pTrigger->CounterDestroyed) (ptl->pTrigger); - pnext = ptl->next; - free(ptl); /* destroy the trigger list as we go */ - } - if (IsSystemCounter(pCounter)) { - xorg_list_del(&pCounter->pSysCounterInfo->entry); - free(pCounter->pSysCounterInfo->name); - free(pCounter->pSysCounterInfo->private); - free(pCounter->pSysCounterInfo); + + if (pCounter->sync.initialized) { + SyncTriggerList *ptl, *pnext; + + /* tell all the counter's triggers that counter has been destroyed */ + for (ptl = pCounter->sync.pTriglist; ptl; ptl = pnext) { + (*ptl->pTrigger->CounterDestroyed) (ptl->pTrigger); + pnext = ptl->next; + free(ptl); /* destroy the trigger list as we go */ + } + if (IsSystemCounter(pCounter)) { + xorg_list_del(&pCounter->pSysCounterInfo->entry); + free(pCounter->pSysCounterInfo->name); + free(pCounter->pSysCounterInfo->private); + free(pCounter->pSysCounterInfo); + } } + free(pCounter); return Success; } @@ -1889,9 +1898,6 @@ ProcSyncCreateFence(ClientPtr client) miSyncInitFence(pDraw->pScreen, pFence, stuff->initially_triggered); - if (!AddResource(stuff->fid, RTFence, (void *) pFence)) - return BadAlloc; - return Success; } diff --git a/xserver/Xext/syncsdk.h b/xserver/Xext/syncsdk.h index f1b99d010..c88285cb1 100644 --- a/xserver/Xext/syncsdk.h +++ b/xserver/Xext/syncsdk.h @@ -29,6 +29,9 @@ extern _X_EXPORT int SyncVerifyFence(SyncFence ** ppFence, XID fid, ClientPtr client, Mask mode); +extern _X_EXPORT SyncObject* + SyncCreate(ClientPtr client, XID id, unsigned char type); + #define VERIFY_SYNC_FENCE(pFence, fid, client, mode) \ do { \ int rc; \ diff --git a/xserver/Xi/exevents.c b/xserver/Xi/exevents.c index 17d751e31..659816a46 100644 --- a/xserver/Xi/exevents.c +++ b/xserver/Xi/exevents.c @@ -1293,14 +1293,21 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti, int rc; InputClients *iclients = NULL; *mask = NULL; + *grab = NULL; if (listener->type == LISTENER_GRAB || listener->type == LISTENER_POINTER_GRAB) { - *grab = listener->grab; BUG_RETURN_VAL(!*grab, FALSE); + } + else if (ti->emulate_pointer && dev->deviceGrab.grab && + !dev->deviceGrab.fromPassiveGrab) { + /* There may be an active pointer grab on the device */ + *grab = dev->deviceGrab.grab; + } + if (*grab) { *client = rClient(*grab); *win = (*grab)->window; *mask = (*grab)->xi2mask; @@ -1357,8 +1364,6 @@ RetrieveTouchDeliveryData(DeviceIntPtr dev, TouchPointInfoPtr ti, /* if owner selected, oclients is NULL */ *client = oclients ? rClient(oclients) : wClient(*win); } - - *grab = NULL; } return TRUE; @@ -1498,16 +1503,6 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, &mask)) return; - /* There may be a pointer grab on the device */ - if (!grab) { - grab = dev->deviceGrab.grab; - if (grab) { - win = grab->window; - mask = grab->xi2mask; - client = rClient(grab); - } - } - DeliverTouchEmulatedEvent(dev, ti, (InternalEvent*)&motion, &ti->listeners[0], client, win, grab, mask); } diff --git a/xserver/configure b/xserver/configure index 98691730c..588c7a670 100644 --- a/xserver/configure +++ b/xserver/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorg-server 1.20.5. +# Generated by GNU Autoconf 2.69 for xorg-server 1.20.6. # # Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>. # @@ -651,8 +651,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.20.5' -PACKAGE_STRING='xorg-server 1.20.5' +PACKAGE_VERSION='1.20.6' +PACKAGE_STRING='xorg-server 1.20.6' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues' PACKAGE_URL='' @@ -1397,7 +1397,6 @@ enable_local_transport enable_secure_rpc enable_input_thread with_systemd_daemon -with_shared_memory_dir enable_xtrans_send_fds with_xkb_bin_directory with_sha1 @@ -2046,7 +2045,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.20.5 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.20.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2116,7 +2115,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.20.5:";; + short | recursive ) echo "Configuration of xorg-server 1.20.6:";; esac cat <<\_ACEOF @@ -2311,10 +2310,10 @@ Optional Packages: org.x) --with-bundle-version=VERSION Version to use for X11.app's CFBundleVersion - (default: 1.20.5) + (default: 1.20.6) --with-bundle-version-string=VERSION Version to use for X11.app's - CFBundleShortVersionString (default: 1.20.5) + CFBundleShortVersionString (default: 1.20.6) --with-sparkle-feed-url=URL URL for the Sparkle feed (default: https://www.xquartz.org/releases/sparkle/release.xml) @@ -2322,10 +2321,6 @@ Optional Packages: Path to Khronos OpenGL registry database files (default: auto) --with-systemd-daemon support systemd socket activation (default: auto) - --with-shared-memory-dir=PATH - Path to directory in a world-writable temporary - directory for anonymous shared memory (default: - auto) --with-xkb-bin-directory=DIR Directory containing xkbcomp program (default: auto) --with-sha1=libc|libmd|libnettle|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI @@ -2573,7 +2568,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.20.5 +xorg-server configure 1.20.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3282,7 +3277,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.20.5, which was +It was created by xorg-server $as_me 1.20.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3630,8 +3625,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2019-05-30" -RELEASE_NAME="Red Lentil Dal" +RELEASE_DATE="2019-11-22" +RELEASE_NAME="Enchiladas de Queso" am__api_version='1.12' @@ -4110,7 +4105,7 @@ fi # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.20.5' + VERSION='1.20.6' cat >>confdefs.h <<_ACEOF @@ -21936,7 +21931,7 @@ fi for ac_func in backtrace geteuid getuid issetugid getresuid \ getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ - walkcontext setitimer poll epoll_create1 mkostemp + walkcontext setitimer poll epoll_create1 mkostemp memfd_create isastream do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -23039,7 +23034,7 @@ _ACEOF if test "${with_bundle_version+set}" = set; then : withval=$with_bundle_version; BUNDLE_VERSION="${withval}" else - BUNDLE_VERSION="1.20.5" + BUNDLE_VERSION="1.20.6" fi @@ -24130,7 +24125,7 @@ LIBDRI="dri >= 7.8.0" LIBDRM="libdrm >= 2.4.89" LIBEGL="egl" LIBGBM="gbm >= 10.2.0" -LIBGL="gl >= 7.1.0" +LIBGL="gl >= 1.2" LIBXEXT="xext >= 1.0.99.4" LIBXFONT="xfont2 >= 2.0.0" LIBXI="xi >= 1.2.99.1" @@ -25855,7 +25850,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in $as_echo "#define DRI2 1" >>confdefs.h DRI2=yes - LIBGL="gl >= 9.2.0" + LIBGL="gl >= 1.2" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO" ;; esac @@ -25868,55 +25863,6 @@ else fi - - -# Check whether --with-shared-memory-dir was given. -if test "${with_shared_memory_dir+set}" = set; then : - withval=$with_shared_memory_dir; -else - with_shared_memory_dir=yes -fi - - -shmdirs="/run/shm /var/tmp /tmp" - -case x"$with_shared_memory_dir" in -xyes) - for dir in $shmdirs; do - case x"$with_shared_memory_dir" in - xyes) - echo Checking temp dir "$dir" - if test -d "$dir"; then - with_shared_memory_dir="$dir" - fi - ;; - esac - done - ;; -x/*) - ;; -xno) - ;; -*) - as_fn_error $? "Invalid directory specified for --with-shared-memory-dir: $with_shared_memory_dir" "$LINENO" 5 - ;; -esac - -case x"$with_shared_memory_dir" in -xyes) - as_fn_error $? "No directory found for shared memory temp files." "$LINENO" 5 - ;; -xno) - ;; -*) - -cat >>confdefs.h <<_ACEOF -#define SHMDIR "$with_shared_memory_dir" -_ACEOF - - ;; -esac - # Check whether --enable-xtrans-send-fds was given. if test "${enable_xtrans_send_fds+set}" = set; then : enableval=$enable_xtrans_send_fds; XTRANS_SEND_FDS=$enableval @@ -26223,7 +26169,7 @@ else fi -if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then +if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$XORG" = xyes; then if test "x$DRM" = xyes; then $as_echo "#define WITH_LIBDRM 1" >>confdefs.h @@ -33004,7 +32950,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.20.5, which was +This file was extended by xorg-server $as_me 1.20.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33070,7 +33016,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorg-server config.status 1.20.5 +xorg-server config.status 1.20.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/xserver/configure.ac b/xserver/configure.ac index d611a1f35..5259cce79 100644 --- a/xserver/configure.ac +++ b/xserver/configure.ac @@ -26,9 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.20.5, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) -RELEASE_DATE="2019-05-30" -RELEASE_NAME="Red Lentil Dal" +AC_INIT([xorg-server], 1.20.6, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) +RELEASE_DATE="2019-11-22" +RELEASE_NAME="Enchiladas de Queso" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -159,7 +159,7 @@ dnl Checks for library functions. AC_CHECK_FUNCS([backtrace geteuid getuid issetugid getresuid \ getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ - walkcontext setitimer poll epoll_create1 mkostemp]) + walkcontext setitimer poll epoll_create1 mkostemp memfd_create isastream]) AC_CONFIG_LIBOBJ_DIR([os]) AC_REPLACE_FUNCS([reallocarray strcasecmp strcasestr strlcat strlcpy strndup\ timingsafe_memcmp]) @@ -802,7 +802,7 @@ LIBDRI="dri >= 7.8.0" LIBDRM="libdrm >= 2.4.89" LIBEGL="egl" LIBGBM="gbm >= 10.2.0" -LIBGL="gl >= 7.1.0" +LIBGL="gl >= 1.2" LIBXEXT="xext >= 1.0.99.4" LIBXFONT="xfont2 >= 2.0.0" LIBXI="xi >= 1.2.99.1" @@ -1157,55 +1157,12 @@ case "$DRI2,$HAVE_DRI2PROTO" in yes,yes | auto,yes) AC_DEFINE(DRI2, 1, [Build DRI2 extension]) DRI2=yes - LIBGL="gl >= 9.2.0" + LIBGL="gl >= 1.2" SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO" ;; esac AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) -dnl -dnl Locate a suitable tmp file system for creating shared memeory files -dnl - -AC_ARG_WITH(shared-memory-dir, AS_HELP_STRING([--with-shared-memory-dir=PATH], [Path to directory in a world-writable temporary directory for anonymous shared memory (default: auto)]), -[], -[with_shared_memory_dir=yes]) - -shmdirs="/run/shm /var/tmp /tmp" - -case x"$with_shared_memory_dir" in -xyes) - for dir in $shmdirs; do - case x"$with_shared_memory_dir" in - xyes) - echo Checking temp dir "$dir" - if test -d "$dir"; then - with_shared_memory_dir="$dir" - fi - ;; - esac - done - ;; -x/*) - ;; -xno) - ;; -*) - AC_MSG_ERROR([Invalid directory specified for --with-shared-memory-dir: $with_shared_memory_dir]) - ;; -esac - -case x"$with_shared_memory_dir" in -xyes) - AC_MSG_ERROR([No directory found for shared memory temp files.]) - ;; -xno) - ;; -*) - AC_DEFINE_UNQUOTED(SHMDIR, ["$with_shared_memory_dir"], [Directory for shared memory temp files]) - ;; -esac - AC_ARG_ENABLE(xtrans-send-fds, AS_HELP_STRING([--disable-xtrans-send-fds], [Use Xtrans support for fd passing (default: auto)]), [XTRANS_SEND_FDS=$enableval], [XTRANS_SEND_FDS=auto]) case "x$XTRANS_SEND_FDS" in @@ -1322,7 +1279,7 @@ esac AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes) -if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then +if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$XORG" = xyes; then if test "x$DRM" = xyes; then AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support]) PKG_CHECK_MODULES([LIBDRM], $LIBDRM) diff --git a/xserver/dix/dispatch.c b/xserver/dix/dispatch.c index 176c7a0dd..a33bfaa9e 100644 --- a/xserver/dix/dispatch.c +++ b/xserver/dix/dispatch.c @@ -2196,8 +2196,11 @@ DoGetImage(ClientPtr client, int format, Drawable drawable, return BadAlloc; WriteReplyToClient(client, sizeof(xGetImageReply), &xgi); - if (pDraw->type == DRAWABLE_WINDOW) + if (pDraw->type == DRAWABLE_WINDOW) { pVisibleRegion = &((WindowPtr) pDraw)->borderClip; + pDraw->pScreen->SourceValidate(pDraw, x, y, width, height, + IncludeInferiors); + } if (linesPerBuf == 0) { /* nothing to do */ diff --git a/xserver/dix/dixutils.c b/xserver/dix/dixutils.c index 2983174a1..331ccfb96 100644 --- a/xserver/dix/dixutils.c +++ b/xserver/dix/dixutils.c @@ -662,14 +662,7 @@ ClientWakeup(ClientPtr client) if (q->client == client) { *prev = q->next; free(q); - if (client->clientGone) - /* Oops -- new zombie cleanup code ensures this only - * happens from inside CloseDownClient; don't want to - * recurse here... - */ - /* CloseDownClient(client) */ ; - else - AttendClient(client); + AttendClient(client); break; } prev = &q->next; diff --git a/xserver/dix/events.c b/xserver/dix/events.c index d3a33ea3f..c02a0594a 100644 --- a/xserver/dix/events.c +++ b/xserver/dix/events.c @@ -597,6 +597,8 @@ XineramaConfineCursorToWindow(DeviceIntPtr pDev, int x, y, off_x, off_y, i; + assert(!noPanoramiXExtension); + if (!XineramaSetWindowPntrs(pDev, pWin)) return; diff --git a/xserver/dix/pixmap.c b/xserver/dix/pixmap.c index 81ac5e2d8..6923e7e7b 100644 --- a/xserver/dix/pixmap.c +++ b/xserver/dix/pixmap.c @@ -32,6 +32,7 @@ from The Open Group. #include <X11/X.h> #include "scrnintstr.h" +#include "mi.h" #include "misc.h" #include "os.h" #include "windowstr.h" @@ -395,7 +396,7 @@ Bool PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty) * leaves the software cursor in place */ SourceValidate = pScreen->SourceValidate; - pScreen->SourceValidate = NULL; + pScreen->SourceValidate = miSourceValidate; RegionTranslate(&pixregion, dirty->x, dirty->y); RegionIntersect(&pixregion, &pixregion, region); diff --git a/xserver/doc/Xserver-spec.xml b/xserver/doc/Xserver-spec.xml index 3dde65178..0ac2224e9 100644 --- a/xserver/doc/Xserver-spec.xml +++ b/xserver/doc/Xserver-spec.xml @@ -2930,8 +2930,8 @@ The sample server implementation is in Xserver/fb/fbscreen.c.</para> unsigned int subWindowMode; </programlisting></blockquote> -SourceValidate should be called by CopyArea/CopyPlane primitives when -the SourceValidate function pointer in the screen is non-null. If you know that +SourceValidate should be called by any primitive that reads from pDrawable. +If you know that you will never need SourceValidate, you can avoid this check. Currently, SourceValidate is used by the mi software cursor code to remove the cursor from the screen when the source rectangle overlaps the cursor position. diff --git a/xserver/glamor/glamor_egl.c b/xserver/glamor/glamor_egl.c index a78e7104b..366991d2c 100644 --- a/xserver/glamor/glamor_egl.c +++ b/xserver/glamor/glamor_egl.c @@ -355,8 +355,8 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok) return TRUE; } -struct gbm_bo * -glamor_gbm_bo_from_pixmap(ScreenPtr screen, PixmapPtr pixmap) +static struct gbm_bo * +glamor_gbm_bo_from_pixmap_internal(ScreenPtr screen, PixmapPtr pixmap) { struct glamor_egl_screen_private *glamor_egl = glamor_egl_get_screen_private(xf86ScreenToScrn(screen)); @@ -370,6 +370,15 @@ glamor_gbm_bo_from_pixmap(ScreenPtr screen, PixmapPtr pixmap) pixmap_priv->image, 0); } +struct gbm_bo * +glamor_gbm_bo_from_pixmap(ScreenPtr screen, PixmapPtr pixmap) +{ + if (!glamor_make_pixmap_exportable(pixmap, TRUE)) + return NULL; + + return glamor_gbm_bo_from_pixmap_internal(screen, pixmap); +} + int glamor_egl_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds, uint32_t *strides, uint32_t *offsets, @@ -385,7 +394,7 @@ glamor_egl_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds, if (!glamor_make_pixmap_exportable(pixmap, TRUE)) return 0; - bo = glamor_gbm_bo_from_pixmap(screen, pixmap); + bo = glamor_gbm_bo_from_pixmap_internal(screen, pixmap); if (!bo) return 0; @@ -423,7 +432,7 @@ glamor_egl_fd_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, if (!glamor_make_pixmap_exportable(pixmap, FALSE)) return -1; - bo = glamor_gbm_bo_from_pixmap(screen, pixmap); + bo = glamor_gbm_bo_from_pixmap_internal(screen, pixmap); if (!bo) return -1; @@ -452,7 +461,7 @@ glamor_egl_fd_name_from_pixmap(ScreenPtr screen, if (!glamor_make_pixmap_exportable(pixmap, FALSE)) goto failure; - bo = glamor_gbm_bo_from_pixmap(screen, pixmap); + bo = glamor_gbm_bo_from_pixmap_internal(screen, pixmap); if (!bo) goto failure; diff --git a/xserver/glamor/glamor_egl.h b/xserver/glamor/glamor_egl.h index 2f7566b24..8f6ed7840 100644 --- a/xserver/glamor/glamor_egl.h +++ b/xserver/glamor/glamor_egl.h @@ -28,6 +28,7 @@ #define GLAMOR_EGL_H #define MESA_EGL_NO_X11_HEADERS +#define EGL_NO_X11 #include <epoxy/gl.h> #include <epoxy/egl.h> #include <glamor_egl_ext.h> diff --git a/xserver/glamor/glamor_priv.h b/xserver/glamor/glamor_priv.h index 7d9a7d4fb..661c11d90 100644 --- a/xserver/glamor/glamor_priv.h +++ b/xserver/glamor/glamor_priv.h @@ -40,6 +40,7 @@ #include <epoxy/gl.h> #ifdef GLAMOR_HAS_GBM #define MESA_EGL_NO_X11_HEADERS +#define EGL_NO_X11 #include <epoxy/egl.h> #endif diff --git a/xserver/glx/glxcmds.c b/xserver/glx/glxcmds.c index 54d452e58..75e42823c 100644 --- a/xserver/glx/glxcmds.c +++ b/xserver/glx/glxcmds.c @@ -574,10 +574,8 @@ xorgGlxMakeCurrent(ClientPtr client, GLXContextTag tag, XID drawId, XID readId, /* Look up old context. If we have one, it must be in a usable state. */ if (tag != 0) { prevglxc = glxServer.getContextTagPrivate(client, tag); - if (!prevglxc) - return __glXError(GLXBadContextTag); - if (prevglxc->renderMode != GL_RENDER) { + if (prevglxc && prevglxc->renderMode != GL_RENDER) { /* Oops. Not in render mode render. */ client->errorValue = prevglxc->id; return __glXError(GLXBadContextState); diff --git a/xserver/glx/glxdriswrast.c b/xserver/glx/glxdriswrast.c index 2858312de..c57d80db7 100644 --- a/xserver/glx/glxdriswrast.c +++ b/xserver/glx/glxdriswrast.c @@ -324,6 +324,7 @@ swrastGetImage(__DRIdrawable * draw, ScreenPtr pScreen = pDraw->pScreen; __GLXcontext *cx = lastGLContext; + pScreen->SourceValidate(pDraw, x, y, w, h, IncludeInferiors); pScreen->GetImage(pDraw, x, y, w, h, ZPixmap, ~0L, data); if (cx != lastGLContext) { lastGLContext = cx; diff --git a/xserver/glx/vndcmds.c b/xserver/glx/vndcmds.c index f0779d14a..21c6fef9e 100644 --- a/xserver/glx/vndcmds.c +++ b/xserver/glx/vndcmds.c @@ -468,15 +468,24 @@ void GlxDispatchReset(void) int GlxDispatchRequest(ClientPtr client) { REQUEST(xReq); + int result; + if (GlxExtensionEntry->base == 0) return BadRequest; + + GlxSetRequestClient(client); + if (stuff->data < OPCODE_ARRAY_LEN) { if (dispatchFuncs[stuff->data] == NULL) { // Try to find a dispatch stub. dispatchFuncs[stuff->data] = GetVendorDispatchFunc(stuff->data, 0); } - return dispatchFuncs[stuff->data](client); + result = dispatchFuncs[stuff->data](client); } else { - return dispatch_GLXSingle(client); + result = dispatch_GLXSingle(client); } + + GlxSetRequestClient(NULL); + + return result; } diff --git a/xserver/glx/vndext.c b/xserver/glx/vndext.c index d7936467b..0513733b6 100644 --- a/xserver/glx/vndext.c +++ b/xserver/glx/vndext.c @@ -139,8 +139,17 @@ GlxGetClientData(ClientPtr client) { GlxClientPriv *cl = xglvGetClientPrivate(client); if (cl == NULL) { - cl = calloc(1, sizeof(GlxClientPriv)); + cl = calloc(1, sizeof(GlxClientPriv) + + screenInfo.numScreens * sizeof(GlxServerVendor *)); if (cl != NULL) { + int i; + + cl->vendors = (GlxServerVendor **) (cl + 1); + for (i=0; i<screenInfo.numScreens; i++) + { + cl->vendors[i] = GlxGetVendorForScreen(NULL, screenInfo.screens[i]); + } + xglvSetClientPrivate(client, cl); } } @@ -295,8 +304,8 @@ GlxFreeServerImports(GlxServerImports *imports) } _X_EXPORT const GlxServerExports glxServer = { - .majorVersion = 0, - .minorVersion = 0, + .majorVersion = GLXSERVER_VENDOR_ABI_MAJOR_VERSION, + .minorVersion = GLXSERVER_VENDOR_ABI_MINOR_VERSION, .extensionInitCallback = &vndInitCallbackListPtr, @@ -315,6 +324,7 @@ _X_EXPORT const GlxServerExports glxServer = { .getContextTagPrivate = GlxGetContextTagPrivate, .getVendorForScreen = GlxGetVendorForScreen, .forwardRequest = GlxForwardRequest, + .setClientScreenVendor = GlxSetClientScreenVendor, }; const GlxServerExports * diff --git a/xserver/glx/vndserver.h b/xserver/glx/vndserver.h index a175656ae..772b458a1 100644 --- a/xserver/glx/vndserver.h +++ b/xserver/glx/vndserver.h @@ -57,6 +57,11 @@ typedef struct GlxContextTagInfoRec { typedef struct GlxClientPrivRec { GlxContextTagInfo *contextTags; unsigned int contextTagCount; + + /** + * The vendor handles for each screen. + */ + GlxServerVendor **vendors; } GlxClientPriv; extern int GlxErrorBase; @@ -90,11 +95,19 @@ Bool GlxAddXIDMap(XID id, GlxServerVendor *vendor); GlxServerVendor * GlxGetXIDMap(XID id); void GlxRemoveXIDMap(XID id); +/** + * Records the client that sent the current request. This is needed in + * GlxGetXIDMap to know which client's (screen -> vendor) mapping to use for a + * regular X window. + */ +void GlxSetRequestClient(ClientPtr client); + GlxContextTagInfo *GlxAllocContextTag(ClientPtr client, GlxServerVendor *vendor); GlxContextTagInfo *GlxLookupContextTag(ClientPtr client, GLXContextTag tag); void GlxFreeContextTag(GlxContextTagInfo *tagInfo); Bool GlxSetScreenVendor(ScreenPtr screen, GlxServerVendor *vendor); +Bool GlxSetClientScreenVendor(ClientPtr client, ScreenPtr screen, GlxServerVendor *vendor); GlxScreenPriv *GlxGetScreen(ScreenPtr pScreen); GlxServerVendor *GlxGetVendorForScreen(ClientPtr client, ScreenPtr screen); diff --git a/xserver/glx/vndservermapping.c b/xserver/glx/vndservermapping.c index fd3be92d9..04788ffbd 100644 --- a/xserver/glx/vndservermapping.c +++ b/xserver/glx/vndservermapping.c @@ -33,6 +33,13 @@ #include "vndservervendor.h" +static ClientPtr requestClient = NULL; + +void GlxSetRequestClient(ClientPtr client) +{ + requestClient = client; +} + static GlxServerVendor *LookupXIDMapResource(XID id) { void *ptr = NULL; @@ -59,10 +66,7 @@ GlxServerVendor *GlxGetXIDMap(XID id) DixGetAttrAccess); if (rv == Success && ptr != NULL) { DrawablePtr draw = (DrawablePtr) ptr; - GlxScreenPriv *screenPriv = GlxGetScreen(draw->pScreen); - if (screenPriv != NULL) { - vendor = screenPriv->vendor; - } + vendor = GlxGetVendorForScreen(requestClient, draw->pScreen); } } return vendor; @@ -185,12 +189,44 @@ Bool GlxSetScreenVendor(ScreenPtr screen, GlxServerVendor *vendor) return TRUE; } +Bool GlxSetClientScreenVendor(ClientPtr client, ScreenPtr screen, GlxServerVendor *vendor) +{ + GlxClientPriv *cl; + + if (screen == NULL || screen->isGPU) { + return FALSE; + } + + cl = GlxGetClientData(client); + if (cl == NULL) { + return FALSE; + } + + if (vendor != NULL) { + cl->vendors[screen->myNum] = vendor; + } else { + cl->vendors[screen->myNum] = GlxGetVendorForScreen(NULL, screen); + } + return TRUE; +} + GlxServerVendor *GlxGetVendorForScreen(ClientPtr client, ScreenPtr screen) { - GlxScreenPriv *priv = GlxGetScreen(screen); - if (priv != NULL) { - return priv->vendor; + // Note that the client won't be sending GPU screen numbers, so we don't + // need per-client mappings for them. + if (client != NULL && !screen->isGPU) { + GlxClientPriv *cl = GlxGetClientData(client); + if (cl != NULL) { + return cl->vendors[screen->myNum]; + } else { + return NULL; + } } else { - return NULL; + GlxScreenPriv *priv = GlxGetScreen(screen); + if (priv != NULL) { + return priv->vendor; + } else { + return NULL; + } } } diff --git a/xserver/hw/xfree86/common/compiler.h b/xserver/hw/xfree86/common/compiler.h index fc1c8b54a..7fb1ba9d1 100644 --- a/xserver/hw/xfree86/common/compiler.h +++ b/xserver/hw/xfree86/common/compiler.h @@ -758,36 +758,6 @@ inl(unsigned short port) return xf86ReadMmio32Le((void *) ioBase, port); } -#elif defined(__arm__) && defined(__linux__) - -/* for Linux on ARM, we use the LIBC inx/outx routines */ -/* note that the appropriate setup via "ioperm" needs to be done */ -/* *before* any inx/outx is done. */ - -#include <sys/io.h> - -static __inline__ void -xf_outb(unsigned short port, unsigned char val) -{ - outb(val, port); -} - -static __inline__ void -xf_outw(unsigned short port, unsigned short val) -{ - outw(val, port); -} - -static __inline__ void -xf_outl(unsigned short port, unsigned int val) -{ - outl(val, port); -} - -#define outb xf_outb -#define outw xf_outw -#define outl xf_outl - #elif defined(__nds32__) /* diff --git a/xserver/hw/xfree86/common/xf86Init.c b/xserver/hw/xfree86/common/xf86Init.c index 8ac7ca508..b18d8b4c9 100644 --- a/xserver/hw/xfree86/common/xf86Init.c +++ b/xserver/hw/xfree86/common/xf86Init.c @@ -686,36 +686,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) if (!dixRegisterPrivateKey(&xf86ScreenKeyRec, PRIVATE_SCREEN, 0)) FatalError("Cannot register DDX private keys"); - for (i = 0; i < xf86NumGPUScreens; i++) { - ScrnInfoPtr pScrn = xf86GPUScreens[i]; - xf86VGAarbiterLock(pScrn); - - /* - * Almost everything uses these defaults, and many of those that - * don't, will wrap them. - */ - pScrn->EnableDisableFBAccess = xf86EnableDisableFBAccess; -#ifdef XFreeXDGA - pScrn->SetDGAMode = xf86SetDGAMode; -#endif - pScrn->DPMSSet = NULL; - pScrn->LoadPalette = NULL; - pScrn->SetOverscan = NULL; - pScrn->DriverFunc = NULL; - pScrn->pScreen = NULL; - scr_index = AddGPUScreen(xf86ScreenInit, argc, argv); - xf86VGAarbiterUnlock(pScrn); - if (scr_index == i) { - dixSetPrivate(&screenInfo.gpuscreens[scr_index]->devPrivates, - xf86ScreenKey, xf86GPUScreens[i]); - pScrn->pScreen = screenInfo.gpuscreens[scr_index]; - /* The driver should set this, but make sure it is set anyway */ - pScrn->vtSema = TRUE; - } else { - FatalError("AddScreen/ScreenInit failed for gpu driver %d %d\n", i, scr_index); - } - } - for (i = 0; i < xf86NumScreens; i++) { xf86VGAarbiterLock(xf86Screens[i]); /* @@ -771,6 +741,36 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) xf86EnsureRANDR(xf86Screens[i]->pScreen); } + for (i = 0; i < xf86NumGPUScreens; i++) { + ScrnInfoPtr pScrn = xf86GPUScreens[i]; + xf86VGAarbiterLock(pScrn); + + /* + * Almost everything uses these defaults, and many of those that + * don't, will wrap them. + */ + pScrn->EnableDisableFBAccess = xf86EnableDisableFBAccess; +#ifdef XFreeXDGA + pScrn->SetDGAMode = xf86SetDGAMode; +#endif + pScrn->DPMSSet = NULL; + pScrn->LoadPalette = NULL; + pScrn->SetOverscan = NULL; + pScrn->DriverFunc = NULL; + pScrn->pScreen = NULL; + scr_index = AddGPUScreen(xf86ScreenInit, argc, argv); + xf86VGAarbiterUnlock(pScrn); + if (scr_index == i) { + dixSetPrivate(&screenInfo.gpuscreens[scr_index]->devPrivates, + xf86ScreenKey, xf86GPUScreens[i]); + pScrn->pScreen = screenInfo.gpuscreens[scr_index]; + /* The driver should set this, but make sure it is set anyway */ + pScrn->vtSema = TRUE; + } else { + FatalError("AddScreen/ScreenInit failed for gpu driver %d %d\n", i, scr_index); + } + } + for (i = 0; i < xf86NumGPUScreens; i++) AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); diff --git a/xserver/hw/xfree86/drivers/modesetting/Makefile.am b/xserver/hw/xfree86/drivers/modesetting/Makefile.am index e0411ef51..961c57408 100644 --- a/xserver/hw/xfree86/drivers/modesetting/Makefile.am +++ b/xserver/hw/xfree86/drivers/modesetting/Makefile.am @@ -24,6 +24,8 @@ # _ladir passes a dummy rpath to libtool so the thing will actually link # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. +include $(top_srcdir)/manpages.am + AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS) AM_CPPFLAGS = \ @@ -62,9 +64,3 @@ driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) EXTRA_DIST = modesetting.man CLEANFILES = $(driverman_DATA) - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -.man.$(DRIVER_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/xserver/hw/xfree86/drivers/modesetting/Makefile.in b/xserver/hw/xfree86/drivers/modesetting/Makefile.in index baca8fbc8..54f1779dc 100644 --- a/xserver/hw/xfree86/drivers/modesetting/Makefile.in +++ b/xserver/hw/xfree86/drivers/modesetting/Makefile.in @@ -77,9 +77,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = hw/xfree86/drivers/modesetting DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/depcomp + $(top_srcdir)/depcomp $(top_srcdir)/manpages.am +subdir = hw/xfree86/drivers/modesetting ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -127,7 +127,8 @@ am__uninstall_files_from_dir = { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(modesetting_drv_ladir)" \ - "$(DESTDIR)$(drivermandir)" + "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(drivermandir)" \ + "$(DESTDIR)$(filemandir)" LTLIBRARIES = $(modesetting_drv_la_LTLIBRARIES) am__DEPENDENCIES_1 = modesetting_drv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -183,7 +184,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(driverman_DATA) +DATA = $(appman_DATA) $(driverman_DATA) $(fileman_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -327,7 +328,38 @@ MAINT = @MAINT@ MAIN_LIB = @MAIN_LIB@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ -MAN_SUBSTS = @MAN_SUBSTS@ + +# xorg-macros.m4 has these bracketed by double underscores, but meson +# wants ats. + +# Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS +# 's|/,|/, |g' will add a space to help font path formatting +MAN_SUBSTS = @MAN_SUBSTS@ -e 's|@vendorversion@|"$(PACKAGE_STRING)" \ + "$(XORG_MAN_PAGE)"|' -e 's|@xorgversion@|"$(PACKAGE_STRING)" \ + "$(XORG_MAN_PAGE)"|' -e 's|@xservername@|Xorg|g' -e \ + 's|@xconfigfile@|xorg.conf|g' -e 's|@projectroot@|$(prefix)|g' \ + -e 's|@apploaddir@|$(appdefaultdir)|g' -e \ + 's|@appmansuffix@|$(APP_MAN_SUFFIX)|g' -e \ + 's|@drivermansuffix@|$(DRIVER_MAN_SUFFIX)|g' -e \ + 's|@adminmansuffix@|$(ADMIN_MAN_SUFFIX)|g' -e \ + 's|@libmansuffix@|$(LIB_MAN_SUFFIX)|g' -e \ + 's|@miscmansuffix@|$(MISC_MAN_SUFFIX)|g' -e \ + 's|@filemansuffix@|$(FILE_MAN_SUFFIX)|g' -e \ + 's|[@]logdir[@]|$(logdir)|g' -e 's|[@]datadir[@]|$(datadir)|g' \ + -e 's|[@]mandir[@]|$(mandir)|g' -e \ + 's|[@]sysconfdir[@]|$(sysconfdir)|g' -e \ + 's|[@]xconfigdir[@]|$(XCONFIGDIR)|g' -e \ + 's|[@]xkbdir[@]|$(XKB_BASE_DIRECTORY)|g' -e \ + 's|[@]XKB_DFLT_RULES[@]|$(XKB_DFLT_RULES)|g' -e \ + 's|[@]XKB_DFLT_MODEL[@]|$(XKB_DFLT_MODEL)|g' -e \ + 's|[@]XKB_DFLT_LAYOUT[@]|$(XKB_DFLT_LAYOUT)|g' -e \ + 's|[@]XKB_DFLT_VARIANT[@]|$(XKB_DFLT_VARIANT)|g' -e \ + 's|[@]XKB_DFLT_OPTIONS[@]|$(XKB_DFLT_OPTIONS)|g' -e \ + 's|[@]bundle_id_prefix[@]|$(BUNDLE_ID_PREFIX)|g' -e \ + 's|[@]modulepath[@]|$(DEFAULT_MODULE_PATH)|g' -e \ + 's|[@]suid_wrapper_dir[@]|$(SUID_WRAPPER_DIR)|g' -e \ + 's|[@]default_font_path[@]|$(COMPILEDDEFAULTFONTPATH)|g' -e \ + '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g' MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ MKDIR_P = @MKDIR_P@ @@ -545,6 +577,17 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +appmandir = $(APP_MAN_DIR) +#appman_PRE = list of application man page files set by calling Makefile.am +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) +drivermandir = $(DRIVER_MAN_DIR) +driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) +filemandir = $(FILE_MAN_DIR) +#fileman_PRE = list of file man page files set by calling Makefile.am +fileman_DATA = $(fileman_PRE:man=$(FILE_MAN_SUFFIX)) +EXTRA_DIST = modesetting.man +CLEANFILES = $(driverman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .$(DRIVER_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS) AM_CPPFLAGS = \ $(XORG_INCS) \ @@ -574,19 +617,12 @@ modesetting_drv_la_SOURCES = \ pageflip.c \ $(NULL) -drivermandir = $(DRIVER_MAN_DIR) driverman_PRE = modesetting.man -driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) -EXTRA_DIST = modesetting.man -CLEANFILES = $(driverman_DATA) - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man all: all-am .SUFFIXES: -.SUFFIXES: .$(DRIVER_MAN_SUFFIX) .man .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +.SUFFIXES: .$(APP_MAN_SUFFIX) .$(DRIVER_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/manpages.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -607,6 +643,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/manpages.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -693,6 +730,27 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-appmanDATA: $(appman_DATA) + @$(NORMAL_INSTALL) + @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appmandir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appmandir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \ + done + +uninstall-appmanDATA: + @$(NORMAL_UNINSTALL) + @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(appmandir)'; $(am__uninstall_files_from_dir) install-drivermanDATA: $(driverman_DATA) @$(NORMAL_INSTALL) @list='$(driverman_DATA)'; test -n "$(drivermandir)" || list=; \ @@ -714,6 +772,27 @@ uninstall-drivermanDATA: @list='$(driverman_DATA)'; test -n "$(drivermandir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(drivermandir)'; $(am__uninstall_files_from_dir) +install-filemanDATA: $(fileman_DATA) + @$(NORMAL_INSTALL) + @list='$(fileman_DATA)'; test -n "$(filemandir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(filemandir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(filemandir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(filemandir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(filemandir)" || exit $$?; \ + done + +uninstall-filemanDATA: + @$(NORMAL_UNINSTALL) + @list='$(fileman_DATA)'; test -n "$(filemandir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(filemandir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -815,7 +894,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: - for dir in "$(DESTDIR)$(modesetting_drv_ladir)" "$(DESTDIR)$(drivermandir)"; do \ + for dir in "$(DESTDIR)$(modesetting_drv_ladir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(drivermandir)" "$(DESTDIR)$(filemandir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -872,8 +951,8 @@ info: info-am info-am: -install-data-am: install-drivermanDATA \ - install-modesetting_drv_laLTLIBRARIES +install-data-am: install-appmanDATA install-drivermanDATA \ + install-filemanDATA install-modesetting_drv_laLTLIBRARIES install-dvi: install-dvi-am @@ -919,8 +998,8 @@ ps: ps-am ps-am: -uninstall-am: uninstall-drivermanDATA \ - uninstall-modesetting_drv_laLTLIBRARIES +uninstall-am: uninstall-appmanDATA uninstall-drivermanDATA \ + uninstall-filemanDATA uninstall-modesetting_drv_laLTLIBRARIES .MAKE: install-am install-strip @@ -928,21 +1007,27 @@ uninstall-am: uninstall-drivermanDATA \ clean-libtool clean-modesetting_drv_laLTLIBRARIES cscopelist \ ctags distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-drivermanDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ + html-am info info-am install install-am install-appmanDATA \ + install-data install-data-am install-drivermanDATA install-dvi \ + install-dvi-am install-exec install-exec-am \ + install-filemanDATA install-html install-html-am install-info \ + install-info-am install-man \ install-modesetting_drv_laLTLIBRARIES install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-drivermanDATA \ + tags uninstall uninstall-am uninstall-appmanDATA \ + uninstall-drivermanDATA uninstall-filemanDATA \ uninstall-modesetting_drv_laLTLIBRARIES +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ .man.$(DRIVER_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +.man.$(FILE_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xserver/hw/xfree86/drivers/modesetting/driver.h b/xserver/hw/xfree86/drivers/modesetting/driver.h index c8db4b8a4..493280c1d 100644 --- a/xserver/hw/xfree86/drivers/modesetting/driver.h +++ b/xserver/hw/xfree86/drivers/modesetting/driver.h @@ -147,6 +147,7 @@ void ms_drm_abort_seq(ScrnInfoPtr scrn, uint32_t seq); Bool ms_crtc_on(xf86CrtcPtr crtc); xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw); +RRCrtcPtr ms_randr_crtc_covering_drawable(DrawablePtr pDraw); int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc); diff --git a/xserver/hw/xfree86/drivers/modesetting/present.c b/xserver/hw/xfree86/drivers/modesetting/present.c index dda7cc064..ab79fe778 100644 --- a/xserver/hw/xfree86/drivers/modesetting/present.c +++ b/xserver/hw/xfree86/drivers/modesetting/present.c @@ -59,8 +59,7 @@ struct ms_present_vblank_event { static RRCrtcPtr ms_present_get_crtc(WindowPtr window) { - xf86CrtcPtr xf86_crtc = ms_dri2_crtc_covering_drawable(&window->drawable); - return xf86_crtc ? xf86_crtc->randr_crtc : NULL; + return ms_randr_crtc_covering_drawable(&window->drawable); } static int diff --git a/xserver/hw/xfree86/drivers/modesetting/vblank.c b/xserver/hw/xfree86/drivers/modesetting/vblank.c index 561229f30..31ff244ad 100644 --- a/xserver/hw/xfree86/drivers/modesetting/vblank.c +++ b/xserver/hw/xfree86/drivers/modesetting/vblank.c @@ -77,6 +77,28 @@ static void ms_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; } +static void ms_randr_crtc_box(RRCrtcPtr crtc, BoxPtr crtc_box) +{ + if (crtc->mode) { + crtc_box->x1 = crtc->x; + crtc_box->y1 = crtc->y; + switch (crtc->rotation) { + case RR_Rotate_0: + case RR_Rotate_180: + default: + crtc_box->x2 = crtc->x + crtc->mode->mode.width; + crtc_box->y2 = crtc->y + crtc->mode->mode.height; + break; + case RR_Rotate_90: + case RR_Rotate_270: + crtc_box->x2 = crtc->x + crtc->mode->mode.height; + crtc_box->y2 = crtc->y + crtc->mode->mode.width; + break; + } + } else + crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; +} + static int ms_box_area(BoxPtr box) { return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1); @@ -91,12 +113,45 @@ ms_crtc_on(xf86CrtcPtr crtc) } /* + * Return the first output which is connected to an active CRTC on this screen. + * + * RRFirstOutput() will return an output from a slave screen if it is primary, + * which is not the behavior that ms_covering_crtc() wants. + */ + +static RROutputPtr ms_first_output(ScreenPtr pScreen) +{ + rrScrPriv(pScreen); + RROutputPtr output; + int i, j; + + if (!pScrPriv) + return NULL; + + if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc && + (pScrPriv->primaryOutput->pScreen == pScreen)) { + return pScrPriv->primaryOutput; + } + + for (i = 0; i < pScrPriv->numCrtcs; i++) { + RRCrtcPtr crtc = pScrPriv->crtcs[i]; + + for (j = 0; j < pScrPriv->numOutputs; j++) { + output = pScrPriv->outputs[j]; + if (output->crtc == crtc) + return output; + } + } + return NULL; +} + +/* * Return the crtc covering 'box'. If two crtcs cover a portion of * 'box', then prefer the crtc with greater coverage. */ static xf86CrtcPtr -ms_covering_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) +ms_covering_xf86_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) { ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); @@ -108,6 +163,10 @@ ms_covering_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) best_crtc = NULL; best_coverage = 0; + + if (!xf86_config) + return NULL; + for (c = 0; c < xf86_config->num_crtc; c++) { crtc = xf86_config->crtc[c]; @@ -135,7 +194,7 @@ ms_covering_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) ScreenPtr slave; if (dixPrivateKeyRegistered(rrPrivKey)) - primary_output = RRFirstOutput(scrn->pScreen); + primary_output = ms_first_output(scrn->pScreen); if (!primary_output || !primary_output->crtc) return NULL; @@ -147,7 +206,74 @@ ms_covering_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) if (!slave->is_output_slave) continue; - if (ms_covering_crtc(slave, box, FALSE)) { + if (ms_covering_xf86_crtc(slave, box, FALSE)) { + /* The drawable is on a slave output, return primary crtc */ + return crtc; + } + } + } + + return best_crtc; +} + +static RRCrtcPtr +ms_covering_randr_crtc(ScreenPtr pScreen, BoxPtr box, Bool screen_is_ms) +{ + ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); + rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); + RRCrtcPtr crtc, best_crtc; + int coverage, best_coverage; + int c; + BoxRec crtc_box, cover_box; + Bool crtc_on; + + best_crtc = NULL; + best_coverage = 0; + + if (!pScrPriv) + return NULL; + + for (c = 0; c < pScrPriv->numCrtcs; c++) { + crtc = pScrPriv->crtcs[c]; + + if (screen_is_ms) { + crtc_on = ms_crtc_on((xf86CrtcPtr) crtc->devPrivate); + } else { + crtc_on = !!crtc->mode; + } + + /* If the CRTC is off, treat it as not covering */ + if (!crtc_on) + continue; + + ms_randr_crtc_box(crtc, &crtc_box); + ms_box_intersect(&cover_box, &crtc_box, box); + coverage = ms_box_area(&cover_box); + if (coverage > best_coverage) { + best_crtc = crtc; + best_coverage = coverage; + } + } + + /* Fallback to primary crtc for drawable's on slave outputs */ + if (best_crtc == NULL && !pScreen->isGPU) { + RROutputPtr primary_output = NULL; + ScreenPtr slave; + + if (dixPrivateKeyRegistered(rrPrivKey)) + primary_output = ms_first_output(scrn->pScreen); + if (!primary_output || !primary_output->crtc) + return NULL; + + crtc = primary_output->crtc; + if (!ms_crtc_on((xf86CrtcPtr) crtc->devPrivate)) + return NULL; + + xorg_list_for_each_entry(slave, &pScreen->slave_list, slave_head) { + if (!slave->is_output_slave) + continue; + + if (ms_covering_randr_crtc(slave, box, FALSE)) { /* The drawable is on a slave output, return primary crtc */ return crtc; } @@ -168,7 +294,21 @@ ms_dri2_crtc_covering_drawable(DrawablePtr pDraw) box.x2 = box.x1 + pDraw->width; box.y2 = box.y1 + pDraw->height; - return ms_covering_crtc(pScreen, &box, TRUE); + return ms_covering_xf86_crtc(pScreen, &box, TRUE); +} + +RRCrtcPtr +ms_randr_crtc_covering_drawable(DrawablePtr pDraw) +{ + ScreenPtr pScreen = pDraw->pScreen; + BoxRec box; + + box.x1 = pDraw->x; + box.y1 = pDraw->y; + box.x2 = box.x1 + pDraw->width; + box.y2 = box.y1 + pDraw->height; + + return ms_covering_randr_crtc(pScreen, &box, TRUE); } static Bool diff --git a/xserver/hw/xfree86/modes/xf86RandR12.c b/xserver/hw/xfree86/modes/xf86RandR12.c index efe04d0c9..1dfb7690a 100644 --- a/xserver/hw/xfree86/modes/xf86RandR12.c +++ b/xserver/hw/xfree86/modes/xf86RandR12.c @@ -2227,6 +2227,7 @@ xf86CrtcLeaseTerminated(RRLeasePtr lease) { int c; int o; + ScrnInfoPtr scrn = xf86ScreenToScrn(lease->screen); RRLeaseTerminated(lease); /* @@ -2257,6 +2258,10 @@ xf86CrtcLeaseTerminated(RRLeasePtr lease) xf86CrtcCheckReset(crtc); } } + + /* Power off if necessary */ + xf86DisableUnusedFunctions(scrn); + RRLeaseFree(lease); } diff --git a/xserver/hw/xfree86/modes/xf86Rotate.c b/xserver/hw/xfree86/modes/xf86Rotate.c index 85ab9b8c7..a8f1e615c 100644 --- a/xserver/hw/xfree86/modes/xf86Rotate.c +++ b/xserver/hw/xfree86/modes/xf86Rotate.c @@ -28,7 +28,7 @@ #include <stddef.h> #include <string.h> #include <stdio.h> - +#include "mi.h" #include "xf86.h" #include "xf86DDC.h" #include "windowstr.h" @@ -191,7 +191,7 @@ xf86RotateRedisplay(ScreenPtr pScreen) * leaves the software cursor in place */ SourceValidate = pScreen->SourceValidate; - pScreen->SourceValidate = NULL; + pScreen->SourceValidate = miSourceValidate; for (c = 0; c < xf86_config->num_crtc; c++) { xf86CrtcPtr crtc = xf86_config->crtc[c]; diff --git a/xserver/hw/xfree86/os-support/shared/sigio.c b/xserver/hw/xfree86/os-support/shared/sigio.c index 884a71c61..247bec708 100644 --- a/xserver/hw/xfree86/os-support/shared/sigio.c +++ b/xserver/hw/xfree86/os-support/shared/sigio.c @@ -208,7 +208,8 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) } } #endif -#ifdef I_SETSIG /* System V Streams - used on Solaris for input devices */ +#if defined(I_SETSIG) && defined(HAVE_ISASTREAM) + /* System V Streams - used on Solaris for input devices */ if (!installed && isastream(fd)) { if (ioctl(fd, I_SETSIG, S_INPUT | S_ERROR | S_HANGUP) == -1) { xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG): %s\n", @@ -279,7 +280,7 @@ xf86RemoveSIGIOHandler(int fd) #ifdef O_ASYNC fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) & ~O_ASYNC); #endif -#ifdef I_SETSIG +#if defined(I_SETSIG) && defined(HAVE_ISASTREAM) if (isastream(fd)) { if (ioctl(fd, I_SETSIG, 0) == -1) { xf86Msg(X_WARNING, "fcntl(%d, I_SETSIG, 0): %s\n", diff --git a/xserver/hw/xnest/Screen.c b/xserver/hw/xnest/Screen.c index 30c6a4623..ac01c248c 100644 --- a/xserver/hw/xnest/Screen.c +++ b/xserver/hw/xnest/Screen.c @@ -263,7 +263,6 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[]) pScreen->SaveScreen = xnestSaveScreen; pScreen->GetImage = xnestGetImage; pScreen->GetSpans = xnestGetSpans; - pScreen->SourceValidate = NULL; /* Window Procedures */ diff --git a/xserver/hw/xwayland/xwayland-cursor.c b/xserver/hw/xwayland/xwayland-cursor.c index cf8395f1d..66720bcc0 100644 --- a/xserver/hw/xwayland/xwayland-cursor.c +++ b/xserver/hw/xwayland/xwayland-cursor.c @@ -188,6 +188,8 @@ xwl_tablet_tool_set_cursor(struct xwl_tablet_tool *xwl_tablet_tool) zwp_tablet_tool_v2_set_cursor(xwl_tablet_tool->tool, xwl_tablet_tool->proximity_in_serial, NULL, 0, 0); + clear_cursor_frame_callback(xwl_cursor); + xwl_cursor->needs_update = FALSE; return; } diff --git a/xserver/hw/xwayland/xwayland-glamor-eglstream.c b/xserver/hw/xwayland/xwayland-glamor-eglstream.c index c62c0d2ac..36b749aaf 100644 --- a/xserver/hw/xwayland/xwayland-glamor-eglstream.c +++ b/xserver/hw/xwayland/xwayland-glamor-eglstream.c @@ -33,6 +33,7 @@ #include "wayland-eglstream-controller-client-protocol.h" #define MESA_EGL_NO_X11_HEADERS +#define EGL_NO_X11 #include <glamor_egl.h> #include <glamor.h> #include <glamor_transform.h> diff --git a/xserver/hw/xwayland/xwayland-glamor-gbm.c b/xserver/hw/xwayland/xwayland-glamor-gbm.c index a211e0915..febc0b910 100644 --- a/xserver/hw/xwayland/xwayland-glamor-gbm.c +++ b/xserver/hw/xwayland/xwayland-glamor-gbm.c @@ -36,6 +36,7 @@ #include <drm_fourcc.h> #define MESA_EGL_NO_X11_HEADERS +#define EGL_NO_X11 #include <gbm.h> #include <glamor_egl.h> @@ -169,6 +170,8 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo, xwl_screen->egl_context, EGL_NATIVE_PIXMAP_KHR, xwl_pixmap->bo, NULL); + if (xwl_pixmap->image == EGL_NO_IMAGE_KHR) + goto error; glGenTextures(1, &xwl_pixmap->texture); glBindTexture(GL_TEXTURE_2D, xwl_pixmap->texture); @@ -176,14 +179,31 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, xwl_pixmap->image); - glBindTexture(GL_TEXTURE_2D, 0); + if (eglGetError() != EGL_SUCCESS) + goto error; - xwl_pixmap_set_private(pixmap, xwl_pixmap); + glBindTexture(GL_TEXTURE_2D, 0); glamor_set_pixmap_texture(pixmap, xwl_pixmap->texture); + /* `set_pixmap_texture()` may fail silently if the FBO creation failed, + * so we check again the texture to be sure it worked. + */ + if (!glamor_get_pixmap_texture(pixmap)) + goto error; + glamor_set_pixmap_type(pixmap, GLAMOR_TEXTURE_DRM); + xwl_pixmap_set_private(pixmap, xwl_pixmap); return pixmap; + +error: + if (xwl_pixmap->image != EGL_NO_IMAGE_KHR) + eglDestroyImageKHR(xwl_screen->egl_display, xwl_pixmap->image); + if (pixmap) + glamor_destroy_pixmap(pixmap); + free(xwl_pixmap); + + return NULL; } static PixmapPtr @@ -194,6 +214,7 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen, struct xwl_screen *xwl_screen = xwl_screen_get(screen); struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen); struct gbm_bo *bo; + PixmapPtr pixmap = NULL; if (width > 0 && height > 0 && depth >= 15 && (hint == 0 || @@ -218,11 +239,18 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); } - if (bo) - return xwl_glamor_gbm_create_pixmap_for_bo(screen, bo, depth); + if (bo) { + pixmap = xwl_glamor_gbm_create_pixmap_for_bo(screen, bo, depth); + + if (!pixmap) + gbm_bo_destroy(bo); + } } - return glamor_create_pixmap(screen, width, height, depth, hint); + if (!pixmap) + pixmap = glamor_create_pixmap(screen, width, height, depth, hint); + + return pixmap; } static Bool diff --git a/xserver/hw/xwayland/xwayland-glamor.c b/xserver/hw/xwayland/xwayland-glamor.c index 7ea6def61..48e330a0f 100644 --- a/xserver/hw/xwayland/xwayland-glamor.c +++ b/xserver/hw/xwayland/xwayland-glamor.c @@ -26,6 +26,7 @@ #include "xwayland.h" #define MESA_EGL_NO_X11_HEADERS +#define EGL_NO_X11 #include <glamor_egl.h> #include <glamor.h> diff --git a/xserver/hw/xwayland/xwayland-input.c b/xserver/hw/xwayland/xwayland-input.c index fbbcb39cc..fa46ac3e7 100644 --- a/xserver/hw/xwayland/xwayland-input.c +++ b/xserver/hw/xwayland/xwayland-input.c @@ -2667,6 +2667,7 @@ xwl_pointer_warp_emulator_maybe_lock(struct xwl_pointer_warp_emulator *warp_emul */ if (pointer_grab && !pointer_grab->ownerEvents && + sprite && XYToWindow(sprite, x, y) != xwl_seat->focus_window->window) return; diff --git a/xserver/hw/xwayland/xwayland-output.c b/xserver/hw/xwayland/xwayland-output.c index cc68f0340..aa6f37864 100644 --- a/xserver/hw/xwayland/xwayland-output.c +++ b/xserver/hw/xwayland/xwayland-output.c @@ -171,6 +171,40 @@ approximate_mmpd(struct xwl_screen *xwl_screen) return 25.4 / DEFAULT_DPI; } +static int +xwl_set_pixmap_visit_window(WindowPtr window, void *data) +{ + ScreenPtr screen = window->drawable.pScreen; + + if (screen->GetWindowPixmap(window) == data) { + screen->SetWindowPixmap(window, screen->GetScreenPixmap(screen)); + return WT_WALKCHILDREN; + } + + return WT_DONTWALKCHILDREN; +} + +static void +update_backing_pixmaps(struct xwl_screen *xwl_screen, int width, int height) +{ + ScreenPtr pScreen = xwl_screen->screen; + WindowPtr pRoot = pScreen->root; + PixmapPtr old_pixmap, new_pixmap; + + old_pixmap = pScreen->GetScreenPixmap(pScreen); + new_pixmap = pScreen->CreatePixmap(pScreen, width, height, + pScreen->rootDepth, + CREATE_PIXMAP_USAGE_BACKING_PIXMAP); + pScreen->SetScreenPixmap(new_pixmap); + + if (old_pixmap) { + TraverseTree(pRoot, xwl_set_pixmap_visit_window, old_pixmap); + pScreen->DestroyPixmap(old_pixmap); + } + + pScreen->ResizeWindow(pRoot, 0, 0, width, height, NULL); +} + static void update_screen_size(struct xwl_output *xwl_output, int width, int height) { @@ -180,6 +214,9 @@ update_screen_size(struct xwl_output *xwl_output, int width, int height) if (xwl_screen->root_clip_mode == ROOT_CLIP_FULL) SetRootClip(xwl_screen->screen, ROOT_CLIP_NONE); + if (!xwl_screen->rootless && xwl_screen->screen->root) + update_backing_pixmaps (xwl_screen, width, height); + xwl_screen->width = width; xwl_screen->height = height; xwl_screen->screen->width = width; @@ -439,7 +476,7 @@ xwl_screen_init_output(struct xwl_screen *xwl_screen) if (!RRScreenInit(xwl_screen->screen)) return FALSE; - RRScreenSetSizeRange(xwl_screen->screen, 320, 200, 8192, 8192); + RRScreenSetSizeRange(xwl_screen->screen, 16, 16, 32767, 32767); rp = rrGetScrPriv(xwl_screen->screen); rp->rrGetInfo = xwl_randr_get_info; diff --git a/xserver/hw/xwayland/xwayland.c b/xserver/hw/xwayland/xwayland.c index 7e6e0ab25..baa08d87b 100644 --- a/xserver/hw/xwayland/xwayland.c +++ b/xserver/hw/xwayland/xwayland.c @@ -125,6 +125,7 @@ ddxProcessArgument(int argc, char *argv[], int i) static DevPrivateKeyRec xwl_window_private_key; static DevPrivateKeyRec xwl_screen_private_key; static DevPrivateKeyRec xwl_pixmap_private_key; +static DevPrivateKeyRec xwl_damage_private_key; static struct xwl_window * xwl_window_get(WindowPtr window) @@ -367,8 +368,14 @@ xwl_cursor_confined_to(DeviceIntPtr device, static void damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data) { - struct xwl_window *xwl_window = data; - struct xwl_screen *xwl_screen = xwl_window->xwl_screen; + WindowPtr window = data; + struct xwl_window *xwl_window = xwl_window_get(window); + struct xwl_screen *xwl_screen; + + if (!xwl_window) + return; + + xwl_screen = xwl_window->xwl_screen; #ifdef GLAMOR_HAS_GBM if (xwl_window->present_flipped) { @@ -390,6 +397,47 @@ damage_destroy(DamagePtr pDamage, void *data) { } +static Bool +register_damage(WindowPtr window) +{ + DamagePtr damage; + + damage = DamageCreate(damage_report, damage_destroy, DamageReportNonEmpty, + FALSE, window->drawable.pScreen, window); + if (damage == NULL) { + ErrorF("Failed creating damage\n"); + return FALSE; + } + + DamageRegister(&window->drawable, damage); + DamageSetReportAfterOp(damage, TRUE); + + dixSetPrivate(&window->devPrivates, &xwl_damage_private_key, damage); + + return TRUE; +} + +static void +unregister_damage(WindowPtr window) +{ + DamagePtr damage; + + damage = dixLookupPrivate(&window->devPrivates, &xwl_damage_private_key); + if (!damage) + return; + + DamageUnregister(damage); + DamageDestroy(damage); + + dixSetPrivate(&window->devPrivates, &xwl_damage_private_key, NULL); +} + +static DamagePtr +window_get_damage(WindowPtr window) +{ + return dixLookupPrivate(&window->devPrivates, &xwl_damage_private_key); +} + static void shell_surface_ping(void *data, struct wl_shell_surface *shell_surface, uint32_t serial) @@ -470,36 +518,25 @@ send_surface_id_event(struct xwl_window *xwl_window) } static Bool -xwl_realize_window(WindowPtr window) +ensure_surface_for_window(WindowPtr window) { ScreenPtr screen = window->drawable.pScreen; struct xwl_screen *xwl_screen; struct xwl_window *xwl_window; struct wl_region *region; - Bool ret; - - xwl_screen = xwl_screen_get(screen); - - screen->RealizeWindow = xwl_screen->RealizeWindow; - ret = (*screen->RealizeWindow) (window); - xwl_screen->RealizeWindow = screen->RealizeWindow; - screen->RealizeWindow = xwl_realize_window; - if (xwl_screen->rootless && !window->parent) { - BoxRec box = { 0, 0, xwl_screen->width, xwl_screen->height }; + if (xwl_window_get(window)) + return TRUE; - RegionReset(&window->winSize, &box); - RegionNull(&window->clipList); - RegionNull(&window->borderClip); - } + xwl_screen = xwl_screen_get(screen); if (xwl_screen->rootless) { if (window->redirectDraw != RedirectDrawManual) - return ret; + return TRUE; } else { if (window->parent) - return ret; + return TRUE; } xwl_window = calloc(1, sizeof *xwl_window); @@ -545,25 +582,14 @@ xwl_realize_window(WindowPtr window) wl_surface_set_user_data(xwl_window->surface, xwl_window); - xwl_window->damage = - DamageCreate(damage_report, damage_destroy, DamageReportNonEmpty, - FALSE, screen, xwl_window); - if (xwl_window->damage == NULL) { - ErrorF("Failed creating damage\n"); - goto err_surf; - } - compRedirectWindow(serverClient, window, CompositeRedirectManual); - DamageRegister(&window->drawable, xwl_window->damage); - DamageSetReportAfterOp(xwl_window->damage, TRUE); - dixSetPrivate(&window->devPrivates, &xwl_window_private_key, xwl_window); xorg_list_init(&xwl_window->link_damage); xwl_window_init_allow_commits(xwl_window); - return ret; + return TRUE; err_surf: if (xwl_window->shell_surface) @@ -575,6 +601,42 @@ err: } static Bool +xwl_realize_window(WindowPtr window) +{ + ScreenPtr screen = window->drawable.pScreen; + struct xwl_screen *xwl_screen; + Bool ret; + + xwl_screen = xwl_screen_get(screen); + + screen->RealizeWindow = xwl_screen->RealizeWindow; + ret = (*screen->RealizeWindow) (window); + xwl_screen->RealizeWindow = screen->RealizeWindow; + screen->RealizeWindow = xwl_realize_window; + + if (!ret) + return FALSE; + + if (xwl_screen->rootless && !window->parent) { + BoxRec box = { 0, 0, xwl_screen->width, xwl_screen->height }; + + RegionReset(&window->winSize, &box); + RegionNull(&window->clipList); + RegionNull(&window->borderClip); + } + + if (xwl_screen->rootless ? + (window->drawable.class == InputOutput && + window->parent == window->drawable.pScreen->root) : + !window->parent) { + if (!register_damage(window)) + return FALSE; + } + + return ensure_surface_for_window(window); +} + +static Bool xwl_unrealize_window(WindowPtr window) { ScreenPtr screen = window->drawable.pScreen; @@ -620,8 +682,8 @@ xwl_unrealize_window(WindowPtr window) wl_surface_destroy(xwl_window->surface); xorg_list_del(&xwl_window->link_damage); - DamageUnregister(xwl_window->damage); - DamageDestroy(xwl_window->damage); + unregister_damage(window); + if (xwl_window->frame_callback) wl_callback_destroy(xwl_window->frame_callback); @@ -638,6 +700,26 @@ xwl_save_screen(ScreenPtr pScreen, int on) } static void +xwl_set_window_pixmap(WindowPtr window, + PixmapPtr pixmap) +{ + ScreenPtr screen = window->drawable.pScreen; + struct xwl_screen *xwl_screen; + + xwl_screen = xwl_screen_get(screen); + + screen->SetWindowPixmap = xwl_screen->SetWindowPixmap; + (*screen->SetWindowPixmap) (window, pixmap); + xwl_screen->SetWindowPixmap = screen->SetWindowPixmap; + screen->SetWindowPixmap = xwl_set_window_pixmap; + + if (!RegionNotEmpty(&window->winSize)) + return; + + ensure_surface_for_window(window); +} + +static void frame_callback(void *data, struct wl_callback *callback, uint32_t time) @@ -689,7 +771,7 @@ xwl_window_post_damage(struct xwl_window *xwl_window) assert(!xwl_window->frame_callback); - region = DamageRegion(xwl_window->damage); + region = DamageRegion(window_get_damage(xwl_window->window)); pixmap = (*xwl_screen->screen->GetWindowPixmap) (xwl_window->window); #ifdef XWL_HAS_GLAMOR @@ -726,7 +808,7 @@ xwl_window_post_damage(struct xwl_window *xwl_window) wl_callback_add_listener(xwl_window->frame_callback, &frame_listener, xwl_window); wl_surface_commit(xwl_window->surface); - DamageEmpty(xwl_window->damage); + DamageEmpty(window_get_damage(xwl_window->window)); xorg_list_del(&xwl_window->link_damage); } @@ -962,6 +1044,8 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) return FALSE; if (!dixRegisterPrivateKey(&xwl_pixmap_private_key, PRIVATE_PIXMAP, 0)) return FALSE; + if (!dixRegisterPrivateKey(&xwl_damage_private_key, PRIVATE_WINDOW, 0)) + return FALSE; dixSetPrivate(&pScreen->devPrivates, &xwl_screen_private_key, xwl_screen); xwl_screen->screen = pScreen; @@ -1121,6 +1205,11 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) xwl_screen->CloseScreen = pScreen->CloseScreen; pScreen->CloseScreen = xwl_close_screen; + if (xwl_screen->rootless) { + xwl_screen->SetWindowPixmap = pScreen->SetWindowPixmap; + pScreen->SetWindowPixmap = xwl_set_window_pixmap; + } + pScreen->CursorWarpedTo = xwl_cursor_warped_to; pScreen->CursorConfinedTo = xwl_cursor_confined_to; diff --git a/xserver/hw/xwayland/xwayland.h b/xserver/hw/xwayland/xwayland.h index 463622669..0854df456 100644 --- a/xserver/hw/xwayland/xwayland.h +++ b/xserver/hw/xwayland/xwayland.h @@ -133,6 +133,7 @@ struct xwl_screen { UnrealizeWindowProcPtr UnrealizeWindow; DestroyWindowProcPtr DestroyWindow; XYToWindowProcPtr XYToWindow; + SetWindowPixmapProcPtr SetWindowPixmap; struct xorg_list output_list; struct xorg_list seat_list; @@ -178,7 +179,6 @@ struct xwl_window { struct wl_surface *surface; struct wl_shell_surface *shell_surface; WindowPtr window; - DamagePtr damage; struct xorg_list link_damage; struct wl_callback *frame_callback; Bool allow_commits; diff --git a/xserver/include/dix-config.h.in b/xserver/include/dix-config.h.in index 3d5b2ce55..27c2764d6 100644 --- a/xserver/include/dix-config.h.in +++ b/xserver/include/dix-config.h.in @@ -134,6 +134,9 @@ /* Define to 1 if you have the <linux/fb.h> header file. */ #undef HAVE_LINUX_FB_H +/* Define to 1 if you have the `memfd_create' function. */ +#undef HAVE_MEMFD_CREATE + /* Define to 1 if you have the `mkostemp' function. */ #undef HAVE_MKOSTEMP @@ -467,9 +470,6 @@ /* Wrap SIGBUS to catch MIT-SHM faults */ #undef BUSFAULT -/* Directory for shared memory temp files */ -#undef SHMDIR - /* Don't let Xdefs.h define 'pointer' */ #define _XTYPEDEF_POINTER 1 @@ -524,4 +524,7 @@ /* Have epoll_create1() */ #undef HAVE_EPOLL_CREATE1 +/* Have isastream */ +#undef HAVE_ISASTREAM + #endif /* _DIX_CONFIG_H_ */ diff --git a/xserver/include/do-not-use-config.h.in b/xserver/include/do-not-use-config.h.in index 884e80533..920230709 100644 --- a/xserver/include/do-not-use-config.h.in +++ b/xserver/include/do-not-use-config.h.in @@ -218,6 +218,9 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `isastream' function. */ +#undef HAVE_ISASTREAM + /* Define to 1 if you have the `issetugid' function. */ #undef HAVE_ISSETUGID @@ -254,6 +257,9 @@ /* Define to 1 if you have the <linux/fb.h> header file. */ #undef HAVE_LINUX_FB_H +/* Define to 1 if you have the `memfd_create' function. */ +#undef HAVE_MEMFD_CREATE + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -553,9 +559,6 @@ /* Support SHAPE extension */ #undef SHAPE -/* Directory for shared memory temp files */ -#undef SHMDIR - /* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG diff --git a/xserver/include/glxvndabi.h b/xserver/include/glxvndabi.h index b78306d23..71f36e722 100644 --- a/xserver/include/glxvndabi.h +++ b/xserver/include/glxvndabi.h @@ -75,7 +75,7 @@ * will still work. */ #define GLXSERVER_VENDOR_ABI_MAJOR_VERSION 0 -#define GLXSERVER_VENDOR_ABI_MINOR_VERSION 0 +#define GLXSERVER_VENDOR_ABI_MINOR_VERSION 1 #if defined(__cplusplus) extern "C" { @@ -236,6 +236,17 @@ typedef struct GlxServerExportsRec { * \param client The client. */ int (* forwardRequest) (GlxServerVendor *vendor, ClientPtr client); + + /** + * Sets the vendor library to use for a screen for a specific client. + * + * This function changes which vendor should handle GLX requests for a + * screen. Unlike \c setScreenVendor, this function can be called at any + * time, and only applies to requests from a single client. + * + * This function is available in GLXVND version 0.1 or later. + */ + Bool (* setClientScreenVendor) (ClientPtr client, ScreenPtr screen, GlxServerVendor *vendor); } GlxServerExports; extern _X_EXPORT const GlxServerExports glxServer; diff --git a/xserver/mi/mi.h b/xserver/mi/mi.h index db62c9166..2cd3066c1 100644 --- a/xserver/mi/mi.h +++ b/xserver/mi/mi.h @@ -360,6 +360,10 @@ extern _X_EXPORT void miPushPixels(GCPtr /*pGC */ , /* miscrinit.c */ +extern _X_EXPORT void +miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h, + unsigned int subWindowMode); + extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, diff --git a/xserver/mi/miscrinit.c b/xserver/mi/miscrinit.c index 9c6af0dc7..264622df1 100644 --- a/xserver/mi/miscrinit.c +++ b/xserver/mi/miscrinit.c @@ -124,6 +124,12 @@ miCloseScreen(ScreenPtr pScreen) return ((*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate)); } +void +miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h, + unsigned int subWindowMode) +{ +} + /* With the introduction of pixmap privates, the "screen pixmap" can no * longer be created in miScreenInit, since all the modules that could * possibly ask for pixmap private space have not been initialized at @@ -243,7 +249,7 @@ miScreenInit(ScreenPtr pScreen, void *pbits, /* pointer to screen bits */ } /* else CloseScreen */ /* QueryBestSize, SaveScreen, GetImage, GetSpans */ - pScreen->SourceValidate = (SourceValidateProcPtr) 0; + pScreen->SourceValidate = miSourceValidate; /* CreateWindow, DestroyWindow, PositionWindow, ChangeWindowAttributes */ /* RealizeWindow, UnrealizeWindow */ pScreen->ValidateTree = miValidateTree; diff --git a/xserver/miext/sync/misync.c b/xserver/miext/sync/misync.c index 490fa0b17..0931803f6 100644 --- a/xserver/miext/sync/misync.c +++ b/xserver/miext/sync/misync.c @@ -101,24 +101,29 @@ miSyncInitFence(ScreenPtr pScreen, SyncFence * pFence, Bool initially_triggered) pFence->funcs = miSyncFenceFuncs; pScreenPriv->funcs.CreateFence(pScreen, pFence, initially_triggered); + + pFence->sync.initialized = TRUE; } void miSyncDestroyFence(SyncFence * pFence) { - ScreenPtr pScreen = pFence->pScreen; - SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen); - SyncTriggerList *ptl, *pNext; - pFence->sync.beingDestroyed = TRUE; - /* tell all the fence's triggers that the counter has been destroyed */ - for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext) { - (*ptl->pTrigger->CounterDestroyed) (ptl->pTrigger); - pNext = ptl->next; - free(ptl); /* destroy the trigger list as we go */ - } - pScreenPriv->funcs.DestroyFence(pScreen, pFence); + if (pFence->sync.initialized) { + ScreenPtr pScreen = pFence->pScreen; + SyncScreenPrivPtr pScreenPriv = SYNC_SCREEN_PRIV(pScreen); + SyncTriggerList *ptl, *pNext; + + /* tell all the fence's triggers that the counter has been destroyed */ + for (ptl = pFence->sync.pTriglist; ptl; ptl = pNext) { + (*ptl->pTrigger->CounterDestroyed) (ptl->pTrigger); + pNext = ptl->next; + free(ptl); /* destroy the trigger list as we go */ + } + + pScreenPriv->funcs.DestroyFence(pScreen, pFence); + } dixFreeObjectWithPrivates(pFence, PRIVATE_SYNC_FENCE); } diff --git a/xserver/miext/sync/misync.h b/xserver/miext/sync/misync.h index dc78c5fdb..f7082d5ea 100644 --- a/xserver/miext/sync/misync.h +++ b/xserver/miext/sync/misync.h @@ -28,6 +28,7 @@ #ifndef _MISYNC_H_ #define _MISYNC_H_ +typedef struct _SyncObject SyncObject; typedef struct _SyncFence SyncFence; typedef struct _SyncTrigger SyncTrigger; diff --git a/xserver/miext/sync/misyncstr.h b/xserver/miext/sync/misyncstr.h index 2eab2aa57..6f89714d6 100644 --- a/xserver/miext/sync/misyncstr.h +++ b/xserver/miext/sync/misyncstr.h @@ -38,13 +38,14 @@ #define SYNC_COUNTER 0 #define SYNC_FENCE 1 -typedef struct _SyncObject { +struct _SyncObject { ClientPtr client; /* Owning client. 0 for system counters */ struct _SyncTriggerList *pTriglist; /* list of triggers */ XID id; /* resource ID */ unsigned char type; /* SYNC_* */ + unsigned char initialized; /* FALSE if created but not initialized */ Bool beingDestroyed; /* in process of going away */ -} SyncObject; +}; typedef struct _SyncCounter { SyncObject sync; /* Common sync object data */ diff --git a/xserver/os/connection.c b/xserver/os/connection.c index 3a083c01c..36e5a3ee2 100644 --- a/xserver/os/connection.c +++ b/xserver/os/connection.c @@ -942,6 +942,14 @@ AttendClient(ClientPtr client) { OsCommPtr oc = (OsCommPtr) client->osPrivate; + if (client->clientGone) { + /* + * client is gone, so any pending requests will be dropped and its + * ignore count doesn't matter. + */ + return; + } + client->ignoreCount--; if (client->ignoreCount) return; diff --git a/xserver/present/present_scmd.c b/xserver/present/present_scmd.c index 3b7fbd832..6a580cb7a 100644 --- a/xserver/present/present_scmd.c +++ b/xserver/present/present_scmd.c @@ -78,7 +78,7 @@ present_check_flip(RRCrtcPtr crtc, PresentFlipReason *reason) { ScreenPtr screen = window->drawable.pScreen; - PixmapPtr screen_pixmap, window_pixmap; + PixmapPtr window_pixmap; WindowPtr root = screen->root; present_screen_priv_ptr screen_priv = present_screen_priv(screen); @@ -99,9 +99,8 @@ present_check_flip(RRCrtcPtr crtc, return FALSE; /* Make sure the window hasn't been redirected with Composite */ - screen_pixmap = screen->GetScreenPixmap(screen); window_pixmap = screen->GetWindowPixmap(window); - if (window_pixmap != screen_pixmap && + if (window_pixmap != screen->GetScreenPixmap(screen) && window_pixmap != screen_priv->flip_pixmap && window_pixmap != present_flip_pending_pixmap(screen)) return FALSE; @@ -127,8 +126,7 @@ present_check_flip(RRCrtcPtr crtc, window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y || #endif window->drawable.width != pixmap->drawable.width || - window->drawable.height != pixmap->drawable.height || - pixmap->devKind != screen_pixmap->devKind) { + window->drawable.height != pixmap->drawable.height) { return FALSE; } diff --git a/xserver/present/present_wnmd.c b/xserver/present/present_wnmd.c index 9d0b147cc..82bae4022 100644 --- a/xserver/present/present_wnmd.c +++ b/xserver/present/present_wnmd.c @@ -649,8 +649,6 @@ present_wnmd_abort_vblank(ScreenPtr screen, WindowPtr window, RRCrtcPtr crtc, ui present_window_priv_ptr window_priv = present_window_priv(window); present_vblank_ptr vblank; - assert(crtc); - (*screen_priv->wnmd_info->abort_vblank) (window, crtc, event_id, msc); xorg_list_for_each_entry(vblank, &window_priv->exec_queue, event_queue) { diff --git a/xserver/randr/rrcrtc.c b/xserver/randr/rrcrtc.c index a851aebcc..ae7e30605 100644 --- a/xserver/randr/rrcrtc.c +++ b/xserver/randr/rrcrtc.c @@ -401,17 +401,22 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc) if (crtc->scanout_pixmap_back) { pScrPriv->rrDisableSharedPixmapFlipping(crtc); - master->StopFlippingPixmapTracking(mrootdraw, - crtc->scanout_pixmap, - crtc->scanout_pixmap_back); + if (mrootdraw) { + master->StopFlippingPixmapTracking(mrootdraw, + crtc->scanout_pixmap, + crtc->scanout_pixmap_back); + } rrDestroySharedPixmap(crtc, crtc->scanout_pixmap_back); crtc->scanout_pixmap_back = NULL; } else { pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL); - master->StopPixmapTracking(mrootdraw, - crtc->scanout_pixmap); + + if (mrootdraw) { + master->StopPixmapTracking(mrootdraw, + crtc->scanout_pixmap); + } } rrDestroySharedPixmap(crtc, crtc->scanout_pixmap); diff --git a/xserver/record/record.c b/xserver/record/record.c index fdcee7e00..f0b739b0c 100644 --- a/xserver/record/record.c +++ b/xserver/record/record.c @@ -2362,9 +2362,9 @@ RecordDisableContext(RecordContextPtr pContext) if (!pContext->pRecordingClient->clientGone) { RecordAProtocolElement(pContext, NULL, XRecordEndOfData, NULL, 0, 0, 0); RecordFlushReplyBuffer(pContext, NULL, 0, NULL, 0); - /* Re-enable request processing on this connection. */ - AttendClient(pContext->pRecordingClient); } + /* Re-enable request processing on this connection. */ + AttendClient(pContext->pRecordingClient); for (pRCAP = pContext->pListOfRCAP; pRCAP; pRCAP = pRCAP->pNextRCAP) { RecordUninstallHooks(pRCAP, 0); diff --git a/xserver/render/render.c b/xserver/render/render.c index 7d94bd5ff..c376090ca 100644 --- a/xserver/render/render.c +++ b/xserver/render/render.c @@ -1492,6 +1492,11 @@ ProcRenderCreateCursor(ClientPtr client) return BadAlloc; } + /* what kind of maniac creates a cursor from a window picture though */ + if (pSrc->pDrawable->type == DRAWABLE_WINDOW) + pScreen->SourceValidate(pSrc->pDrawable, 0, 0, width, height, + IncludeInferiors); + if (pSrc->format == PICT_a8r8g8b8) { (*pScreen->GetImage) (pSrc->pDrawable, 0, 0, width, height, ZPixmap, diff --git a/xserver/xkb/xkb.c b/xserver/xkb/xkb.c index 764079506..3162574a4 100644 --- a/xserver/xkb/xkb.c +++ b/xserver/xkb/xkb.c @@ -2110,6 +2110,9 @@ SetKeySyms(ClientPtr client, } } } + if (XkbKeyHasActions(xkb, i + req->firstKeySym)) + XkbResizeKeyActions(xkb, i + req->firstKeySym, + XkbNumGroups(wire->groupInfo) * wire->width); oldMap->kt_index[0] = wire->ktIndex[0]; oldMap->kt_index[1] = wire->ktIndex[1]; oldMap->kt_index[2] = wire->ktIndex[2]; @@ -2383,6 +2386,9 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, XkbSymMapPtr map; int i; + if (!dev->key) + return 0; + xkbi = dev->key->xkbInfo; xkb = xkbi->desc; @@ -2495,6 +2501,9 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, char *values) XkbSrvInfoPtr xkbi; XkbDescPtr xkb; + if (!dev->key) + return Success; + xkbi = dev->key->xkbInfo; xkb = xkbi->desc; |