COPYING | 24 ChangeLog | 8995 +++++++++++++++++++++-- Xext/dpms.c | 10 Xext/dpmsstubs.c | 10 Xext/panoramiX.c | 2 Xext/panoramiX.h | 2 Xext/panoramiXprocs.c | 16 Xext/saver.c | 16 Xext/security.c | 5 Xext/shm.c | 6 Xext/sync.c | 2 Xext/syncsrv.h | 8 Xext/xres.c | 12 Xext/xvdisp.c | 106 Xext/xvdix.h | 45 Xext/xvmain.c | 164 Xi/exevents.c | 5 composite/compalloc.c | 8 composite/compext.c | 7 composite/compinit.c | 25 composite/compint.h | 3 composite/compoverlay.c | 4 composite/compwindow.c | 7 config/config.c | 161 config/udev.c | 47 configure.ac | 117 dbe/dbe.c | 16 dbe/dbestruct.h | 12 dbe/midbe.c | 14 dbe/midbe.h | 8 debian/changelog | 35 debian/control | 14 debian/patches/09_Xserver-man-iglx.diff | 16 debian/patches/config-add-no-removal.patch | 13 debian/patches/drm_device_keep_trying.patch | 30 debian/patches/ppc64el-endian-fix.patch | 34 debian/patches/series | 4 debian/patches/xmir.patch | 63 debian/serverminver | 4 debian/xserver-xorg-core.install | 2 devbook.am | 10 dix/atom.c | 8 dix/colormap.c | 34 dix/cursor.c | 8 dix/devices.c | 61 dix/dispatch.c | 74 dix/dispatch.h | 2 dix/dixfonts.c | 6 dix/dixutils.c | 12 dix/extension.c | 10 dix/gc.c | 25 dix/getevents.c | 28 dix/globals.c | 8 dix/glyphcurs.c | 8 dix/grabs.c | 16 dix/inpututils.c | 2 dix/main.c | 10 dix/pixmap.c | 18 dix/property.c | 8 dix/protocol.txt | 30 dix/region.c | 22 dix/registry.c | 94 dix/resource.c | 18 dix/selection.c | 10 dix/swaprep.c | 8 dix/swapreq.c | 8 dix/tables.c | 8 dix/window.c | 111 doc/Makefile.am | 2 doc/Xserver-spec.xml | 6 doc/filter-xmlto.sh | 21 dri3/dri3.c | 10 dri3/dri3.h | 2 exa/exa.c | 2 exa/exa.h | 8 exa/exa_accel.c | 20 exa/exa_glyphs.c | 8 exa/exa_priv.h | 19 exa/exa_render.c | 4 exa/exa_unaccel.c | 11 fb/Makefile.am | 2 fb/fb.h | 342 fb/fb24_32.c | 2 fb/fb24_32.h | 2 fb/fbbits.c | 12 fb/fbblt.c | 271 fb/fbbltone.c | 320 fb/fbcopy.c | 2 fb/fbfill.c | 84 fb/fbfillrect.c | 2 fb/fbgc.c | 85 fb/fbglyph.c | 10 fb/fbline.c | 4 fb/fboverlay.c | 7 fb/fboverlay.h | 6 fb/fbpict.c | 18 fb/fbpict.h | 4 fb/fbpixmap.c | 6 fb/fbpoint.c | 2 fb/fbpush.c | 4 fb/fbrop.h | 12 fb/fbscreen.c | 4 fb/fbseg.c | 22 fb/fbstipple.c | 264 fb/fbtile.c | 163 fb/fbutil.c | 308 fb/fbwindow.c | 4 fb/wfbrename.h | 25 glamor/Makefile.am | 16 glamor/glamor.c | 121 glamor/glamor.h | 27 glamor/glamor_copy.c | 747 + glamor/glamor_copyarea.c | 626 - glamor/glamor_copyplane.c | 75 glamor/glamor_copywindow.c | 56 glamor/glamor_core.c | 202 glamor/glamor_dash.c | 370 glamor/glamor_egl.c | 90 glamor/glamor_egl_stubs.c | 2 glamor/glamor_eglmodule.c | 1 glamor/glamor_fbo.c | 7 glamor/glamor_fill.c | 356 glamor/glamor_font.c | 7 glamor/glamor_glyphblt.c | 154 glamor/glamor_glyphs.c | 96 glamor/glamor_gradient.c | 19 glamor/glamor_largepixmap.c | 109 glamor/glamor_lines.c | 187 glamor/glamor_picture.c | 20 glamor/glamor_pixmap.c | 579 - glamor/glamor_points.c | 3 glamor/glamor_polylines.c | 136 glamor/glamor_prepare.c | 271 glamor/glamor_prepare.h | 52 glamor/glamor_priv.h | 322 glamor/glamor_program.c | 56 glamor/glamor_program.h | 6 glamor/glamor_render.c | 89 glamor/glamor_segment.c | 44 glamor/glamor_segs.c | 188 glamor/glamor_spans.c | 3 glamor/glamor_sync.c | 117 glamor/glamor_text.c | 6 glamor/glamor_tile.c | 293 glamor/glamor_transfer.c | 48 glamor/glamor_transform.c | 72 glamor/glamor_trapezoid.c | 1718 ---- glamor/glamor_utils.c | 79 glamor/glamor_utils.h | 218 glamor/glamor_xv.c | 311 glx/glxbyteorder.h | 8 glx/glxcmds.c | 105 glx/glxdri2.c | 6 glx/glxdriswrast.c | 2 glx/glxext.c | 8 glx/glxext.h | 1 glx/glxscreens.c | 2 glx/glxscreens.h | 2 glx/indirect_dispatch.c | 6 glx/indirect_dispatch.h | 6 glx/indirect_dispatch_swap.c | 6 glx/indirect_program.c | 6 glx/indirect_reqsize.c | 6 glx/indirect_reqsize.h | 6 glx/indirect_size.h | 6 glx/indirect_size_get.c | 6 glx/indirect_size_get.h | 6 glx/indirect_table.c | 6 glx/indirect_table.h | 6 glx/indirect_texture_compression.c | 6 glx/indirect_util.c | 8 glx/indirect_util.h | 6 glx/rensize.c | 4 hw/dmx/config/Canvas.c | 2 hw/dmx/config/dmxprint.c | 2 hw/dmx/dmxgc.c | 12 hw/dmx/dmxgcops.c | 8 hw/dmx/dmxpict.h | 2 hw/dmx/dmxwindow.c | 4 hw/dmx/dmxwindow.h | 3 hw/dmx/glxProxy/glxcmds.c | 16 hw/dmx/glxProxy/glxsingle.c | 4 hw/dmx/glxProxy/glxvendor.c | 4 hw/dmx/input/ChkNotMaskEv.c | 2 hw/dmx/input/lnx-keyboard.c | 20 hw/dmx/input/lnx-ms.c | 2 hw/kdrive/Xkdrive.man | 7 hw/kdrive/ephyr/Makefile.am | 6 hw/kdrive/ephyr/ephyr.c | 56 hw/kdrive/ephyr/ephyr.h | 23 hw/kdrive/ephyr/ephyr_glamor_glx.c | 24 hw/kdrive/ephyr/ephyr_glamor_xv.c | 161 hw/kdrive/ephyr/ephyrcursor.c | 262 hw/kdrive/ephyr/ephyrdri.c | 4 hw/kdrive/ephyr/ephyrdri.h | 4 hw/kdrive/ephyr/ephyrdriext.c | 4 hw/kdrive/ephyr/ephyrdriext.h | 4 hw/kdrive/ephyr/ephyrglxext.c | 4 hw/kdrive/ephyr/ephyrglxext.h | 4 hw/kdrive/ephyr/ephyrhostglx.c | 4 hw/kdrive/ephyr/ephyrhostglx.h | 4 hw/kdrive/ephyr/ephyrinit.c | 122 hw/kdrive/ephyr/ephyrlog.h | 4 hw/kdrive/ephyr/ephyrvideo.c | 38 hw/kdrive/ephyr/hostx.c | 252 hw/kdrive/ephyr/hostx.h | 20 hw/kdrive/ephyr/man/Xephyr.man | 3 hw/kdrive/ephyr/os.c | 4 hw/kdrive/src/kdrive.c | 31 hw/kdrive/src/kdrive.h | 16 hw/kdrive/src/kxv.c | 359 hw/kdrive/src/kxv.h | 39 hw/vfb/InitOutput.c | 55 hw/xfree86/Makefile.am | 6 hw/xfree86/Xorg.sh.in | 4 hw/xfree86/common/Makefile.am | 4 hw/xfree86/common/compiler.h | 663 - hw/xfree86/common/xf86.h | 8 hw/xfree86/common/xf86AutoConfig.c | 9 hw/xfree86/common/xf86Bus.c | 2 hw/xfree86/common/xf86Config.c | 69 hw/xfree86/common/xf86Configure.c | 5 hw/xfree86/common/xf86Cursor.c | 19 hw/xfree86/common/xf86Events.c | 1 hw/xfree86/common/xf86Globals.c | 1 hw/xfree86/common/xf86Init.c | 25 hw/xfree86/common/xf86Mode.c | 8 hw/xfree86/common/xf86Module.h | 4 hw/xfree86/common/xf86PciInfo.h | 2 hw/xfree86/common/xf86Privstr.h | 8 hw/xfree86/common/xf86RandR.c | 32 hw/xfree86/common/xf86VGAarbiterPriv.h | 10 hw/xfree86/common/xf86Xinput.c | 16 hw/xfree86/common/xf86Xinput.h | 11 hw/xfree86/common/xf86cmap.c | 50 hw/xfree86/common/xf86fbman.c | 6 hw/xfree86/common/xf86pciBus.c | 39 hw/xfree86/common/xf86platformBus.c | 65 hw/xfree86/common/xf86platformBus.h | 104 hw/xfree86/common/xf86str.h | 4 hw/xfree86/common/xf86vmode.c | 8 hw/xfree86/common/xf86xv.c | 302 hw/xfree86/common/xf86xv.h | 41 hw/xfree86/common/xf86xvmc.h | 10 hw/xfree86/common/xf86xvpriv.h | 2 hw/xfree86/ddc/ddc.c | 68 hw/xfree86/ddc/edid.h | 8 hw/xfree86/ddc/print_edid.c | 2 hw/xfree86/ddc/xf86DDC.h | 11 hw/xfree86/dixmods/extmod/modinit.h | 80 hw/xfree86/dixmods/xkbKillSrv.c | 16 hw/xfree86/dixmods/xkbVT.c | 16 hw/xfree86/doc/README.DRIcomp | 3 hw/xfree86/doc/Registry | 1 hw/xfree86/doc/ddxDesign.xml | 35 hw/xfree86/dri/dri.c | 81 hw/xfree86/dri/dri.h | 11 hw/xfree86/dri/sarea.h | 10 hw/xfree86/dri2/Makefile.am | 2 hw/xfree86/dri2/dri2.c | 69 hw/xfree86/dri2/pci_ids/Makefile.am | 11 hw/xfree86/dri2/pci_ids/i810_pci_ids.h | 4 hw/xfree86/dri2/pci_ids/i915_pci_ids.h | 15 hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 115 hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 80 hw/xfree86/dri2/pci_ids/r200_pci_ids.h | 24 hw/xfree86/dri2/pci_ids/r300_pci_ids.h | 227 hw/xfree86/dri2/pci_ids/r600_pci_ids.h | 327 hw/xfree86/dri2/pci_ids/radeon_pci_ids.h | 23 hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h | 157 hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h | 1 hw/xfree86/drivers/Makefile.am | 5 hw/xfree86/drivers/modesetting/Makefile.am | 69 hw/xfree86/drivers/modesetting/dri2.c | 861 ++ hw/xfree86/drivers/modesetting/driver.c | 1245 +++ hw/xfree86/drivers/modesetting/driver.h | 137 hw/xfree86/drivers/modesetting/drmmode_display.c | 1822 ++++ hw/xfree86/drivers/modesetting/drmmode_display.h | 174 hw/xfree86/drivers/modesetting/dumb_bo.c | 134 hw/xfree86/drivers/modesetting/dumb_bo.h | 45 hw/xfree86/drivers/modesetting/modesetting.man | 57 hw/xfree86/drivers/modesetting/present.c | 228 hw/xfree86/drivers/modesetting/vblank.c | 402 + hw/xfree86/fbdevhw/fbdevhw.c | 2 hw/xfree86/glamor_egl/Makefile.am | 3 hw/xfree86/glamor_egl/glamor_xf86_xv.c | 185 hw/xfree86/i2c/Makefile.am | 36 hw/xfree86/i2c/bt829.c | 822 -- hw/xfree86/i2c/bt829.h | 103 hw/xfree86/i2c/bt829_module.c | 20 hw/xfree86/i2c/fi1236.c | 686 - hw/xfree86/i2c/fi1236.h | 113 hw/xfree86/i2c/fi1236_module.c | 24 hw/xfree86/i2c/msp3430.c | 779 - hw/xfree86/i2c/msp3430.h | 116 hw/xfree86/i2c/msp3430_module.c | 24 hw/xfree86/i2c/tda8425.c | 83 hw/xfree86/i2c/tda8425.h | 44 hw/xfree86/i2c/tda8425_module.c | 24 hw/xfree86/i2c/tda9850.c | 136 hw/xfree86/i2c/tda9850.h | 43 hw/xfree86/i2c/tda9850_module.c | 24 hw/xfree86/i2c/tda9885.c | 100 hw/xfree86/i2c/tda9885.h | 63 hw/xfree86/i2c/tda9885_module.c | 24 hw/xfree86/i2c/uda1380.c | 196 hw/xfree86/i2c/uda1380.h | 81 hw/xfree86/i2c/uda1380_module.c | 24 hw/xfree86/i2c/xf86i2c.c | 40 hw/xfree86/i2c/xf86i2c.h | 2 hw/xfree86/int10/generic.c | 52 hw/xfree86/loader/loader.c | 23 hw/xfree86/loader/loadmod.c | 164 hw/xfree86/man/Xorg.wrap.man | 2 hw/xfree86/man/xorg.conf.man | 22 hw/xfree86/modes/Makefile.am | 1 hw/xfree86/modes/xf86Crtc.c | 4 hw/xfree86/modes/xf86Crtc.h | 10 hw/xfree86/modes/xf86DisplayIDModes.c | 444 - hw/xfree86/modes/xf86RandR12.c | 4 hw/xfree86/modes/xf86Rotate.c | 21 hw/xfree86/modes/xf86cvt.c | 4 hw/xfree86/modes/xf86gtf.c | 10 hw/xfree86/os-support/bsd/Makefile.am | 4 hw/xfree86/os-support/bsd/alpha_video.c | 466 - hw/xfree86/os-support/bsd/arm_video.c | 451 - hw/xfree86/os-support/bsd/bsd_apm.c | 2 hw/xfree86/os-support/bsd/bsd_axp.c | 71 hw/xfree86/os-support/bsd/bsd_bell.c | 20 hw/xfree86/os-support/bsd/bsd_ev56.c | 24 hw/xfree86/os-support/bsd/bsd_init.c | 24 hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 16 hw/xfree86/os-support/bsd/i386_video.c | 584 - hw/xfree86/os-support/bsd/ppc_video.c | 76 hw/xfree86/os-support/bsd/sparc64_video.c | 60 hw/xfree86/os-support/bus/xf86Pci.h | 21 hw/xfree86/os-support/hurd/Makefile.am | 2 hw/xfree86/os-support/hurd/hurd_mmap.c | 94 hw/xfree86/os-support/hurd/hurd_video.c | 69 hw/xfree86/os-support/linux/Makefile.am | 10 hw/xfree86/os-support/linux/int10/linux.c | 19 hw/xfree86/os-support/linux/lnx_agp.c | 4 hw/xfree86/os-support/linux/lnx_axp.c | 103 hw/xfree86/os-support/linux/lnx_ev56.c | 24 hw/xfree86/os-support/linux/lnx_init.c | 6 hw/xfree86/os-support/linux/lnx_kmod.c | 2 hw/xfree86/os-support/linux/lnx_platform.c | 52 hw/xfree86/os-support/linux/lnx_video.c | 688 - hw/xfree86/os-support/linux/systemd-logind.c | 2 hw/xfree86/os-support/misc/SlowBcopy.c | 8 hw/xfree86/os-support/shared/bios_mmap.c | 135 hw/xfree86/os-support/shared/ioperm_noop.c | 2 hw/xfree86/os-support/shared/sigio.c | 6 hw/xfree86/os-support/shared/vidmem.c | 205 hw/xfree86/os-support/shared/xf86Axp.c | 60 hw/xfree86/os-support/shared/xf86Axp.h | 33 hw/xfree86/os-support/solaris/sun_apm.c | 2 hw/xfree86/os-support/solaris/sun_init.c | 33 hw/xfree86/os-support/solaris/sun_vid.c | 140 hw/xfree86/os-support/stub/Makefile.am | 1 hw/xfree86/os-support/stub/stub_bios.c | 12 hw/xfree86/os-support/xf86OSpriv.h | 13 hw/xfree86/os-support/xf86_OSlib.h | 39 hw/xfree86/os-support/xf86_OSproc.h | 54 hw/xfree86/parser/Configint.h | 18 hw/xfree86/parser/DRI.c | 8 hw/xfree86/parser/Device.c | 26 hw/xfree86/parser/Files.c | 14 hw/xfree86/parser/Flags.c | 16 hw/xfree86/parser/Input.c | 16 hw/xfree86/parser/Layout.c | 16 hw/xfree86/parser/Module.c | 16 hw/xfree86/parser/Monitor.c | 18 hw/xfree86/parser/Pointer.c | 16 hw/xfree86/parser/Screen.c | 16 hw/xfree86/parser/Vendor.c | 16 hw/xfree86/parser/Video.c | 16 hw/xfree86/parser/read.c | 22 hw/xfree86/parser/scan.c | 36 hw/xfree86/parser/write.c | 14 hw/xfree86/parser/xf86Optrec.h | 18 hw/xfree86/parser/xf86Parser.h | 19 hw/xfree86/parser/xf86tokens.h | 19 hw/xfree86/ramdac/IBM.c | 4 hw/xfree86/ramdac/TI.c | 2 hw/xfree86/ramdac/xf86Cursor.c | 6 hw/xfree86/ramdac/xf86HWCurs.c | 2 hw/xfree86/ramdac/xf86RamDac.h | 4 hw/xfree86/ramdac/xf86RamDacCmap.c | 1 hw/xfree86/sdksyms.sh | 3 hw/xfree86/shadowfb/shadowfb.h | 2 hw/xfree86/utils/gtf/gtf.c | 26 hw/xfree86/vbe/vbe.c | 4 hw/xfree86/vbe/vbe.h | 4 hw/xfree86/vgahw/Makefile.am | 2 hw/xfree86/vgahw/vgaCmap.c | 276 hw/xfree86/vgahw/vgaHW.c | 8 hw/xfree86/vgahw/vgaHW.h | 2 hw/xfree86/x86emu/debug.c | 4 hw/xfree86/x86emu/ops.c | 22 hw/xfree86/x86emu/prim_ops.c | 70 hw/xfree86/x86emu/sys.c | 6 hw/xfree86/x86emu/x86emu/regs.h | 10 hw/xfree86/x86emu/x86emu/x86emui.h | 2 hw/xfree86/xorg-wrapper.c | 10 hw/xnest/Color.c | 2 hw/xnest/GC.c | 56 hw/xnest/Keyboard.c | 9 hw/xnest/Window.c | 4 hw/xnest/XNGC.h | 1 hw/xnest/XNWindow.h | 3 hw/xnest/Xnest.h | 2 hw/xquartz/darwin.c | 8 hw/xquartz/darwinEvents.c | 4 hw/xquartz/xpr/dri.c | 72 hw/xquartz/xpr/dri.h | 12 hw/xwayland/Makefile.am | 1 hw/xwayland/xwayland-glamor.c | 6 hw/xwayland/xwayland-input.c | 58 hw/xwayland/xwayland.c | 51 hw/xwayland/xwayland.h | 2 hw/xwin/InitInput.c | 3 hw/xwin/InitOutput.c | 58 hw/xwin/Makefile.am | 69 hw/xwin/XWin.rc | 1 hw/xwin/ddraw.h | 6 hw/xwin/glx/.gitignore | 5 hw/xwin/glx/gen_gl_wrappers.py | 13 hw/xwin/glx/glshim.c | 3 hw/xwin/glx/glwindows.h | 5 hw/xwin/glx/indirect.c | 19 hw/xwin/glx/winpriv.c | 2 hw/xwin/man/XWin.man | 10 hw/xwin/win.h | 186 hw/xwin/winSetAppUserModelID.c | 2 hw/xwin/winclip.c | 42 hw/xwin/winclipboard.h | 126 hw/xwin/winclipboard/Makefile.am | 25 hw/xwin/winclipboard/debug.c | 52 hw/xwin/winclipboard/internal.h | 117 hw/xwin/winclipboard/textconv.c | 151 hw/xwin/winclipboard/thread.c | 504 + hw/xwin/winclipboard/winclipboard.h | 38 hw/xwin/winclipboard/wndproc.c | 596 + hw/xwin/winclipboard/xevents.c | 864 ++ hw/xwin/winclipboard/xwinclip.c | 134 hw/xwin/winclipboard/xwinclip.man | 64 hw/xwin/winclipboardinit.c | 150 hw/xwin/winclipboardtextconv.c | 147 hw/xwin/winclipboardthread.c | 467 - hw/xwin/winclipboardwndproc.c | 529 - hw/xwin/winclipboardwrappers.c | 232 hw/xwin/winclipboardxevents.c | 703 - hw/xwin/wincmap.c | 2 hw/xwin/winconfig.c | 10 hw/xwin/winconfig.h | 1 hw/xwin/wincreatewnd.c | 26 hw/xwin/wincursor.c | 10 hw/xwin/windialogs.c | 19 hw/xwin/windisplay.c | 64 hw/xwin/windisplay.h | 34 hw/xwin/winengine.c | 23 hw/xwin/winfillsp.c | 842 -- hw/xwin/winfont.c | 82 hw/xwin/wingc.c | 235 hw/xwin/wingetsp.c | 171 hw/xwin/winglobals.c | 13 hw/xwin/winglobals.h | 4 hw/xwin/winlayouts.h | 2 hw/xwin/winmisc.c | 63 hw/xwin/winmsg.h | 2 hw/xwin/winmsgwindow.c | 5 hw/xwin/winmultiwindowicons.c | 4 hw/xwin/winmultiwindowshape.c | 2 hw/xwin/winmultiwindowwindow.c | 20 hw/xwin/winmultiwindowwm.c | 9 hw/xwin/winmultiwindowwndproc.c | 4 hw/xwin/winnativegdi.c | 491 - hw/xwin/winpfbdd.c | 620 - hw/xwin/winpixmap.c | 223 hw/xwin/winpolyline.c | 53 hw/xwin/winprefs.c | 10 hw/xwin/winprefslex.l | 2 hw/xwin/winprefsyacc.y | 11 hw/xwin/winprocarg.c | 27 hw/xwin/winresource.h | 1 hw/xwin/winrop.c | 142 hw/xwin/winscrinit.c | 143 hw/xwin/winsetsp.c | 175 hw/xwin/winshaddd.c | 8 hw/xwin/winshadddnl.c | 10 hw/xwin/winshadgdi.c | 10 hw/xwin/wintrayicon.c | 19 hw/xwin/winwin32rootlesswndproc.c | 2 hw/xwin/winwindow.c | 219 hw/xwin/winwindowswm.c | 2 hw/xwin/winwndproc.c | 29 include/callback.h | 18 include/closure.h | 8 include/colormap.h | 24 include/colormapst.h | 8 include/cursor.h | 12 include/cursorstr.h | 10 include/dbus-core.h | 2 include/dix-config.h.in | 22 include/dix.h | 83 include/dixfont.h | 10 include/dixgrabs.h | 4 include/extension.h | 8 include/extnsionst.h | 10 include/gc.h | 12 include/gcstruct.h | 63 include/hotplug.h | 69 include/input.h | 19 include/inputstr.h | 14 include/list.h | 2 include/misc.h | 18 include/miscstruct.h | 8 include/os.h | 100 include/pixmap.h | 28 include/pixmapstr.h | 11 include/property.h | 44 include/propertyst.h | 10 include/region.h | 8 include/regionstr.h | 4 include/registry.h | 40 include/resource.h | 84 include/rgb.h | 8 include/screenint.h | 8 include/scrnintstr.h | 134 include/selection.h | 10 include/servermd.h | 296 include/site.h | 14 include/window.h | 28 include/windowstr.h | 11 include/xkbfile.h | 18 include/xkbsrv.h | 34 include/xkbstr.h | 24 include/xorg-config.h.in | 6 include/xorg-server.h.in | 7 include/xsha1.h | 2 man/Xserver.man | 9 mi/Makefile.am | 11 mi/mi.h | 149 mi/miarc.c | 255 mi/mibitblt.c | 48 mi/micmap.c | 44 mi/micoord.h | 20 mi/micopy.c | 8 mi/micursor.c | 68 mi/midash.c | 9 mi/midispcur.c | 4 mi/miexpose.c | 127 mi/mifillarc.c | 151 mi/mifillarc.h | 9 mi/mifillrct.c | 10 mi/mifpoly.h | 50 mi/mifpolycon.c | 249 mi/migc.c | 45 mi/miglblt.c | 8 mi/miinitext.c | 8 mi/mioverlay.c | 72 mi/mipointer.c | 23 mi/mipoly.c | 627 + mi/mipoly.h | 22 mi/mipolycon.c | 235 mi/mipolygen.c | 213 mi/mipolypnt.c | 8 mi/mipolyrect.c | 8 mi/mipolyseg.c | 10 mi/mipolytext.c | 8 mi/mipolyutil.c | 369 mi/mipushpxl.c | 8 mi/miscrinit.c | 5 mi/mispans.c | 526 - mi/mispans.h | 87 mi/misprite.c | 4 mi/mistruct.h | 8 mi/mivaltree.c | 72 mi/miwideline.c | 546 + mi/miwideline.h | 26 mi/miwindow.c | 63 mi/mizerarc.c | 2 mi/mizerclip.c | 8 mi/mizerline.c | 28 miext/damage/damage.c | 2 miext/rootless/rootless.h | 2 miext/rootless/rootlessGC.c | 2 miext/rootless/rootlessValTree.c | 97 miext/rootless/rootlessWindow.c | 6 miext/shadow/shadow.c | 54 miext/shadow/shadow.h | 6 miext/shadow/shrotate.c | 2 miext/sync/misyncfd.c | 4 os/WaitFor.c | 59 os/access.c | 91 os/busfault.c | 2 os/connection.c | 18 os/io.c | 17 os/log.c | 19 os/oscolor.c | 1562 ++- os/osdep.h | 8 os/osinit.c | 20 os/utils.c | 78 os/xdmcp.c | 2 os/xsha1.c | 25 present/present.c | 47 present/present.h | 1 present/present_event.c | 4 present/present_priv.h | 2 present/present_screen.c | 1 randr/randrstr.h | 20 randr/rrcrtc.c | 74 randr/rroutput.c | 7 randr/rrpointer.c | 11 randr/rrprovider.c | 2 randr/rrscreen.c | 22 randr/rrtransform.c | 2 randr/rrtransform.h | 2 randr/rrxinerama.c | 14 record/record.c | 20 render/animcur.c | 2 render/glyph.c | 2 render/glyphstr.h | 2 render/mipict.c | 34 render/mipict.h | 2 render/mirect.c | 2 render/picture.c | 129 render/picture.h | 8 render/picturestr.h | 6 render/render.c | 4 test/Makefile.am | 5 test/list.c | 24 test/signal-logging.c | 7 test/xi2/protocol-common.c | 26 xfixes/cursor.c | 22 xfixes/region.c | 27 xkb/XKBAlloc.c | 16 xkb/XKBGAlloc.c | 16 xkb/XKBMAlloc.c | 18 xkb/XKBMisc.c | 16 xkb/ddxBeep.c | 16 xkb/ddxCtrls.c | 16 xkb/ddxKillSrv.c | 16 xkb/ddxLEDs.c | 16 xkb/ddxLoad.c | 16 xkb/ddxVT.c | 16 xkb/maprules.c | 18 xkb/xkb.c | 118 xkb/xkbAccessX.c | 18 xkb/xkbActions.c | 16 xkb/xkbEvents.c | 25 xkb/xkbInit.c | 22 xkb/xkbLEDs.c | 44 xkb/xkbPrKeyEv.c | 16 xkb/xkbSwap.c | 16 xkb/xkbUtils.c | 16 xkb/xkbfmisc.c | 18 xkb/xkbgeom.h | 16 xkb/xkbout.c | 18 xkb/xkbtext.c | 18 xkb/xkmread.c | 18 662 files changed, 27671 insertions(+), 30232 deletions(-)
New commits: commit b8cabf567ccbf6a48e7f7bcb0abe863e81e30547 Author: Maarten Lankhorst <maarten.lankho...@ubuntu.com> Date: Thu Mar 12 13:26:40 2015 +0100 release to vivid diff --git a/debian/changelog b/debian/changelog index f05a7f5..071545d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -xorg-server (2:1.17.1-0ubuntu1) UNRELEASED; urgency=medium +xorg-server (2:1.17.1-0ubuntu1) vivid; urgency=medium * Merge with 1.17 branch. - ABI bumped. - Patches refreshed. - Modesetting moved to xorg-server. - -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 04 Nov 2014 16:14:20 +0100 + -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 12 Mar 2015 13:26:04 +0100 xorg-server (2:1.17.1-1) UNRELEASED; urgency=medium commit 4ffaa00df4f7a4356aa56f405352bceac747d946 Author: Maarten Lankhorst <maarten.lankho...@ubuntu.com> Date: Mon Mar 9 11:34:07 2015 +0100 Set a version for replacing modesetting, fixing some lintian warnings. diff --git a/debian/control b/debian/control index 71b16cc..908135f 100644 --- a/debian/control +++ b/debian/control @@ -143,9 +143,9 @@ Breaks: xserver-xorg-video-vga (<= 1:4.1.0-8), libgl1-mesa-dri (<< 7.10.2-4), libgl1-mesa-dri-experimental (<< 7.10.2-4), - xserver-xorg-video-modesetting, + xserver-xorg-video-modesetting (<< 0.10), Replaces: - xserver-xorg-video-modesetting, + xserver-xorg-video-modesetting (<< 0.10), Conflicts: xserver-xorg-input-evtouch, Provides: commit 844389319f72ed964479b09c353b2f8f73a9dde8 Author: Maarten Lankhorst <maarten.lankho...@ubuntu.com> Date: Wed Feb 11 11:17:51 2015 +0100 bump version to 1.17.1 diff --git a/ChangeLog b/ChangeLog index e613918..3983221 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,739 +1,1240 @@ -commit 27017380f96d7cec79ce8d618ea0ec389fa716a9 -Merge: 91651e7 9b037af -Author: Maarten Lankhorst <maarten.lankho...@ubuntu.com> -Date: Thu Dec 11 15:47:29 2014 +0100 +commit 3b0d1ba2266d2780bfc111bab74885b90458eca4 +Author: Keith Packard <kei...@keithp.com> +Date: Tue Feb 10 14:43:34 2015 -0800 - Merge branch 'upstream-unstable' into upstream-experimental + Release 1.17.1 + + Signed-off-by: Keith Packard <kei...@keithp.com> -commit 91651e7c15892aa846fc406fbb13b37f094dd3f0 -Author: Michel Dänzer <michel.daen...@amd.com> -Date: Wed Dec 10 16:21:44 2014 +0900 +commit f160e722672dbb2b5215870b47bcc51461d96ff1 +Author: Olivier Fourdan <ofour...@redhat.com> +Date: Fri Jan 16 08:44:45 2015 +0100 - glamor: Reinstate glamor_(egl_)destroy_textured_pixmap + xkb: Check strings length against request size - They are part of the ABI. + Ensure that the given strings length in an XkbSetGeometry request remain + within the limits of the size of the request. - Signed-off-by: Michel Dänzer <michel.daen...@amd.com> - Reviewed-by: Keith Packard <kei...@keithp.com> - Signed-off-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Olivier Fourdan <ofour...@redhat.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 20079c36cf7d377938ca5478447d8b9045cb7d43) -commit c1455f76c6b1aa4ecaacb2221a687244285aa44b -Author: Neil Roberts <n...@linux.intel.com> -Date: Mon Dec 1 16:06:17 2014 -0500 +commit 29be310c303914090298ddda93a5bd5d00a94945 +Author: Olivier Fourdan <ofour...@redhat.com> +Date: Fri Jan 16 20:08:59 2015 +0100 - glx: Add implementation of __GLXContext->loseCurrent for direct ctxts + xkb: Don't swap XkbSetGeometry data in the input buffer - This adds a dummy implementation for the loseCurrent function in - __GLXContext for direct contexts which just returns GL_TRUE. Without - this then the X server can crash if receives a MakeCurrent message for - a direct context because it will attempt to call loseCurrent when - cleaning up the client in the callback for ClientStateGone. + The XkbSetGeometry request embeds data which needs to be swapped when the + server and the client have different endianess. - [ajax: added assumed s-o-b line] + _XkbSetGeometry() invokes functions that swap these data directly in the + input buffer. - Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86531 - Reviewed-by: Adam Jackson <a...@redhat.com> - Signed-off-by: Neil Roberts <n...@linux.intel.com> - Signed-off-by: Keith Packard <kei...@keithp.com> - -commit 9b037af0410bb1f63d370d8b8be06135de7af600 -Author: Julien Cristau <jcris...@debian.org> -Date: Tue Dec 9 20:55:02 2014 +0100 - - Bump to 1.16.2.901 + However, ProcXkbSetGeometry() may call _XkbSetGeometry() more than once + (if there is more than one keyboard), thus causing on swapped clients the + same data to be swapped twice in memory, further causing a server crash + because the strings lengths on the second time are way off bounds. - Signed-off-by: Julien Cristau <jcris...@debian.org> + To allow _XkbSetGeometry() to run reliably more than once with swapped + clients, do not swap the data in the buffer, use variables instead. + + Signed-off-by: Olivier Fourdan <ofour...@redhat.com> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + (cherry picked from commit 81c90dc8f0aae3b65730409b1b615b5fa7280ebd) -commit f7ff55a374d91f8b513159809ed41c3e029a6074 +commit 28f6427aec1f5a1982e1c01eff45af0d401bf659 Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 09:31:00 2014 -0800 +Date: Mon Feb 2 07:41:06 2015 +0100 - dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] - - GetHosts saves the pointer to allocated memory in *data, and then - wants to bounds-check writes to that region, but was mistakenly using - a bare 'data' instead of '*data'. Also, data is declared as void **, - so we need a cast to turn it into a byte pointer so we can actually do - pointer comparisons. + Update to version 1.17.0 Signed-off-by: Keith Packard <kei...@keithp.com> - Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> - Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> - (cherry picked from commit 1559a94395258fd73e369f1a2c98a44bfe21a486) - Signed-off-by: Julien Cristau <jcris...@debian.org> -commit 8e7c4380a56ab05412f630e9b6e02580cb04a804 -Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 09:30:59 2014 -0800 +commit 697b696e5e24d0679f133183a3bb0852025377c2 +Author: Dave Airlie <airl...@redhat.com> +Date: Fri Jan 30 09:59:49 2015 +1000 - Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] + config/udev: Respect seat assignments when assigned devices - The 'n' parameter must be surrounded by parens in both places to - prevent precedence from mis-computing things. + Jonathan Dieter posted a few patches to do this inside the Xorg + server but it makes no sense to do it there, just have the code + we use to probe the device list at startup check seat assignments + using the same code we check at hotplug time. + Bugilla: https://bugzilla.redhat.com/show_bug.cgi?id=1183654 + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Acked-by: Hans de Goede <hdego...@redhat.com> + Tested-by: Jonathan Dieter <jdie...@lesbg.com> + Signed-off-by: Dave Airlie <airl...@redhat.com> Signed-off-by: Keith Packard <kei...@keithp.com> - Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> - Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> - (cherry picked from commit 9802a0162f738de03585ca3f3b8a8266494f7d45) - Signed-off-by: Julien Cristau <jcris...@debian.org> -commit 1069ca99298bf1e85e001bfde90b00a42afdb5d8 -Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 09:30:58 2014 -0800 +commit df1b401f57ad4b4925bad66684445b476562f26f +Author: Dave Airlie <airl...@redhat.com> +Date: Wed Jan 7 09:19:27 2015 +1000 - glx: Can't mix declarations and code in X.org sources [CVE-2014-8098 pt. 9] + randr: attempt to fix primary on slave output (v2) - We're using compiler compatibility settings which generate warnings - when a variable is declared after the first statement. + If the user wants to set one of the slave devices as + the primary output, we shouldn't fail to do so, + we were returning BadMatch which was tripping up + gnome-settings-daemon and bad things ensues. + + Fix all the places we use primaryOutput to work + out primaryCrtc and take it into a/c when slave + gpus are in use. + v2: review from Aaron, fix indent, unhide has_primary from + macro. I left the int vs Bool alone to be consistent with + code below, a future patch could fix both. + + Signed-off-by: Dave Airlie <airl...@redhat.com> + Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> Signed-off-by: Keith Packard <kei...@keithp.com> - Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> - Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> - (cherry picked from commit 61b17c0f10307e25e51e30e6fb1d3e3127f82d86) - Signed-off-by: Julien Cristau <jcris...@debian.org> -commit 044764b5c627d1a6e8ea1dd8cf741a26aeb4b2e7 -Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 09:30:57 2014 -0800 +commit 62fcd364ac8c71a2db1db84b17b17cade6832492 +Author: Adel Gadllah <adel.gadl...@gmail.com> +Date: Sat Jan 3 21:12:25 2015 +0100 - dbe: Call to DDX SwapBuffers requires address of int, not unsigned int [CVE-2014-8097 pt. 2] + dri2: Set vdpau driver name if ddx does not provide any driver name - When the local types used to walk the DBE request were changed, this - changed the type of the parameter passed to the DDX SwapBuffers API, - but there wasn't a matching change in the API definition. + Currently when the ddx does not set any driver name we set DRI2 driver but + not the VDPAU driver name. The result is that VDPAU drivers will not get found + by libvdpau when the modesetting driver is being used. - At this point, with the API frozen, I just stuck a new variable in - with the correct type. Because we've already bounds-checked nStuff to - be smaller than UINT32_MAX / sizeof(DbeSwapInfoRec), we know it will - fit in a signed int without overflow. + Just assume that the VDPAU driver matches the DRI2 driver name, this is true + for nouveau, r300, r600 and radeonsi i.e all VDPAU drivers currently supported + by mesa. - Signed-off-by: Keith Packard <kei...@keithp.com + Signed-off-by: Adel Gadllah <adel.gadl...@gmail.com> + Reviewed-by: Alex Deucher <alexander.deuc...@amd.com> Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> - Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> - (cherry picked from commit b20912c3d45cbbde3c443e6c3d9e189092fe65e1) - Signed-off-by: Julien Cristau <jcris...@debian.org> - -commit 6704bb0ed7a10dabe8ef3bb3adf8b8a7f29a78f0 -Merge: 8aa23f2 1559a94 -Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 11:47:11 2014 -0800 - - Merge remote-tracking branch 'alanc/master' - -commit 1559a94395258fd73e369f1a2c98a44bfe21a486 -Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 09:31:00 2014 -0800 + Signed-off-by: Keith Packard <kei...@keithp.com> - dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6] +commit fe4c774c572e3f55a7417f0ca336ae1479a966ad +Author: Nikhil Mahale <nmah...@nvidia.com> +Date: Sat Jan 24 17:06:59 2015 -0800 + + os: Fix timer race conditions + + Fixing following kind of race-conditions - + + WaitForSomething() + | + ----> // timers -> timer-1 -> timer-2 -> null + while (timers && (int) (timers->expires - now) <= 0) + // prototype - DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev) + DoTimer(timers, now, &timers) + | + | + ----> OsBlockSignals(); .... OS Signal comes just before blocking it, + .... timer-1 handler gets called. + // timer-1 gets served and scheduled again; + // timers -> timer-2 -> timer-1 -> null + .... + *prev = timer->next; + timer->next = NULL; // timers -> null + // timers list gets corrupted here and timer-2 gets removed from list. + + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=86288 + Signed-off-by: Nikhil Mahale <nmah...@nvidia.com> + Reviewed-by: Julien Cristau <jcris...@debian.org> - GetHosts saves the pointer to allocated memory in *data, and then - wants to bounds-check writes to that region, but was mistakenly using - a bare 'data' instead of '*data'. Also, data is declared as void **, - so we need a cast to turn it into a byte pointer so we can actually do - pointer comparisons. + v2: Apply warning fixes from Keith Packard <kei...@keithp.com> + Reviewed-by: Aaron Plattner <aplatt...@nvidia.com> + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> Signed-off-by: Keith Packard <kei...@keithp.com> - Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> - Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> -commit 9802a0162f738de03585ca3f3b8a8266494f7d45 +commit 58f28b0427f0a0c0c445f314bd42721ca8e1e844 Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 09:30:59 2014 -0800 +Date: Fri Jan 23 10:59:39 2015 -0800 - Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5] - - The 'n' parameter must be surrounded by parens in both places to - prevent precedence from mis-computing things. + Update to version 1.16.99.902 Signed-off-by: Keith Packard <kei...@keithp.com> - Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> - Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> -commit 61b17c0f10307e25e51e30e6fb1d3e3127f82d86 -Author: Keith Packard <kei...@keithp.com> -Date: Tue Dec 9 09:30:58 2014 -0800 +commit fef2f6357b40b238ae01c4c80b0d29b17b839686 +Author: Jason Ekstrand <ja...@jlekstrand.net> +Date: Tue Jan 13 15:08:38 2015 -0800 - glx: Can't mix declarations and code in X.org sources [CVE-2014-8098 pt. 9] + modesetting: Return the crtc for a drawable even if it's rotated -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1ywhpu-00009b...@moszumanska.debian.org