xrandr: Changes to 'master'

[Adam Jackson]

 xrandr.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 3d03be780fca4949b11ead46c5ea5d3266c03c32
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 18 08:27:49 2015 +0100

    Mark all CRTC as currently unused for second picking CRTC pass
    
    We perform two passes over the CRTC in order to find the preferred CRTC
    for each enabled output. In the first pass, we try to preserve the
    existing output <-> CRTC relationships (to avoid unnecessary flicker).
    If that pass fails, we try again but with all outputs first disabled.
    However, the logic to preserve an active CRTC was not disabled along
    with the outputs - meaning that if one was active but its associated
    output was disabled by the user, then that CRTC would remain unavailable
    for other outputs. The result would be that we would try to assign more
    CRTC than available (i.e. if the user request 3 new HDMI outputs on a
    system with only 3 CRTC, and wished to switch off an active internal
    panel, we would report "cannot find CRTC" even though that configuration
    could be established.)
    
    Reported-and-tested-by: Nathan Schulte <nmschulte at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

commit 53ef3fc13b3e282902892e3140765460c6f93276
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 18 08:27:48 2015 +0100

    Mark disabling an output as a change in its CRTC
    
    When an output is disabled via the cmdline, we can use that information
    to prevent assigning the current CRTC to the output and free it up for
    reuse by other outputs in the first pass of picking CRTC.
    
    Reported-and-tested-by: Nathan Schulte <nmschulte at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>