Xext/panoramiXprocs.c | 70 +++++++++--
Xext/shm.c | 1
Xi/sendexev.c | 24 ++-
Xi/xibarriers.c | 9 -
Xi/xiwarppointer.c | 4
configure.ac | 9 -
dix/dispatch.c | 4
dix/events.c | 6
dix/swapreq.c | 7 +
glamor/glamor.c | 3
glamor/glamor_copy.c | 21 +--
glamor/glamor_dash.c | 2
glamor/glamor_fbo.c | 4
glamor/glamor_glyphblt.c | 26 ++--
glamor/glamor_largepixmap.c | 11 -
glamor/glamor_lines.c | 13 +-
glamor/glamor_points.c | 14 +-
glamor/glamor_rects.c | 13 +-
glamor/glamor_render.c | 5
glamor/glamor_segs.c | 14 +-
glamor/glamor_spans.c | 13 +-
glamor/glamor_transform.c | 11 +
glamor/glamor_transform.h | 2
glamor/glamor_utils.h | 4
glamor/glamor_xv.c | 9 -
hw/dmx/dmxinit.c | 63 ----------
hw/dmx/dmxsync.c | 2
hw/dmx/input/usb-keyboard.c | 3
hw/kdrive/ephyr/ephyr.c | 6
hw/kdrive/ephyr/ephyrvideo.c | 5
hw/kdrive/ephyr/hostx.c | 6
hw/xfree86/Makefile.am | 10 -
hw/xfree86/common/xf86Init.c | 1
hw/xfree86/common/xf86Xinput.c | 3
hw/xfree86/common/xf86pciBus.c | 2
hw/xfree86/dixmods/Makefile.am | 4
hw/xfree86/dixmods/xkbKillSrv.c | 54 --------
hw/xfree86/dixmods/xkbPrivate.c | 53 --------
hw/xfree86/dixmods/xkbVT.c | 64 ----------
hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 63 +++++++---
hw/xfree86/drivers/modesetting/dri2.c | 74 +++---------
hw/xfree86/drivers/modesetting/driver.c | 5
hw/xfree86/drivers/modesetting/driver.h | 17 ++
hw/xfree86/drivers/modesetting/drmmode_display.c | 66 +++++++++-
hw/xfree86/drivers/modesetting/present.c | 25 ----
hw/xfree86/drivers/modesetting/vblank.c | 69 +++++++++--
hw/xfree86/modes/xf86RandR12.c | 139 +++++++++++++++--------
hw/xfree86/os-support/linux/lnx_init.c | 3
hw/xfree86/os-support/shared/posix_tty.c | 3
hw/xfree86/parser/scan.c | 2
hw/xfree86/xkb/Makefile.am | 6
hw/xfree86/xkb/meson.build | 12 +
hw/xfree86/xkb/xkbKillSrv.c | 54 ++++++++
hw/xfree86/xkb/xkbPrivate.c | 53 ++++++++
hw/xfree86/xkb/xkbVT.c | 64 ++++++++++
hw/xfree86/xorg-wrapper.c | 3
hw/xquartz/quartz.c | 1
hw/xwayland/drm.xml | 35 +++--
hw/xwayland/xwayland-input.c | 32 +++++
hw/xwayland/xwayland-output.c | 3
hw/xwayland/xwayland.c | 38 +++++-
include/xorg-config.h.in | 3
os/io.c | 38 ++++--
os/osinit.c | 1
os/utils.c | 8 +
present/present.c | 4
randr/rrcrtc.c | 5
record/record.c | 3
test/Makefile.am | 2
test/signal-logging.c | 2
xkb/xkbtext.c | 42 +++---
71 files changed, 884 insertions(+), 566 deletions(-)
New commits:
commit ec37e559614cf4eaba67d3ca0693f09fd95a5d57
Author: Adam Jackson <a...@redhat.com>
Date: Wed Oct 4 15:29:18 2017 -0400
xserver 1.19.4
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/configure.ac b/configure.ac
index e078f12..682c655 100644
--- a/configure.ac
+++ b/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.19.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2017-03-15"
-RELEASE_NAME="Lobster Bisque"
+AC_INIT([xorg-server], 1.19.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2017-10-04"
+RELEASE_NAME="French Onion Soup"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 12fe3d3e9f494ef84832efe94ba00db92be499b1
Author: Louis-Francis Ratté-Boulianne <l...@collabora.com>
Date: Wed Sep 27 01:19:58 2017 -0400
present: Check the whole exec queue on event
Later events are sometimes added in front of the queue (e.g.
if page flipping fails) so we need to check the whole queue
on event.
Signed-off-by: Louis-Francis Ratté-Boulianne <l...@collabora.com>
Reviewed-by: Michel Dänzer <michel.daen...@amd.com>
(cherry picked from commit c2f2b25ab55c67f9f3ad07c02fa746eae7c61196)
diff --git a/present/present.c b/present/present.c
index c9c68dc..7d428fc 100644
--- a/present/present.c
+++ b/present/present.c
@@ -543,8 +543,6 @@ present_event_notify(uint64_t event_id, uint64_t ust,
uint64_t msc)
present_execute(vblank, ust, msc);
return;
}
- if (match < 0)
- break;
}
xorg_list_for_each_entry(vblank, &present_flip_queue, event_queue) {
if (vblank->event_id == event_id) {
@@ -1007,8 +1005,6 @@ present_abort_vblank(ScreenPtr screen, RRCrtcPtr crtc,
uint64_t event_id, uint64
vblank->queued = FALSE;
return;
}
- if (match < 0)
- break;
}
xorg_list_for_each_entry(vblank, &present_flip_queue, event_queue) {
if (vblank->event_id == event_id) {
commit 388dc1aeac9acf2d51ad5103570beffd81d78b96
Author: Keith Packard <kei...@keithp.com>
Date: Fri Sep 29 08:48:33 2017 -0700
xf86-video-modesetting: Add ms_queue_vblank helper [v3]
This provides an API wrapper around the kernel interface for queueing
a vblank event, simplifying all of the callers.
v2: Fix missing '|' in computing vbl.request.type
v3: Remove spurious bit of next patch (thanks, Michel Dänzer)
Signed-off-by: Keith Packard <kei...@keithp.com>
Reviewed-by: Adam Jackson <a...@redhat.com>
(cherry picked from commit 677c32bcda98a96585bb1f66b57e0755a157b772)
diff --git a/hw/xfree86/drivers/modesetting/dri2.c
b/hw/xfree86/drivers/modesetting/dri2.c
index 8944ef1..8f44899 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -695,19 +695,16 @@ ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
{
ScreenPtr screen = draw->pScreen;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- modesettingPtr ms = modesettingPTR(scrn);
ms_dri2_frame_event_ptr wait_info;
- drmVBlank vbl;
int ret;
xf86CrtcPtr crtc = ms_dri2_crtc_covering_drawable(draw);
- drmmode_crtc_private_ptr drmmode_crtc;
CARD64 current_msc, current_ust, request_msc;
uint32_t seq;
+ uint64_t queued_msc;
/* Drawable not visible, return immediately */
if (!crtc)
goto out_complete;
- drmmode_crtc = crtc->driver_private;
wait_info = calloc(1, sizeof(*wait_info));
if (!wait_info)
@@ -747,13 +744,8 @@ ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
if (current_msc >= target_msc)
target_msc = current_msc;
- vbl.request.type = (DRM_VBLANK_ABSOLUTE |
- DRM_VBLANK_EVENT |
- drmmode_crtc->vblank_pipe);
- vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, target_msc);
- vbl.request.signal = (unsigned long)seq;
- ret = drmWaitVBlank(ms->fd, &vbl);
+ ret = ms_queue_vblank(crtc, MS_QUEUE_ABSOLUTE, target_msc,
&queued_msc, seq);
if (ret) {
static int limit = 5;
if (limit) {
@@ -766,7 +758,7 @@ ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
goto out_free;
}
- wait_info->frame = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence);
+ wait_info->frame = queued_msc;
DRI2BlockClient(client, draw);
return TRUE;
}
@@ -775,9 +767,6 @@ ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
* If we get here, target_msc has already passed or we don't have one,
* so we queue an event that will satisfy the divisor/remainder equation.
*/
- vbl.request.type =
- DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe;
-
request_msc = current_msc - (current_msc % divisor) +
remainder;
/*
@@ -795,11 +784,7 @@ ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
if (!seq)
goto out_free;
- vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, request_msc);
- vbl.request.signal = (unsigned long)seq;
-
- ret = drmWaitVBlank(ms->fd, &vbl);
- if (ret) {
+ if (!ms_queue_vblank(crtc, MS_QUEUE_ABSOLUTE, request_msc, &queued_msc,
seq)) {
static int limit = 5;
if (limit) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
@@ -811,7 +796,8 @@ ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr
draw, CARD64 target_msc,
goto out_free;
}
- wait_info->frame = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence);
+ wait_info->frame = queued_msc;
+
DRI2BlockClient(client, draw);
return TRUE;
@@ -839,20 +825,18 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
{
ScreenPtr screen = draw->pScreen;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- modesettingPtr ms = modesettingPTR(scrn);
- drmVBlank vbl;
int ret, flip = 0;
xf86CrtcPtr crtc = ms_dri2_crtc_covering_drawable(draw);
- drmmode_crtc_private_ptr drmmode_crtc;
ms_dri2_frame_event_ptr frame_info = NULL;
uint64_t current_msc, current_ust;
uint64_t request_msc;
uint32_t seq;
+ ms_queue_flag ms_flag = MS_QUEUE_ABSOLUTE;
+ uint64_t queued_msc;
/* Drawable not displayed... just complete the swap */
if (!crtc)
goto blit_fallback;
- drmmode_crtc = crtc->driver_private;
frame_info = calloc(1, sizeof(*frame_info));
if (!frame_info)
@@ -878,6 +862,8 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
ms_dri2_reference_buffer(back);
ret = ms_get_crtc_ust_msc(crtc, ¤t_ust, ¤t_msc);
+ if (ret != Success)
+ goto blit_fallback;
/* Flips need to be submitted one frame before */
if (can_flip(scrn, draw, front, back)) {
@@ -892,22 +878,19 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
if (*target_msc > 0)
*target_msc -= flip;
+ /* If non-pageflipping, but blitting/exchanging, we need to use
+ * DRM_VBLANK_NEXTONMISS to avoid unreliable timestamping later
+ * on.
+ */
+ if (flip == 0)
+ ms_flag |= MS_QUEUE_NEXT_ON_MISS;
+
/*
* If divisor is zero, or current_msc is smaller than target_msc
* we just need to make sure target_msc passes before initiating
* the swap.
*/
if (divisor == 0 || current_msc < *target_msc) {
- vbl.request.type = (DRM_VBLANK_ABSOLUTE |
- DRM_VBLANK_EVENT |
- drmmode_crtc->vblank_pipe);
-
- /* If non-pageflipping, but blitting/exchanging, we need to use
- * DRM_VBLANK_NEXTONMISS to avoid unreliable timestamping later
- * on.
- */
- if (flip == 0)
- vbl.request.type |= DRM_VBLANK_NEXTONMISS;
/* If target_msc already reached or passed, set it to
* current_msc to ensure we return a reasonable value back
@@ -922,19 +905,14 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
if (!seq)
goto blit_fallback;
- vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, *target_msc);
- vbl.request.signal = (unsigned long)seq;
-
- ret = drmWaitVBlank(ms->fd, &vbl);
- if (ret) {
+ if (!ms_queue_vblank(crtc, ms_flag, *target_msc, &queued_msc, seq)) {
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"divisor 0 get vblank counter failed: %s\n",
strerror(errno));
goto blit_fallback;
}
- *target_msc = ms_kernel_msc_to_crtc_msc(crtc,
- vbl.reply.sequence + flip);
+ *target_msc = queued_msc + flip;
frame_info->frame = *target_msc;
return TRUE;
@@ -945,11 +923,6 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
* and we need to queue an event that will satisfy the divisor/remainder
* equation.
*/
- vbl.request.type = (DRM_VBLANK_ABSOLUTE |
- DRM_VBLANK_EVENT |
- drmmode_crtc->vblank_pipe);
- if (flip == 0)
- vbl.request.type |= DRM_VBLANK_NEXTONMISS;
request_msc = current_msc - (current_msc % divisor) +
remainder;
@@ -966,7 +939,6 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
if (request_msc <= current_msc)
request_msc += divisor;
-
seq = ms_drm_queue_alloc(crtc, frame_info,
ms_dri2_frame_event_handler,
ms_dri2_frame_event_abort);
@@ -974,11 +946,7 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
goto blit_fallback;
/* Account for 1 frame extra pageflip delay if flip > 0 */
- vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, request_msc) - flip;
- vbl.request.signal = (unsigned long)seq;
-
- ret = drmWaitVBlank(ms->fd, &vbl);
- if (ret) {
+ if (!ms_queue_vblank(crtc, ms_flag, request_msc - flip, &queued_msc, seq))
{
xf86DrvMsg(scrn->scrnIndex, X_WARNING,
"final get vblank counter failed: %s\n",
strerror(errno));
@@ -986,7 +954,7 @@ ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
}
/* Adjust returned value for 1 fame pageflip offset of flip > 0 */
- *target_msc = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence + flip);
+ *target_msc = queued_msc + flip;
frame_info->frame = *target_msc;
return TRUE;
diff --git a/hw/xfree86/drivers/modesetting/driver.h
b/hw/xfree86/drivers/modesetting/driver.h
index eee96e5..66034ba 100644
--- a/hw/xfree86/drivers/modesetting/driver.h
+++ b/hw/xfree86/drivers/modesetting/driver.h
@@ -119,6 +119,10 @@ typedef struct _modesettingRec {
Bool dirty_enabled;
uint32_t cursor_width, cursor_height;
+
+ Bool has_queue_sequence;
+ Bool tried_queue_sequence;
+
} modesettingRec, *modesettingPtr;
#define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate))
@@ -129,6 +133,15 @@ uint32_t ms_drm_queue_alloc(xf86CrtcPtr crtc,
ms_drm_handler_proc handler,
ms_drm_abort_proc abort);
+typedef enum ms_queue_flag {
+ MS_QUEUE_ABSOLUTE = 0,
+ MS_QUEUE_RELATIVE = 1,
+ MS_QUEUE_NEXT_ON_MISS = 2
+} ms_queue_flag;
+
+Bool ms_queue_vblank(xf86CrtcPtr crtc, ms_queue_flag flags,
+ uint64_t msc, uint64_t *msc_queued, uint32_t seq);
+
void ms_drm_abort(ScrnInfoPtr scrn,
Bool (*match)(void *data, void *match_data),
void *match_data);
@@ -140,8 +153,8 @@ xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr
pDraw);
int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc);
-uint32_t ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect);
-uint64_t ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint32_t sequence);
+uint64_t ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect);
+uint64_t ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint64_t sequence);
Bool ms_dri2_screen_init(ScreenPtr screen);
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c
b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 53e1cf5..025725a 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -279,8 +279,6 @@ drmmode_SharedPixmapPresentOnVBlank(PixmapPtr ppix,
xf86CrtcPtr crtc,
{
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix);
-
- drmVBlank vbl;
struct vblank_event_args *event_args;
if (ppix == drmmode_crtc->prime_pixmap)
@@ -303,12 +301,7 @@ drmmode_SharedPixmapPresentOnVBlank(PixmapPtr ppix,
xf86CrtcPtr crtc,
drmmode_SharedPixmapVBlankEventHandler,
drmmode_SharedPixmapVBlankEventAbort);
- vbl.request.type =
- DRM_VBLANK_RELATIVE | DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe;
- vbl.request.sequence = 1;
- vbl.request.signal = (unsigned long) ppriv->flip_seq;
-
- return drmWaitVBlank(drmmode->fd, &vbl) >= 0;
+ return ms_queue_vblank(crtc, MS_QUEUE_RELATIVE, 1, NULL, ppriv->flip_seq);
}
Bool
diff --git a/hw/xfree86/drivers/modesetting/present.c
b/hw/xfree86/drivers/modesetting/present.c
index 55b622c..67982d7 100644
--- a/hw/xfree86/drivers/modesetting/present.c
+++ b/hw/xfree86/drivers/modesetting/present.c
@@ -109,13 +109,7 @@ ms_present_queue_vblank(RRCrtcPtr crtc,
uint64_t msc)
{
xf86CrtcPtr xf86_crtc = crtc->devPrivate;
- ScreenPtr screen = crtc->pScreen;
- ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
- modesettingPtr ms = modesettingPTR(scrn);
- drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
struct ms_present_vblank_event *event;
- drmVBlank vbl;
- int ret;
uint32_t seq;
event = calloc(sizeof(struct ms_present_vblank_event), 1);
@@ -130,22 +124,9 @@ ms_present_queue_vblank(RRCrtcPtr crtc,
return BadAlloc;
}
- vbl.request.type =
- DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe;
- vbl.request.sequence = ms_crtc_msc_to_kernel_msc(xf86_crtc, msc);
- vbl.request.signal = seq;
- for (;;) {
- ret = drmWaitVBlank(ms->fd, &vbl);
- if (!ret)
- break;
- /* If we hit EBUSY, then try to flush events. If we can't, then
- * this is an error.
- */
- if (errno != EBUSY || ms_flush_drm_events(screen) < 0) {
- ms_drm_abort_seq(scrn, seq);
- return BadAlloc;
- }
- }
+ if (!ms_queue_vblank(xf86_crtc, MS_QUEUE_ABSOLUTE, msc, NULL, seq))
+ return BadAlloc;
+
DebugPresent(("\t\tmq %lld seq %u msc %llu (hw msc %u)\n",
(long long) event_id, seq, (long long) msc,
vbl.request.sequence));
diff --git a/hw/xfree86/drivers/modesetting/vblank.c
b/hw/xfree86/drivers/modesetting/vblank.c
index 8682f4d..31cf0bd 100644
--- a/hw/xfree86/drivers/modesetting/vblank.c
+++ b/hw/xfree86/drivers/modesetting/vblank.c
@@ -173,7 +173,7 @@ ms_dri2_crtc_covering_drawable(DrawablePtr pDraw)
static Bool
ms_get_kernel_ust_msc(xf86CrtcPtr crtc,
- uint32_t *msc, uint64_t *ust)
+ uint64_t *msc, uint64_t *ust)
{
ScreenPtr screen = crtc->randr_crtc->pScreen;
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
@@ -198,13 +198,50 @@ ms_get_kernel_ust_msc(xf86CrtcPtr crtc,
}
}
+Bool
+ms_queue_vblank(xf86CrtcPtr crtc, ms_queue_flag flags,
+ uint64_t msc, uint64_t *msc_queued, uint32_t seq)
+{
+ ScreenPtr screen = crtc->randr_crtc->pScreen;
+ ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ modesettingPtr ms = modesettingPTR(scrn);
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+ drmVBlank vbl;
+ int ret;
+
+ for (;;) {
+ /* Queue an event at the specified sequence */
+ vbl.request.type = DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe;
+ if (flags & MS_QUEUE_RELATIVE)
+ vbl.request.type |= DRM_VBLANK_RELATIVE;
+ else
+ vbl.request.type |= DRM_VBLANK_ABSOLUTE;
+ if (flags & MS_QUEUE_NEXT_ON_MISS)
+ vbl.request.type |= DRM_VBLANK_NEXTONMISS;
+
+ vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, msc);
+ vbl.request.signal = seq;
+ ret = drmWaitVBlank(ms->fd, &vbl);
+ if (ret == 0) {
+ if (msc_queued)
+ *msc_queued = ms_kernel_msc_to_crtc_msc(crtc,
vbl.reply.sequence);
+ return TRUE;
+ }
+ if (errno != EBUSY) {
+ ms_drm_abort_seq(scrn, msc);
+ return FALSE;
+ }
+ ms_flush_drm_events(screen);
+ }
+}
+
/**
* Convert a 32-bit kernel MSC sequence number to a 64-bit local sequence
* number, adding in the vblank_offset and high 32 bits, and dealing
* with 64-bit wrapping
*/
uint64_t
-ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint32_t sequence)
+ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint64_t sequence)
{
drmmode_crtc_private_rec *drmmode_crtc = crtc->driver_private;
sequence += drmmode_crtc->vblank_offset;
@@ -218,7 +255,7 @@ ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint32_t
sequence)
int
ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc)
{
- uint32_t kernel_msc;
+ uint64_t kernel_msc;
if (!ms_get_kernel_ust_msc(crtc, &kernel_msc, ust))
return BadMatch;
@@ -230,13 +267,13 @@ ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64
*msc)
#define MAX_VBLANK_OFFSET 1000
/**
- * Convert a 64-bit adjusted MSC value into a 32-bit kernel sequence number,
- * removing the high 32 bits and subtracting out the vblank_offset term.
+ * Convert a 64-bit adjusted MSC value into a 64-bit kernel sequence number,
+ * by subtracting out the vblank_offset term.
*
* This also updates the vblank_offset when it notices that the value should
* change.
*/
-uint32_t
+uint64_t
ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect)
{
drmmode_crtc_private_rec *drmmode_crtc = crtc->driver_private;
@@ -257,7 +294,7 @@ ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect)
drmmode_crtc->vblank_offset = 0;
}
}
- return (uint32_t) (expect - drmmode_crtc->vblank_offset);
+ return (expect - drmmode_crtc->vblank_offset);
}
/**
@@ -375,25 +412,31 @@ ms_drm_abort(ScrnInfoPtr scrn, Bool (*match)(void *data,
void *match_data),
* drm event queue and calls the handler for it.
*/
static void
-ms_drm_handler(int fd, uint32_t frame, uint32_t sec, uint32_t usec,
- void *user_ptr)
+ms_drm_sequence_handler(int fd, uint64_t frame, uint64_t ns, uint64_t
user_data)
{
struct ms_drm_queue *q, *tmp;
- uint32_t user_data = (uint32_t) (intptr_t) user_ptr;
+ uint32_t seq = (uint32_t) user_data;
xorg_list_for_each_entry_safe(q, tmp, &ms_drm_queue, list) {
- if (q->seq == user_data) {
+ if (q->seq == seq) {
uint64_t msc;
msc = ms_kernel_msc_to_crtc_msc(q->crtc, frame);
xorg_list_del(&q->list);
- q->handler(msc, (uint64_t) sec * 1000000 + usec, q->data);
+ q->handler(msc, ns / 1000, q->data);
free(q);
break;
}
}
}
+static void
+ms_drm_handler(int fd, uint32_t frame, uint32_t sec, uint32_t usec,
+ void *user_ptr)
+{
+ ms_drm_sequence_handler(fd, frame, ((uint64_t) sec * 1000000 + usec) *
1000, (uint32_t) (uintptr_t) user_ptr);
+}
+
Bool
ms_vblank_screen_init(ScreenPtr screen)
{
commit 8bd33a2db7337b2801fc630a57e36b6aeea219d9
Author: Keith Packard <kei...@keithp.com>
Date: Thu Jul 27 10:08:32 2017 -0700
xkb: Handle xkb formated string output safely (CVE-2017-13723)
Generating strings for XKB data used a single shared static buffer,
which offered several opportunities for errors. Use a ring of
resizable buffers instead, to avoid problems when strings end up
longer than anticipated.
Reviewed-by: Michal Srb <m...@suse.com>
Signed-off-by: Keith Packard <kei...@keithp.com>
Signed-off-by: Julien Cristau <jcris...@debian.org>
(cherry picked from commit 94f11ca5cf011ef123bd222cabeaef6f424d76ac)
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index ead2b1a..d2a2567 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -47,23 +47,27 @@
/***====================================================================***/
-#define BUFFER_SIZE 512
-
-static char textBuffer[BUFFER_SIZE];
-static int tbNext = 0;
+#define NUM_BUFFER 8
+static struct textBuffer {
+ int size;
+ char *buffer;
+} textBuffer[NUM_BUFFER];
+static int textBufferIndex;
static char *
tbGetBuffer(unsigned size)
{
- char *rtrn;
+ struct textBuffer *tb;
- if (size >= BUFFER_SIZE)
- return NULL;
- if ((BUFFER_SIZE - tbNext) <= size)
- tbNext = 0;
- rtrn = &textBuffer[tbNext];
- tbNext += size;
- return rtrn;
+ tb = &textBuffer[textBufferIndex];
+ textBufferIndex = (textBufferIndex + 1) % NUM_BUFFER;
+
+ if (size > tb->size) {
+ free(tb->buffer);
+ tb->buffer = xnfalloc(size);
+ tb->size = size;
+ }
+ return tb->buffer;
}
/***====================================================================***/
@@ -79,8 +83,6 @@ XkbAtomText(Atom atm, unsigned format)
int len;
len = strlen(atmstr) + 1;
- if (len > BUFFER_SIZE)
- len = BUFFER_SIZE - 2;
rtrn = tbGetBuffer(len);
strlcpy(rtrn, atmstr, len);
}
@@ -128,8 +130,6 @@ XkbVModIndexText(XkbDescPtr xkb, unsigned ndx, unsigned
format)
len = strlen(tmp) + 1;
if (format == XkbCFile)
len += 4;
- if (len >= BUFFER_SIZE)
- len = BUFFER_SIZE - 1;
rtrn = tbGetBuffer(len);
if (format == XkbCFile) {
strcpy(rtrn, "vmod_");
@@ -140,6 +140,8 @@ XkbVModIndexText(XkbDescPtr xkb, unsigned ndx, unsigned
format)
return rtrn;
}
+#define VMOD_BUFFER_SIZE 512
+
char *
XkbVModMaskText(XkbDescPtr xkb,
unsigned modMask, unsigned mask, unsigned format)
@@ -147,7 +149,7 @@ XkbVModMaskText(XkbDescPtr xkb,
register int i, bit;
int len;
char *mm, *rtrn;
- char *str, buf[BUFFER_SIZE];
+ char *str, buf[VMOD_BUFFER_SIZE];
if ((modMask == 0) && (mask == 0)) {
rtrn = tbGetBuffer(5);
@@ -173,7 +175,7 @@ XkbVModMaskText(XkbDescPtr xkb,
len = strlen(tmp) + 1 + (str == buf ? 0 : 1);
if (format == XkbCFile)
len += 4;
- if ((str - (buf + len)) <= BUFFER_SIZE) {
+ if ((str - (buf + len)) <= VMOD_BUFFER_SIZE) {
if (str != buf) {
if (format == XkbCFile)
*str++ = '|';
@@ -199,8 +201,6 @@ XkbVModMaskText(XkbDescPtr xkb,
len = 0;
if (str)
len += strlen(str) + (mm == NULL ? 0 : 1);
- if (len >= BUFFER_SIZE)
- len = BUFFER_SIZE - 1;
rtrn = tbGetBuffer(len + 1);
rtrn[0] = '\0';
commit 3094c4c6d879215923f2183ecd048b4f5429b182
Author: Michal Srb <m...@suse.com>
Date: Thu Jul 27 11:54:26 2017 +0200
xkb: Escape non-printable characters correctly.
XkbStringText escapes non-printable characters using octal numbers. Such
escape
sequence would be at most 5 characters long ("\0123"), so it reserves 5
bytes
in the buffer. Due to char->unsigned int conversion, it would print much
longer
string for negative numbers.
Reviewed-by: Keith Packard <kei...@keithp.com>
Signed-off-by: Julien Cristau <jcris...@debian.org>
(cherry picked from commit eaf1f72ed8994b708d94ec2de7b1a99f5c4a39b8)
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index ffbc546..ead2b1a 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -603,7 +603,7 @@ XkbStringText(char *str, unsigned format)
}
else {
*out++ = '0';
- sprintf(out, "%o", *in);
+ sprintf(out, "%o", (unsigned char) *in);
while (*out != '\0')
out++;
}
commit a510fb811100bc27f0bfafe5d073998551161819
Author: Michal Srb <m...@suse.com>
Date: Fri Jul 28 16:27:10 2017 +0200
Xext/shm: Validate shmseg resource id (CVE-2017-13721)
Otherwise it can belong to a non-existing client and abort X server with
FatalError "client not in use", or overwrite existing segment of another
existing client.
Signed-off-by: Julien Cristau <jcris...@debian.org>
(cherry picked from commit b95f25af141d33a65f6f821ea9c003f66a01e1f1)
diff --git a/Xext/shm.c b/Xext/shm.c
index 1b622e3..c98d4a0 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -1238,6 +1238,7 @@ ProcShmCreateSegment(ClientPtr client)
};
REQUEST_SIZE_MATCH(xShmCreateSegmentReq);
+ LEGAL_NEW_RESOURCE(stuff->shmseg, client);
if ((stuff->readOnly != xTrue) && (stuff->readOnly != xFalse)) {
client->errorValue = stuff->readOnly;
return BadValue;
commit 3cea13cc40e2421ebefcf2ee0eb949a7bc4e63fd
Author: Adam Jackson <a...@redhat.com>
Date: Fri Jun 16 15:44:47 2017 -0400
dmx: Remove some not-very-interesting debug prints
gcc/glibc think the snprintf in dmxExecOS() might truncate. Yes, it
might, and we also don't care. Just delete all this.
Signed-off-by: Adam Jackson <a...@redhat.com>
Acked-by: Keith Packard <kei...@keithp.com>
(cherry picked from commit d6db66811643d3762716f6b144a7358572216a4f)
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index 3d394c5..24bb875 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -532,63 +532,6 @@ dmxDisplayInit(DMXScreenInfo * dmxScreen)
dmxGetPixmapFormats(dmxScreen);
}
-/* If this doesn't compile, just add || defined(yoursystem) to the line
- * below. This information is to help with bug reports and is not
- * critical. */
-#if !defined(_POSIX_SOURCE)
-static const char *
-dmxExecOS(void)
-{
- return "";
-}
-#else
-#include <sys/utsname.h>
-static const char *
-dmxExecOS(void)
-{
- static char buffer[128];
- static int initialized = 0;
- struct utsname u;
-
- if (!initialized++) {
- memset(buffer, 0, sizeof(buffer));
- uname(&u);
- snprintf(buffer, sizeof(buffer) - 1, "%s %s %s",
- u.sysname, u.release, u.version);
- }
- return buffer;
-}
-#endif
-
-static const char *
-dmxBuildCompiler(void)
-{
- static char buffer[128];
- static int initialized = 0;
-
- if (!initialized++) {
- memset(buffer, 0, sizeof(buffer));
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) &&defined(__GNUC_PATCHLEVEL__)
- snprintf(buffer, sizeof(buffer) - 1, "gcc %d.%d.%d",
- __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#endif
- }
- return buffer;
-}
-
-static const char *
-dmxExecHost(void)
-{
- static char buffer[128];
- static int initialized = 0;
-
- if (!initialized++) {
- memset(buffer, 0, sizeof(buffer));
- XmuGetHostname(buffer, sizeof(buffer) - 1);
- }
- return buffer;
-}
-
static void dmxAddExtensions(Bool glxSupported)
{
const ExtensionModule dmxExtensions[] = {
@@ -641,12 +584,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char
*argv[])
SetVendorRelease(VENDOR_RELEASE);
SetVendorString(VENDOR_STRING);
- if (dmxGeneration == 1) {
- dmxLog(dmxInfo, "DMX Build OS: %s (%s)\n", OSNAME, OSVENDOR);
- dmxLog(dmxInfo, "DMX Build Compiler: %s\n", dmxBuildCompiler());
- dmxLog(dmxInfo, "DMX Execution OS: %s\n", dmxExecOS());
- dmxLog(dmxInfo, "DMX Execution Host: %s\n", dmxExecHost());
- }
dmxLog(dmxInfo, "MAXSCREENS: %d\n", MAXSCREENS);
for (i = 0; i < dmxNumScreens; i++) {
commit 320e48c9217a8bdcd07dc8ce4aebec043e4afa3c
Author: Adam Jackson <a...@redhat.com>
Date: Fri Jun 16 15:44:46 2017 -0400
dmx: Silence an unused-result warning
Modern glibc is very insistent that you care about whether write()
succeeds:
../hw/dmx/input/usb-keyboard.c: In function ‘kbdUSBCtrl’:
../hw/dmx/input/usb-keyboard.c:292:9: warning: ignoring return value of
‘write’, declared with attribute warn_unused_result [-Wunused-result]
write(priv->fd, &event, sizeof(event));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Adam Jackson <a...@redhat.com>
Reviewed-by: Keith Packard <kei...@keithp.com>
(cherry picked from commit 17ad6e5d5616039021455bc821d6ee2497f7ebde)
diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c
index e41ad40..b26c822 100644
--- a/hw/dmx/input/usb-keyboard.c
+++ b/hw/dmx/input/usb-keyboard.c
@@ -289,7 +289,8 @@ kbdUSBCtrl(DevicePtr pDev, KeybdCtrl * ctrl)
led = i;
event.code = led;
event.value = ! !(ctrl->leds & (1 << led));
- write(priv->fd, &event, sizeof(event));
+ if (write(priv->fd, &event, sizeof(event)) != sizeof(event))
+ DebugF("Failed to set LEDs!\n");
}
}
commit c5d409a292008c4219c77a1bdb7621eb0ac42991
Author: Jon TURNEY <jon.tur...@dronecode.org.uk>
Date: Mon Jun 26 14:54:04 2017 +0100
Move statically linked xorgxkb files from dixmods to a separate directory
[ajax: Fixed test/Makefile.am as well]
Reviewed-by: Adam Jackson <a...@redhat.com>
(cherry picked from commit fbdd73fac68383c93f6f5c6a7615860503039999)
diff --git a/configure.ac b/configure.ac
index e9167e4..e078f12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2647,6 +2647,7 @@ hw/xfree86/shadowfb/Makefile
hw/xfree86/vbe/Makefile
hw/xfree86/vgahw/Makefile
hw/xfree86/x86emu/Makefile
+hw/xfree86/xkb/Makefile
hw/xfree86/utils/Makefile
hw/xfree86/utils/man/Makefile
hw/xfree86/utils/cvt/Makefile
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 85bd0be..b876b79 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -36,13 +36,13 @@ endif
SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods \
+ $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \
fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \
$(GLAMOR_EGL_SUBDIR) drivers
DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
parser ramdac shadowfb vbe vgahw \
- loader dixmods dri dri2 exa modes \
+ loader dixmods xkb dri dri2 exa modes \
utils doc man glamor_egl drivers
bin_PROGRAMS = Xorg
@@ -66,7 +66,7 @@ LOCAL_LIBS = \
ddc/libddc.la \
i2c/libi2c.la \
$(XORG_LIBS) \
- dixmods/libxorgxkb.la \
+ xkb/libxorgxkb.la \
$(DRI_LIB) \
$(DRI2_LIB) \
$(DRI3_LIB) \
@@ -148,5 +148,5 @@ i2c/libi2c.la:
dixmods/libdixmods.la:
$(AM_V_at)cd dixmods && $(MAKE) libdixmods.la
-dixmods/libxorgxkb.la:
- $(AM_V_at)cd dixmods && $(MAKE) libxorgxkb.la
+xkb/libxorgxkb.la:
+ $(AM_V_at)cd xkb && $(MAKE) libxorgxkb.la
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index d534c78..856659f 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la
+noinst_LTLIBRARIES = libdixmods.la
if GLX
GLXMODS = libglx.la
@@ -46,5 +46,3 @@ libshadow_la_SOURCES = shmodule.c
libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
libdixmods_la_CFLAGS = $(AM_CFLAGS)
-
-libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/dixmods/xkbKillSrv.c
deleted file mode 100644
index 79cf081..0000000
--- a/hw/xfree86/dixmods/xkbKillSrv.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
