~xmir-team/xorg-server/+git/xmir:server-1.19-branch

Last commit made on 2017-01-11
Get this branch:
git clone -b server-1.19-branch https://git.launchpad.net/~xmir-team/xorg-server/+git/xmir
Members of XMir Development Team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
server-1.19-branch
Repository:
lp:~xmir-team/xorg-server/+git/xmir

Recent commits

ad2facd... by Adam Jackson <email address hidden>

xserver 1.19.1

Signed-off-by: Adam Jackson <email address hidden>

82dcb68... by Keith Packard

AttendClient of grab-pervious client must queue to saved_ready_clients [v2]

A client which is attended while a grab is blocking execution of its
requests needs to be placed in the saved_ready_clients list so that it
will get scheduled once the grab terminates. Otherwise, if the client
never sends another request, there is no way for it to be placed in
the ready_clients list.

v2: Wrap comment above mark_client_saved_ready.
    Remove test for OS_COMM_IGNORED which will always be true.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99333
Reviewed-by: Adam Jackson <email address hidden>
Signed-off-by: Keith Packard <email address hidden>
(cherry picked from commit 785053d033e73d2deb0ded4b97eabfd881991978)

1451698... by Qiang Yu

randr: fix xserver crash when xrandr setprovideroutputsource

xrandr --setprovideroutputsource <screen> <gpu screen>
Xorg: ../../../xserver/dix/dispatch.c:4018: AttachOutputGPU:
Assertion `new->isGPU' failed.

GPUScreen is not allowed to be sink output.

Signed-off-by: Qiang Yu <email address hidden>
Reviewed-by: Hans de Goede <email address hidden>
Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 555e0a42d138ac8d83af62638752a1bebad602d6)

3381e2c... by Qiang Yu

xfree86: fix wrong usage of xf86optionListMerge

Signed-off-by: Qiang Yu <email address hidden>
Reviewed-by: Hans de Goede <email address hidden>
Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 1012510620de7dadd0ab18b19a8e11facd884601)

27a2772... by =?utf-8?q?Michel_D=C3=A4nzer?= <email address hidden>

present: Only call present_flip_notify if vblank->queued == FALSE

We are no longer using the present_flip_queue list only for presents
which have already been submitted to the driver for page flipping, but
also for those which we are queueing up to be flipped later, marked
with vblank->queued == TRUE. We were incorrectly calling
present_flip_notify for such entries, failing the assertion in
present_flip_notify (or presumably resulting in other undesirable
behaviour with assertions disabled).

Reproduction recipe: Run the JavaFX test case referenced by
https://bugs.freedesktop.org/show_bug.cgi?id=98831#c6 and alt-tab out
of it while it's fullscreen. May take a few attempts to hit the
assertion failure.

Fixes: bab0f450a719 ("present: Fix presentation of flips out of order")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98854
Reviewed-by: Alex Deucher <email address hidden>
(cherry picked from commit e473b2bc016adacfe3fa47fdf6a8ce9f8cddff62)

943e3cb... by Kai-Heng Feng

edid: Add quirk for ADA 1024x600 7" display.

Detailed mode reports 108 mm x 68 mm which is for smaller display.
Maximum image size reports 15 cm x 10 cm which aligns with its physical
size, use this size instead.

Signed-off-by: Kai-Heng Feng <email address hidden>
Acked-by: Alex Deucher <email address hidden>
(cherry picked from commit 9874f73e88678c9eacbcba05e52336fc63a32712)

cb3057d... by Peter Hutterer

os: return 0 from check_timers if we touched any of them

Fixes a regression introduced in 0b2f30834b1a9f. If a driver posts input
events during a timer function (wacom and synaptics do this during tap
timeouts), ProcessInputEvents() is not called for these events. There are no
new events on any fds, so the events just sit in the queue waiting for
something else to happen.

Fix this by simply returning 0 from check_timers if we ran at least one of
them or reset them all. This way the callers ospoll_wait will exit and
continue with normal processing.

Signed-off-by: Peter Hutterer <email address hidden>
Reviewed-by: Keith Packard <email address hidden>

db03742... by Michal Srb <email address hidden>

xinerama: Swap the response in RRXineramaWriteMonitor

Reviewed-by: Adam Jackson <email address hidden>

862c1c4... by Hans De Goede <email address hidden>

glamor: Trust eglGetPlatformDisplayEXT if it exists

If the libEGL we are using has eglGetPlatformDisplayEXT, yet it still
returns NULL, then this very likely means that it does not support the
type (e.g. EGL_PLATFORM_GBM_MESA) passed in, and then returning NULL is
the right thing to do.

This avoids falling back to an eglGetDisplay() implementation which does
not understands the passed in gbm handle, treats it as a pointer to
something else completely, followed by a crash sooner or later.

Specifically this fixes using the nvidia binary driver, with nvidia's
libEGL + the modesetting driver on a secondary GPU crashing inside
glamor_egl_init() sometimes.

[1.19: squash in typo fix from 29a4f3db - ajax]

Cc: Eric Anholt <email address hidden>
Reviewed-by: Adam Jackson <email address hidden>
Signed-off-by: Hans de Goede <email address hidden>
(cherry picked from commit 05e19644250698aa126a60bc671e85425df784d1)

8790bd9... by Mihail Konev <email address hidden>

os,dix: Depend custom libs on libs, not objects

The custom os/os.O library reuses *.o files of os/libos.la.

The current rule assumes automake puts all the objects into per-target
am__*_la_OBJECTS variable. At least with AC_REPLACE_FUNCS, this no
longer holds (as wanted objects are put into LTLIBOBJS instead).

Depend on automake's result, the *.la library instead, to express demand
of any its dependencies being built.

Should be fixing randomly occuring "undefined reference to `strlcpy'"
errors when linking Xvfb and other DDX-es that could use os.O.

Reviewed-by: Adam Jackson <email address hidden>
Signed-off-by: Mihail Konev <email address hidden>
(cherry picked from commit 5b74e260e009d8bdf26433724495802b85cce7c3)