xserver: Branch 'master'

[Keith Packard]

 randr/rroutput.c |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit c1f2be1f3fd0c80cb4c85b98140b98aa9311242b
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Jan 30 19:14:36 2009 -0800

    RandR SetOutputPrimary should work with or without a crtc connected
    
    The test was inverted from the protocol spec, and besides, the test is bogus
    anyways.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/randr/rroutput.c b/randr/rroutput.c
index 0a211e5..0ae7873 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -588,11 +588,6 @@ ProcRRSetOutputPrimary(ClientPtr client)
 	    return RRErrorBase + BadRROutput;
 	}
 
-	if (output->crtc) {
-	    client->errorValue = stuff->output;
-	    return BadMatch;
-	}
-
 	if (output->pScreen != pWin->drawable.pScreen) {
 	    client->errorValue = stuff->window;
 	    return BadMatch;