xserver: Branch 'master' - 3 commits

[Keith Packard]

 hw/xfree86/modes/xf86Crtc.c |    3 +++
 mi/mieq.c                   |    2 +-
 test/Makefile.am            |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 0492deb8f8238b7782e5a706ec6219d88aa1091d
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 29 12:09:27 2013 -0400

    mieq: Bump default queue size to 512
    
    Based on some bugzilla scraping I did around November 2012.  Of xserver
    bugs in Red Hat bugzilla with an EQ size message in the log, the
    distribution looked like:
    
    String                      | Matches
    -------------------------------------
    Increasing EQ size to 512   | 460
    Increasing EQ size to 1024  | 52
    Increasing EQ size to 2048  | 6
    Increasing EQ size to 4096  | 0
    
    Most of the "512" ones appear to be mostly harmless, some relatively
    expensive path in either rendering or resource destruction simply taking
    too long due to external pressures like paging or CPU contention.  So
    let's raise the initial queue size, both to reduce the number of
    spurious abrt reports and to drop fewer events in all but the most
    pathological cases.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/mi/mieq.c b/mi/mieq.c
index d7d73de..4c07480 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 /* Maximum size should be initial size multiplied by a power of 2 */
-#define QUEUE_INITIAL_SIZE                 256
+#define QUEUE_INITIAL_SIZE                 512
 #define QUEUE_RESERVED_SIZE                 64
 #define QUEUE_MAXIMUM_SIZE                4096
 #define QUEUE_DROP_BACKTRACE_FREQUENCY     100
commit d1440783a7367ff0d0c47d256bbca3b3cf8a5034
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Oct 29 12:09:26 2013 -0400

    xfree86: return NULL for compat output if no outputs.
    
    With outputless GPUs showing up we crash here if there are not outputs
    try and recover with a bit of grace.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 2a02c85..a441fd1 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1863,6 +1863,9 @@ SetCompatOutput(xf86CrtcConfigPtr config)
     DisplayModePtr maxmode = NULL, testmode, mode;
     int o, compat = -1, count, mincount = 0;
 
+    if (config->num_output == 0)
+        return NULL;
+
     /* Look for one that's definitely connected */
     for (o = 0; o < config->num_output; o++) {
         test = config->output[o];
commit d7ee27e5e415778240919082c83a65226c6f17e6
Author: Dan Horák <dan at danny.cz>
Date:   Tue Oct 29 12:09:25 2013 -0400

    test: build the touch test only when building Xorg
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Dan Horák <dan at danny.cz>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/Makefile.am b/test/Makefile.am
index e59c412..2852bb3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,11 +1,11 @@
 if ENABLE_UNIT_TESTS
 SUBDIRS= .
-noinst_PROGRAMS = list string touch
+noinst_PROGRAMS = list string
 if XORG
 # Tests that require at least some DDX functions in order to fully link
 # For now, requires xf86 ddx, could be adjusted to use another
 SUBDIRS += xi2
-noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging
+noinst_PROGRAMS += xkb input xtest misc fixes xfree86 hashtabletest os signal-logging touch
 endif
 check_LTLIBRARIES = libxservertest.la