[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'debian-unstable'



 configure.ac                                      |   34 
 debian/changelog                                  |   10 
 debian/patches/add_support_new_libsystemd.patch   |   11 
 debian/patches/glamor-disable-debugging-msgs.diff |   32 
 debian/patches/series                             |    3 
 debian/patches/update-intel-pciids.diff           |   87 
 dix/pixmap.c                                      |   21 
 dix/window.c                                      |  126 +
 glamor/glamor.c                                   |   10 
 glamor/glamor_composite_glyphs.c                  |    9 
 glamor/glamor_copy.c                              |    3 
 glamor/glamor_egl.c                               |    4 
 glamor/glamor_fbo.c                               |   18 
 glamor/glamor_font.c                              |   35 
 glamor/glamor_font.h                              |    2 
 glamor/glamor_picture.c                           |   37 
 glamor/glamor_priv.h                              |    4 
 glamor/glamor_render.c                            |   24 
 glamor/glamor_text.c                              |   10 
 glamor/glamor_vbo.c                               |   16 
 glx/createcontext.c                               |   31 
 glx/extension_string.c                            |    1 
 glx/extension_string.h                            |    1 
 glx/glxdri2.c                                     |    4 
 glx/glxdriswrast.c                                |    2 
 hw/dmx/config/dmxcompat.c                         |    2 
 hw/dmx/config/dmxconfig.c                         |    2 
 hw/dmx/config/dmxparse.h                          |    2 
 hw/dmx/config/dmxtodmx.c                          |    1 
 hw/dmx/config/parser.y                            |    1 
 hw/dmx/config/scanner.l                           |    6 
 hw/dmx/config/xdmxconfig.c                        |    1 
 hw/dmx/doxygen/doxygen.conf.in                    | 2429 ++++++++++++++--------
 hw/dmx/glxProxy/glxsingle.c                       |    5 
 hw/dmx/glxProxy/render2swap.c                     |   34 
 hw/dmx/glxProxy/renderpixswap.c                   |    3 
 hw/kdrive/src/kinput.c                            |    2 
 hw/vfb/InitOutput.c                               |  123 +
 hw/xfree86/common/xf86Xinput.c                    |    5 
 hw/xfree86/dixmods/xkbPrivate.c                   |    2 
 hw/xfree86/dri2/pci_ids/i915_pci_ids.h            |    4 
 hw/xfree86/dri2/pci_ids/i965_pci_ids.h            |   56 
 hw/xfree86/drivers/modesetting/driver.c           |   59 
 hw/xfree86/drivers/modesetting/driver.h           |    3 
 hw/xfree86/drivers/modesetting/present.c          |    6 
 hw/xfree86/os-support/linux/systemd-logind.c      |    3 
 hw/xfree86/x86emu/ops.c                           |  192 +
 hw/xfree86/xorg-wrapper.c                         |    1 
 hw/xnest/Keyboard.c                               |    5 
 hw/xwayland/xwayland-glamor.c                     |    4 
 hw/xwayland/xwayland-input.c                      |   22 
 hw/xwayland/xwayland-output.c                     |   93 
 hw/xwayland/xwayland-shm.c                        |    4 
 hw/xwayland/xwayland.c                            |   35 
 include/list.h                                    |    8 
 include/os.h                                      |    2 
 include/window.h                                  |    1 
 os/connection.c                                   |    1 
 os/log.c                                          |  126 -
 present/present.c                                 |   79 
 present/present_priv.h                            |    2 
 61 files changed, 2647 insertions(+), 1212 deletions(-)

New commits:
commit 8321c9b0eaf138064f11d51978801044c948e333
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Tue Feb 9 10:27:37 2016 +0200

    release to unstable

diff --git a/debian/changelog b/debian/changelog
index 126c8e4..ebe35b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.18.1-1) UNRELEASED; urgency=medium
+xorg-server (2:1.18.1-1) unstable; urgency=medium
 
   * New upstream release.
   * add_support_new_libsystemd.patch,
@@ -6,7 +6,7 @@ xorg-server (2:1.18.1-1) UNRELEASED; urgency=medium
     update-intel-pciids.diff:
     - dropped, upstream
 
- -- Timo Aaltonen <tjaalton@debian.org>  Tue, 09 Feb 2016 09:59:37 +0200
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 09 Feb 2016 10:27:18 +0200
 
 xorg-server (2:1.18.0-3) unstable; urgency=medium
 

commit 5986392afbe4a54335ac6c85a2fde36ea39097e3
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Tue Feb 9 10:26:22 2016 +0200

    update changelog, drop upstream patches

diff --git a/debian/changelog b/debian/changelog
index be300ae..126c8e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg-server (2:1.18.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * add_support_new_libsystemd.patch,
+    glamor-disable-debugging-msgs.diff,
+    update-intel-pciids.diff:
+    - dropped, upstream
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Tue, 09 Feb 2016 09:59:37 +0200
+
 xorg-server (2:1.18.0-3) unstable; urgency=medium
 
   * update-intel-pciids.diff: Sync dri2 mapping ids for intel.
diff --git a/debian/patches/add_support_new_libsystemd.patch b/debian/patches/add_support_new_libsystemd.patch
deleted file mode 100644
index d642b60..0000000
--- a/debian/patches/add_support_new_libsystemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -849,7 +849,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes;
- 		AC_MSG_ERROR([systemd support requested but no library has been found])
- 	fi
- 	AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available])
--	REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon"
-+	REQUIRED_LIBS="$REQUIRED_LIBS libsystemd"
- fi
- AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"])
- 
diff --git a/debian/patches/glamor-disable-debugging-msgs.diff b/debian/patches/glamor-disable-debugging-msgs.diff
deleted file mode 100644
index 6556848..0000000
--- a/debian/patches/glamor-disable-debugging-msgs.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b
-Author: Michel Dänzer <michel.daenzer@amd.com>
-Date:   Tue Jan 12 15:42:47 2016 +0900
-
-    glamor: Disable debugging messages other than GL API errors
-    
-    According to Nicolai Hähnle, the relevant specification says "All
-    messages are initially enabled unless their assigned severity is
-    DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we
-    don't want to get. Failing that, we were accidentally logging e.g.
-    shader stats intended for shader-db.
-    
-    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659
-    Tested-by: Laurent Carlier <lordheavym@gmail.com>
-    Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
-    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-    Reviewed-by: Eric Anholt <eric@anholt.net>
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index 116d10c..81aba2d 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -393,6 +393,9 @@ glamor_setup_debug_output(ScreenPtr screen)
-         return;
- 
-     glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
-+    /* Disable debugging messages other than GL API errors */
-+    glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL,
-+                          GL_FALSE);
-     glDebugMessageControl(GL_DEBUG_SOURCE_API,
-                           GL_DEBUG_TYPE_ERROR,
-                           GL_DONT_CARE,
diff --git a/debian/patches/series b/debian/patches/series
index 4055e15..2c8af94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,3 @@
 03_static-nettle.diff
 05_Revert-Unload-submodules.diff
 #08_xfree86_fix_ia64_inx_outx.diff
-add_support_new_libsystemd.patch
-update-intel-pciids.diff
-glamor-disable-debugging-msgs.diff
diff --git a/debian/patches/update-intel-pciids.diff b/debian/patches/update-intel-pciids.diff
deleted file mode 100644
index e67819b..0000000
--- a/debian/patches/update-intel-pciids.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-commit 51cf2ea3f846fd7785754f7a31d35514daa8a672
-Author: Timo Aaltonen <tjaalton@debian.org>
-Date:   Wed Jan 27 13:56:29 2016 +0200
-
-    dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
-    
-    Adds Skylake, Kabylake and Broxton allowing them to use
-    modesetting + glamor with dri2.
-    
-    Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
-
-diff --git a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
-index 7d51975..1c43c8e 100644
---- a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
-+++ b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
-@@ -11,5 +11,5 @@ CHIPSET(0x27AE, I945_GME, "Intel(R) 945GME")
- CHIPSET(0x29B2, Q35_G,    "Intel(R) Q35")
- CHIPSET(0x29C2, G33_G,    "Intel(R) G33")
- CHIPSET(0x29D2, Q33_G,    "Intel(R) Q33")
--CHIPSET(0xA011, IGD_GM,   "Intel(R) IGD")
--CHIPSET(0xA001, IGD_G,    "Intel(R) IGD")
-+CHIPSET(0xA011, PNV_GM,   "Intel(R) Pineview M")
-+CHIPSET(0xA001, PNV_G,    "Intel(R) Pineview")
-diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-index 2e04301..5139e27 100644
---- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
-@@ -109,7 +109,55 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300 (Broadwell GT3e)")
- CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)")
- CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3")
- CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
--CHIPSET(0x22B0, chv,     "Intel(R) Cherryview")
--CHIPSET(0x22B1, chv,     "Intel(R) Cherryview")
--CHIPSET(0x22B2, chv,     "Intel(R) Cherryview")
--CHIPSET(0x22B3, chv,     "Intel(R) Cherryview")
-+CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
-+CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
-+CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
-+CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
-+CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
-+CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
-+CHIPSET(0x1915, skl_gt2, "Intel(R) Skylake GT2f")
-+CHIPSET(0x1916, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
-+CHIPSET(0x1917, skl_gt2, "Intel(R) Skylake GT2f")
-+CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
-+CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
-+CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
-+CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
-+CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
-+CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
-+CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
-+CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
-+CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
-+CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
-+CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
-+CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
-+CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
-+CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
-+CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
-+CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
-+CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
-+CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
-+CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
-+CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4")
-+CHIPSET(0x22B0, chv,     "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x22B1, chv,     "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x22B2, chv,     "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x22B3, chv,     "Intel(R) HD Graphics (Cherryview)")
-+CHIPSET(0x0A84, bxt,     "Intel(R) HD Graphics (Broxton)")
-+CHIPSET(0x1A84, bxt,     "Intel(R) HD Graphics (Broxton)")
-+CHIPSET(0x5A84, bxt,     "Intel(R) HD Graphics (Broxton)")

commit 23e60f917a5af652cd83b8a3a9951c79838721b3
Author: Adam Jackson <ajax@redhat.com>
Date:   Mon Feb 8 18:32:57 2016 -0500

    xserver 1.18.1
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>

diff --git a/configure.ac b/configure.ac
index a9b6954..4808ef4 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.18.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2015-11-09"
-RELEASE_NAME="Moussaka"
+AC_INIT([xorg-server], 1.18.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2016-02-08"
+RELEASE_NAME="Spanakopita"
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

commit a0d49b1c660f2453d07ce23bf86b0ef717f3d2c8
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Wed Jan 27 14:18:50 2016 +0200

    dri2: Sync i915_pci_ids.h and i965_pci_ids.h from mesa
    
    Adds Skylake, Kabylake and Broxton allowing them to use
    modesetting + glamor with dri2.
    
    Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
    Reviewed-by: Andreas Boll <andreas.boll.dev@gmail.com>
    (cherry picked from commit 50ca286d79f6304b972ea74487308e7794a170fb)

diff --git a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
index 7d51975..1c43c8e 100644
--- a/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
+++ b/hw/xfree86/dri2/pci_ids/i915_pci_ids.h
@@ -11,5 +11,5 @@ CHIPSET(0x27AE, I945_GME, "Intel(R) 945GME")
 CHIPSET(0x29B2, Q35_G,    "Intel(R) Q35")
 CHIPSET(0x29C2, G33_G,    "Intel(R) G33")
 CHIPSET(0x29D2, Q33_G,    "Intel(R) Q33")
-CHIPSET(0xA011, IGD_GM,   "Intel(R) IGD")
-CHIPSET(0xA001, IGD_G,    "Intel(R) IGD")
+CHIPSET(0xA011, PNV_GM,   "Intel(R) Pineview M")
+CHIPSET(0xA001, PNV_G,    "Intel(R) Pineview")
diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
index 2e04301..5139e27 100644
--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
+++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h
@@ -109,7 +109,55 @@ CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300 (Broadwell GT3e)")
 CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)")
 CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3")
 CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3")
-CHIPSET(0x22B0, chv,     "Intel(R) Cherryview")
-CHIPSET(0x22B1, chv,     "Intel(R) Cherryview")
-CHIPSET(0x22B2, chv,     "Intel(R) Cherryview")
-CHIPSET(0x22B3, chv,     "Intel(R) Cherryview")
+CHIPSET(0x1902, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
+CHIPSET(0x1906, skl_gt1, "Intel(R) HD Graphics 510 (Skylake GT1)")
+CHIPSET(0x190A, skl_gt1, "Intel(R) Skylake GT1")
+CHIPSET(0x190E, skl_gt1, "Intel(R) Skylake GT1")
+CHIPSET(0x1912, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
+CHIPSET(0x1913, skl_gt2, "Intel(R) Skylake GT2f")
+CHIPSET(0x1915, skl_gt2, "Intel(R) Skylake GT2f")
+CHIPSET(0x1916, skl_gt2, "Intel(R) HD Graphics 520 (Skylake GT2)")
+CHIPSET(0x1917, skl_gt2, "Intel(R) Skylake GT2f")
+CHIPSET(0x191A, skl_gt2, "Intel(R) Skylake GT2")
+CHIPSET(0x191B, skl_gt2, "Intel(R) HD Graphics 530 (Skylake GT2)")
+CHIPSET(0x191D, skl_gt2, "Intel(R) HD Graphics P530 (Skylake GT2)")
+CHIPSET(0x191E, skl_gt2, "Intel(R) HD Graphics 515 (Skylake GT2)")
+CHIPSET(0x1921, skl_gt2, "Intel(R) Skylake GT2")
+CHIPSET(0x1923, skl_gt3, "Intel(R) Iris Graphics 540 (Skylake GT3e)")
+CHIPSET(0x1926, skl_gt3, "Intel(R) HD Graphics 535 (Skylake GT3)")
+CHIPSET(0x1927, skl_gt3, "Intel(R) Iris Graphics 550 (Skylake GT3e)")
+CHIPSET(0x192A, skl_gt4, "Intel(R) Skylake GT4")
+CHIPSET(0x192B, skl_gt3, "Intel(R) Iris Graphics (Skylake GT3fe)")
+CHIPSET(0x1932, skl_gt4, "Intel(R) Skylake GT4")
+CHIPSET(0x193A, skl_gt4, "Intel(R) Skylake GT4")
+CHIPSET(0x193B, skl_gt4, "Intel(R) Skylake GT4")
+CHIPSET(0x193D, skl_gt4, "Intel(R) Skylake GT4")
+CHIPSET(0x5902, kbl_gt1, "Intel(R) Kabylake GT1")
+CHIPSET(0x5906, kbl_gt1, "Intel(R) Kabylake GT1")
+CHIPSET(0x590A, kbl_gt1, "Intel(R) Kabylake GT1")
+CHIPSET(0x590B, kbl_gt1, "Intel(R) Kabylake GT1")
+CHIPSET(0x590E, kbl_gt1, "Intel(R) Kabylake GT1")
+CHIPSET(0x5913, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
+CHIPSET(0x5915, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
+CHIPSET(0x5917, kbl_gt1_5, "Intel(R) Kabylake GT1.5")
+CHIPSET(0x5912, kbl_gt2, "Intel(R) Kabylake GT2")
+CHIPSET(0x5916, kbl_gt2, "Intel(R) Kabylake GT2")
+CHIPSET(0x591A, kbl_gt2, "Intel(R) Kabylake GT2")
+CHIPSET(0x591B, kbl_gt2, "Intel(R) Kabylake GT2")
+CHIPSET(0x591D, kbl_gt2, "Intel(R) Kabylake GT2")
+CHIPSET(0x591E, kbl_gt2, "Intel(R) Kabylake GT2")
+CHIPSET(0x5921, kbl_gt2, "Intel(R) Kabylake GT2F")
+CHIPSET(0x5926, kbl_gt3, "Intel(R) Kabylake GT3")
+CHIPSET(0x592A, kbl_gt3, "Intel(R) Kabylake GT3")
+CHIPSET(0x592B, kbl_gt3, "Intel(R) Kabylake GT3")
+CHIPSET(0x5932, kbl_gt4, "Intel(R) Kabylake GT4")
+CHIPSET(0x593A, kbl_gt4, "Intel(R) Kabylake GT4")
+CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
+CHIPSET(0x593D, kbl_gt4, "Intel(R) Kabylake GT4")
+CHIPSET(0x22B0, chv,     "Intel(R) HD Graphics (Cherryview)")
+CHIPSET(0x22B1, chv,     "Intel(R) HD Graphics (Cherryview)")
+CHIPSET(0x22B2, chv,     "Intel(R) HD Graphics (Cherryview)")
+CHIPSET(0x22B3, chv,     "Intel(R) HD Graphics (Cherryview)")
+CHIPSET(0x0A84, bxt,     "Intel(R) HD Graphics (Broxton)")
+CHIPSET(0x1A84, bxt,     "Intel(R) HD Graphics (Broxton)")
+CHIPSET(0x5A84, bxt,     "Intel(R) HD Graphics (Broxton)")

commit bc4b234d6f4b7b211f7a9750a97524e9652d0e6e
Author: Adam Jackson <ajax@redhat.com>
Date:   Wed Jan 27 11:50:13 2016 -0500

    modesetting: Require sufficiently new libdrm
    
    Bugzilla: https://bugs.freedesktop.org/93883
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Julien Cristau <jcristau@debian.org>
    (cherry picked from commit bf23db42a4e5943129501223a47b48884cdeb62f)

diff --git a/configure.ac b/configure.ac
index 070b63a..a9b6954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then
 
 	if test "x$DRM" = xyes; then
 		dnl 2.4.46 is required for cursor hotspot support.
-		PKG_CHECK_EXISTS(libdrm >= 2.4.46)
-		XORG_DRIVER_MODESETTING=yes
+		PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no)
 	fi
 
 	AC_SUBST([XORG_LIBS])

commit 0b95625cecc7dc2cb6aff61edbc8366e8ffd516f
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Jan 19 02:01:09 2016 +0000

    glamor: don't do copy if we have 0 boxes to copy.
    
    This happens if you run twm + mplayer + xclock and drag
    the clock over the mplayer. If we don't catch it, we cause
    an illegal draw elements command to be passed to GL.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    (cherry picked from commit 1fd82c764d5b24107e60f2173e30e5d24a2f2667)

diff --git a/glamor/glamor_copy.c b/glamor/glamor_copy.c
index 028acf2..1adfba0 100644
--- a/glamor/glamor_copy.c
+++ b/glamor/glamor_copy.c
@@ -640,6 +640,9 @@ glamor_copy(DrawablePtr src,
             Pixel bitplane,
             void *closure)
 {
+    if (nbox == 0)
+	return;
+
     if (glamor_copy_gl(src, dst, gc, box, nbox, dx, dy, reverse, upsidedown, bitplane, closure))
         return;
     glamor_copy_bail(src, dst, gc, box, nbox, dx, dy, reverse, upsidedown, bitplane, closure);

commit 71be56c426bd9b66cbc5ab23923f4564e066cd75
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Jan 21 11:30:15 2016 -0800

    glamor: Fix copy-like Render operations between 15 and 16 depth.
    
    Reading and writing to 16-depth pixmaps using PICT_x1r5g5b5 ends up
    failing, unless you're doing a straight copy at the same bpp where the
    misinterpretation matches on both sides.
    
    Fixes rendercheck/blend/over and renderhceck/blend/src in piglit.
    
    Please cherry-pick this to active stable branches.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Reviewed-by: Dave Airlie <airlied@redhat.com>
    (cherry picked from commit 510c8605641803f1f5b5d2de6d3bb422b148e0e7)

diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index d8574ec..92b6b0c 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -512,6 +512,14 @@ static int
 compatible_formats(CARD8 op, PicturePtr dst, PicturePtr src)
 {
     if (op == PictOpSrc) {
+        /* We can't do direct copies between different depths at 16bpp
+         * because r,g,b are allocated to different bits.
+         */
+        if (dst->pDrawable->bitsPerPixel == 16 &&
+            dst->pDrawable->depth != src->pDrawable->depth) {
+            return 0;
+        }
+
         if (src->format == dst->format)
             return 1;
 

commit 6a4f771c5da99d5f723d61e1a780390a5e6b161b
Author: Adam Jackson <ajax@redhat.com>
Date:   Wed Jan 20 15:43:10 2016 -0500

    glx: Fix GLX_EXT_create_context_es2_profile support
    
    As of v4 of this extension, any GLES version number may be requested (to
    enable GLES3 and later). To comply with this, simply remove the API
    version checks and leave it to the DRI driver to validate. This happens
    to also enable using GLES1 in direct contexts, so if that's the dire
    situation you find yourself in, your client driver at least stands a
    chance of working.
    
    v4 also specifies that both extension strings should be advertised for
    compatibility with clients written against v1 of the extension spec, so
    add the es_profile bit to the extension list and enable it whenever we
    would enable es2_profile.
    
    Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    (cherry picked from commit bc415fb1e0031ad23bda6e9c3f4664532876a0e5)

diff --git a/glx/createcontext.c b/glx/createcontext.c
index d06bc1f..9157e2f 100644
--- a/glx/createcontext.c
+++ b/glx/createcontext.c
@@ -254,36 +254,17 @@ __glXDisp_CreateContextAttribsARB(__GLXclientState * cl, GLbyte * pc)
      *        GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB; has more than one of
      *        these bits set; or if the implementation does not support the
      *        requested profile, then GLXBadProfileARB is generated."
+     *
+     * The GLX_EXT_create_context_es2_profile spec doesn't exactly say what
+     * is supposed to happen if an invalid version is set, but it doesn't
+     * much matter as support for GLES contexts is only defined for direct
+     * contexts (at the moment anyway) so we can leave it up to the driver
+     * to validate.
      */
     switch (profile) {
     case GLX_CONTEXT_CORE_PROFILE_BIT_ARB:
     case GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB:
-        break;
     case GLX_CONTEXT_ES2_PROFILE_BIT_EXT:
-        /* The GLX_EXT_create_context_es2_profile spec says:
-         *
-         *     "... If the version requested is 2.0, and the
-         *     GLX_CONTEXT_ES2_PROFILE_BIT_EXT bit is set in the
-         *     GLX_CONTEXT_PROFILE_MASK_ARB attribute (see below), then the
-         *     context returned will implement OpenGL ES 2.0."
-         *
-         * It also says:
-         *
-         *     "* If attribute GLX_CONTEXT_PROFILE_MASK_ARB has no bits set;
-         *        has any bits set other than
-         *        GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
-         *        GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, or
-         *        GLX_CONTEXT_ES2_PROFILE_BIT_EXT; has more than one of these
-         *        bits set; or if the implementation does not supported the
-         *        requested profile, then GLXBadProfileARB is generated."
-         *
-         * It does not specifically say what is supposed to happen if
-         * GLX_CONTEXT_ES2_PROFILE_BIT_EXT is set but the version requested is
-         * not 2.0.  We choose to generate GLXBadProfileARB as this matches
-         * NVIDIA's behavior.
-         */
-        if (major_version != 2 || minor_version != 0)
-            return __glXError(GLXBadProfileARB);
         break;
     default:
         return __glXError(GLXBadProfileARB);
diff --git a/glx/extension_string.c b/glx/extension_string.c
index e881d21..cf90146 100644
--- a/glx/extension_string.c
+++ b/glx/extension_string.c
@@ -80,6 +80,7 @@ static const struct extension_info known_glx_extensions[] = {
     { GLX(ARB_framebuffer_sRGB),        VER(0,0), N, },
     { GLX(ARB_multisample),             VER(1,4), Y, },
 
+    { GLX(EXT_create_context_es_profile), VER(0,0), N, },
     { GLX(EXT_create_context_es2_profile), VER(0,0), N, },
     { GLX(EXT_framebuffer_sRGB),        VER(0,0), N, },
     { GLX(EXT_import_context),          VER(0,0), Y, },
diff --git a/glx/extension_string.h b/glx/extension_string.h
index bac7b06..ffaab07 100644
--- a/glx/extension_string.h
+++ b/glx/extension_string.h
@@ -43,6 +43,7 @@ enum {
     ARB_fbconfig_float_bit,
     ARB_framebuffer_sRGB_bit,
     ARB_multisample_bit,
+    EXT_create_context_es_profile_bit,
     EXT_create_context_es2_profile_bit,
     EXT_import_context_bit,
     EXT_texture_from_pixmap_bit,
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 6fb3d92..89ad808 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -864,11 +864,13 @@ initializeExtensions(__GLXDRIscreen * screen)
         __glXEnableExtension(screen->glx_enable_bits,
                              "GLX_ARB_create_context_profile");
         __glXEnableExtension(screen->glx_enable_bits,
+                             "GLX_EXT_create_context_es_profile");
+        __glXEnableExtension(screen->glx_enable_bits,
                              "GLX_EXT_create_context_es2_profile");
         LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_create_context\n");
         LogMessage(X_INFO, "AIGLX: enabled GLX_ARB_create_context_profile\n");
         LogMessage(X_INFO,
-                   "AIGLX: enabled GLX_EXT_create_context_es2_profile\n");
+                   "AIGLX: enabled GLX_EXT_create_context_es{,2}_profile\n");
     }
 
     if (DRI2HasSwapControl(pScreen)) {
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index e8e53bf..be00f5f 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -405,6 +405,8 @@ initializeExtensions(__GLXDRIscreen * screen)
         __glXEnableExtension(screen->glx_enable_bits,
                              "GLX_ARB_create_context_profile");
         __glXEnableExtension(screen->glx_enable_bits,
+                             "GLX_EXT_create_context_es_profile");
+        __glXEnableExtension(screen->glx_enable_bits,
                              "GLX_EXT_create_context_es2_profile");
     }
 

commit ff562c9f98bbce91b61b06dfc51aa30c14180cdd
Author: Michel Dänzer <michel.daenzer@amd.com>
Date:   Fri Jan 15 18:22:21 2016 +0900

    present: Handle wraparound when comparing MSC values
    
    When a window moves from one CRTC to another, present_window_to_crtc_msc
    updates window_priv->msc_offset according to the delta between the
    current MSC values of the old and new CRTC:
    
                window_priv->msc_offset += new_msc - old_msc;
    
    window_priv->msc_offset is initially 0, so if new_msc < old_msc,
    window_priv->msc_offset wraps around and becomes a large number. If the
    window_msc parameter passed in is small (in particular if it's 0, such as
    is the case when the client just wants to know the current window MSC
    value), the returned CRTC MSC value may still be a large number. In that
    case, the existing MSC comparisons in pixmap_present weren't working as
    intended, resulting in scheduling a wait far into the future when the
    target MSC had actually already passed. This would result in the client
    (e.g. the Chromium browser) hanging when moving its window between CRTCs.
    
    In order to fix this, introduce msc_is_(equal_or_)after helper functions
    which take the wraparound into account for comparing two MSC values.
    
    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
    Signed-off-by: Keith Packard <keithp@keithp.com>
    (cherry picked from commit 25eca80265654cfbf8768024e027426fedeb0918)

diff --git a/present/present.c b/present/present.c
index 66e0f21..8cf3b6f 100644
--- a/present/present.c
+++ b/present/present.c
@@ -717,6 +717,28 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
     present_vblank_destroy(vblank);
 }
 
+/*
+ * Returns:
+ * TRUE if the first MSC value is after the second one
+ * FALSE if the first MSC value is equal to or before the second one
+ */
+static Bool
+msc_is_after(uint64_t test, uint64_t reference)
+{
+    return (int64_t)(test - reference) > 0;
+}
+
+/*
+ * Returns:
+ * TRUE if the first MSC value is equal to or after the second one
+ * FALSE if the first MSC value is before the second one
+ */
+static Bool
+msc_is_equal_or_after(uint64_t test, uint64_t reference)
+{
+    return (int64_t)(test - reference) >= 0;
+}
+
 int
 present_pixmap(WindowPtr window,
                PixmapPtr pixmap,
@@ -771,14 +793,14 @@ present_pixmap(WindowPtr window,
 
     /* Adjust target_msc to match modulus
      */
-    if (crtc_msc >= target_msc) {
+    if (msc_is_equal_or_after(crtc_msc, target_msc)) {
         if (divisor != 0) {
             target_msc = crtc_msc - (crtc_msc % divisor) + remainder;
             if (options & PresentOptionAsync) {
-                if (target_msc < crtc_msc)
+                if (msc_is_after(crtc_msc, target_msc))
                     target_msc += divisor;
             } else {
-                if (target_msc <= crtc_msc)
+                if (msc_is_equal_or_after(crtc_msc, target_msc))
                     target_msc += divisor;
             }
         } else {
@@ -864,7 +886,7 @@ present_pixmap(WindowPtr window,
     if (pixmap != NULL &&
         !(options & PresentOptionCopy) &&
         screen_priv->info) {
-        if (target_msc > crtc_msc &&
+        if (msc_is_after(target_msc, crtc_msc) &&
             present_check_flip (target_crtc, window, pixmap, TRUE, valid, x_off, y_off))
         {
             vblank->flip = TRUE;
@@ -897,7 +919,7 @@ present_pixmap(WindowPtr window,
 
     xorg_list_add(&vblank->event_queue, &present_exec_queue);
     vblank->queued = TRUE;
-    if (target_msc > crtc_msc) {
+    if (msc_is_after(target_msc, crtc_msc)) {
         ret = present_queue_vblank(screen, target_crtc, vblank->event_id, target_msc);
         if (ret == Success)
             return Success;

commit 9505783c2270b6da13cc5691b94f48ff72d7b625
Author: Michel Dänzer <michel.daenzer@amd.com>
Date:   Tue Jan 12 15:42:47 2016 +0900

    glamor: Disable debugging messages other than GL API errors
    
    According to Nicolai Hähnle, the relevant specification says "All
    messages are initially enabled unless their assigned severity is
    DEBUG_SEVERITY_LOW", so we need to explicitly disable the messages we
    don't want to get. Failing that, we were accidentally logging e.g.
    shader stats intended for shader-db.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93659
    Tested-by: Laurent Carlier <lordheavym@gmail.com>
    Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    (cherry picked from commit 1db6de7b6a6ee240eb50a13fe1fa1e135d7cb93b)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index e69f83d..f2aec46 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -401,6 +401,9 @@ glamor_setup_debug_output(ScreenPtr screen)
         return;
 
     glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS);
+    /* Disable debugging messages other than GL API errors */
+    glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL,
+                          GL_FALSE);
     glDebugMessageControl(GL_DEBUG_SOURCE_API,
                           GL_DEBUG_TYPE_ERROR,
                           GL_DONT_CARE,

commit 9e45b28e998a4e0aacd1224b5d4f479ee453fdb9
Author: Dave Airlie <airlied@redhat.com>
Date:   Tue Jan 12 14:19:24 2016 +1000

    glamor: store old fonts in double width textures.
    
    There is a problem with some fonts that the height necessary
    to store the font is greater than the max texture size, which
    causes a fallback to occur. We can avoid this by storing two
    macro columns side-by-side in the texture and adjusting
    the calculations to suit.
    
    This fixes
    xfd -fn -*-*-*-*-*-*-*-*-*-*-*-*-*-*
    falling back here, when it picks
    -arabic-newspaper-medium-r-normal--32-246-100-100-p-137-iso10646-1
    
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    (cherry picked from commit 8116fd8a760b5935645def1b2c3b155c05927850)

diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c
index 9b0dbd1..637e0dc 100644
--- a/glamor/glamor_font.c
+++ b/glamor/glamor_font.c
@@ -77,8 +77,19 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
     glamor_font->glyph_width_bytes = glyph_width_bytes;
     glamor_font->glyph_height = glyph_height;
 
-    overall_width = glyph_width_bytes * num_cols;
-    overall_height = glyph_height * num_rows;
+    /*
+     * Layout the font two blocks of columns wide.
+     * This avoids a problem with some fonts that are too high to fit.
+     */
+    glamor_font->row_width = glyph_width_bytes * num_cols;
+
+    if (num_rows > 1) {
+       overall_width = glamor_font->row_width * 2;
+       overall_height = glyph_height * ((num_rows + 1) / 2);
+    } else {
+       overall_width = glamor_font->row_width;
+       overall_height = glyph_height;
+    }
 
     if (overall_width > glamor_priv->max_fbo_size ||
         overall_height > glamor_priv->max_fbo_size) {
@@ -117,11 +128,17 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
             (*font->get_glyphs)(font, 1, c, TwoD16Bit, &count, &glyph);
 
             if (count) {
-                char *dst = bits + row * glyph_height * overall_width +
-                    col * glyph_width_bytes;
+                char *dst;
                 char *src = glyph->bits;
                 unsigned y;
 
+                dst = bits;
+                /* get offset of start of first row */
+                dst += (row / 2) * glyph_height * overall_width;
+                /* add offset into second row */
+                dst += (row & 1) ? glamor_font->row_width : 0;
+
+                dst += col * glyph_width_bytes;
                 for (y = 0; y < GLYPHHEIGHTPIXELS(glyph); y++) {
                     memcpy(dst, src, GLYPHWIDTHBYTES(glyph));
                     dst += overall_width;
diff --git a/glamor/glamor_font.h b/glamor/glamor_font.h
index 36d2062..4d41e01 100644
--- a/glamor/glamor_font.h
+++ b/glamor/glamor_font.h
@@ -30,7 +30,7 @@ typedef struct {
     CARD8       default_col;
 
     GLuint      texture_id;
-
+    GLuint      row_width;
     CARD16      glyph_width_bytes;
     CARD16      glyph_width_pixels;
     CARD16      glyph_height;
diff --git a/glamor/glamor_text.c b/glamor/glamor_text.c
index 81a22a5..429f53b 100644
--- a/glamor/glamor_text.c
+++ b/glamor/glamor_text.c
@@ -142,7 +142,7 @@ glamor_text(DrawablePtr drawable, GCPtr gc,
             int     height = GLYPHHEIGHTPIXELS(ci);
             int     tx, ty = 0;
             int     row = 0, col;
-
+            int     second_row = 0;
             x += ci->metrics.characterWidth;
 
             if (sixteen) {
@@ -153,8 +153,10 @@ glamor_text(DrawablePtr drawable, GCPtr gc,
                     row = chars[0];
                     col = chars[1];
                 }
-                if (FONTLASTROW(font) != 0)
-                    ty = (row - firstRow) * glyph_spacing_y;
+                if (FONTLASTROW(font) != 0) {
+                    ty = ((row - firstRow) / 2) * glyph_spacing_y;
+                    second_row = (row - firstRow) & 1;
+                }
                 else
                     col += row << 8;
             } else {
@@ -165,6 +167,8 @@ glamor_text(DrawablePtr drawable, GCPtr gc,
             }
 
             tx = (col - firstCol) * glyph_spacing_x;
+            /* adjust for second row layout */
+            tx += second_row * glamor_font->row_width * 8;
 
             v[ 0] = x1;
             v[ 1] = y1;

commit f673c6cffb033286bf4f31fbb64f0863dfbe77f6
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Jan 11 17:02:57 2016 +1000

    glamor: fallback if font is too large for FBO size.
    
    running xfontsel on haswell here, with a max texture size
    of 8kx8k, one font wants 9711 height. This fallsback to
    sw in this case.
    
    A proper solution probably involves using an array texture.
    
    Reviewed-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    (cherry picked from commit 64081d0eacf3e53a029b8e8b63096cc153e98549)

diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c
index 6753d50..9b0dbd1 100644
--- a/glamor/glamor_font.c
+++ b/glamor/glamor_font.c
@@ -80,6 +80,11 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
     overall_width = glyph_width_bytes * num_cols;
     overall_height = glyph_height * num_rows;
 
+    if (overall_width > glamor_priv->max_fbo_size ||
+        overall_height > glamor_priv->max_fbo_size) {
+        /* fallback if we don't fit inside a texture */
+        return NULL;
+    }
     bits = malloc(overall_width * overall_height);
     if (!bits)
         return NULL;

commit f7da9e4cd8237795cea4c0cf82148bdd18ec0f92
Author: Adam Jackson <ajax@redhat.com>
Date:   Wed Jan 6 10:03:23 2016 -0500

    os: Failure to remove a non-existent log file is not an error
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
    (cherry picked from commit 6dcb73375e0ce389315d55587623eb84e9d13543)

diff --git a/os/log.c b/os/log.c
index 6168d59..91e55a5 100644
--- a/os/log.c
+++ b/os/log.c
@@ -218,7 +218,7 @@ LogFilePrep(const char *fname, const char *backup, const char *idstring)
         }
     }
     else {
-        if (remove(logFileName) != 0) {
+        if (remove(logFileName) != 0 && errno != ENOENT) {
             FatalError("Cannot remove old log file \"%s\": %s\n",
                        logFileName, strerror(errno));
         }

commit 4dfb05aaae9dc7a45294f60ebd3ad454a4707966
Author: Thomas Klausner <wiz@NetBSD.org>
Date:   Wed Nov 11 13:32:05 2015 +0100

    Fix build when XSERVER_PLATFORM_BUS is not defined.
    
    Reviewed-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
    (cherry picked from commit 862cbf4c870c9ed913206c6ef4988bdb470e1c39)

diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index e53d3d4..8f60eae 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -90,6 +90,10 @@ static const struct pci_id_match ms_device_match[] = {
 };
 #endif
 
+#ifndef XSERVER_PLATFORM_BUS
+struct xf86_platform_device;
+#endif
+
 #ifdef XSERVER_PLATFORM_BUS
 static Bool ms_platform_probe(DriverPtr driver,
                               int entity_num, int flags,

commit 88f2aa2940b6fb9deea0a1b53d05df02912dc17c
Author: Thomas Klausner <wiz@NetBSD.org>
Date:   Tue Jan 5 12:51:41 2016 -0500

    Fix uninitialized variable warnings reported by clang
    
    v2: Move initializing pos into the first clause of the for statement. We
    have to keep this macro equivalent to a plain for statement from the
    user's perspective, otherwise callers need to {} things to keep control
    flow correct. [ajax]
    
    Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
    Acked-by: Michel Dänzer <michel.daenzer@amd.com>
    (cherry picked from commit 63f83d1b7f496d05b409352749cdb6674d71cf80)

diff --git a/include/list.h b/include/list.h
index 39f1985..3f0574d 100644
--- a/include/list.h
+++ b/include/list.h
@@ -304,8 +304,9 @@ xorg_list_is_empty(struct xorg_list *head)
  * @param member Member name of the struct xorg_list in the list elements.
  *
  */
-#define xorg_list_for_each_entry(pos, head, member)				\
-    for (pos = __container_of((head)->next, pos, member);		\
+#define xorg_list_for_each_entry(pos, head, member)			\
+    for (pos = NULL,                                                    \
+         pos = __container_of((head)->next, pos, member);		\
 	 &pos->member != (head);					\
 	 pos = __container_of(pos->member.next, pos, member))
 
@@ -317,7 +318,8 @@ xorg_list_is_empty(struct xorg_list *head)
  * See xorg_list_for_each_entry for more details.
  */
 #define xorg_list_for_each_entry_safe(pos, tmp, head, member)		\
-    for (pos = __container_of((head)->next, pos, member),		\
+    for (pos = NULL,                                                    \
+         pos = __container_of((head)->next, pos, member),		\
 	 tmp = __container_of(pos->member.next, pos, member);		\
 	 &pos->member != (head);					\
 	 pos = tmp, tmp = __container_of(pos->member.next, tmp, member))

commit 320b169c225fa05d83928bad438c4b15481cea1f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date:   Fri Jan 1 18:11:14 2016 -0800

    Use unique logfile names when starting server with -displayfd
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=93212
    
    Previously all X servers started with -displayfd would overwrite
    Xorg.0.log - now a temporary name of Xorg.pid-<pid>.log is used
    until after -displayfd finds an open display - then it is renamed
    to the traditional Xorg.<display>.log name.
    
    Reviewed-by: Adam Jackson <ajax@redhat.com>


Reply to: