File xrandr-commit-39a1678.diff of Package xorg-x11

Overview Repositories Revisions Requests Users Attributes Meta

File xrandr-commit-39a1678.diff of Package xorg-x11 (Revision 6f0209cc3d03e1b6f9dc4cf400242d1d)

Currently displaying revision 6f0209cc3d03e1b6f9dc4cf400242d1d , Show latest

commit 39a16783a3d1c0c722b4b18fab60a91b9f6ed578
Author: Matthias Hopf <mhopf@suse.de>
Date:   Fri Mar 6 14:49:43 2009 +0100

Revert "Move outputs among crtcs as necessary. Fixes 14570"
    
    This reverts commit 4dcc8ae1a6903434def1a2706f7c68ff9e2a17c4.
    The commit broke uncloning completely again.
    
    Conflicts:
    
    	xrandr.c

diff --git a/xrandr.c b/xrandr.c
index 5630a1a..2b6a555 100644
--- a/xrandr.c
+++ b/xrandr.c
@@ -1620,8 +1620,8 @@ mark_changing_crtcs (void)
 /*
  * Test whether 'crtc' can be used for 'output'
  */
-static Bool
-check_crtc_for_output (crtc_t *crtc, output_t *output, Bool ignore_state)
+Bool
+check_crtc_for_output (crtc_t *crtc, output_t *output)
 {
     int		c;
     int		l;
@@ -1652,9 +1652,6 @@ check_crtc_for_output (crtc_t *crtc, output_t *output, Bool ignore_state)
 	    return False;
     }
 
-    if (ignore_state)
-	return True;
-
     if (crtc->noutput)
     {
 	/* make sure the state matches */
@@ -1698,7 +1695,7 @@ find_crtc_for_output (output_t *output)
 	crtc = find_crtc_by_xid (output->output_info->crtcs[c]);
 	if (!crtc) fatal ("cannot find crtc 0x%x\n", output->output_info->crtcs[c]);
 
-	if (check_crtc_for_output (crtc, output, False))
+	if (check_crtc_for_output (crtc, output))
 	    return crtc;
     }
     return NULL;
@@ -1918,7 +1915,7 @@ pick_crtcs_score (output_t *outputs)
 	
 	/* reset crtc allocation for following outputs */
 	disable_outputs (outputs);
-	if (!check_crtc_for_output (crtc, output, True))
+	if (!check_crtc_for_output (crtc, output))
 	    continue;
 	
 	my_score = 1000;

Places

File xrandr-commit-39a1678.diff of Package xorg-x11 (Revision 6f0209cc3d03e1b6f9dc4cf400242d1d)

Places