[PATCH] randr: Turn on ModeDebug during server setup

[Adam Jackson]

Signed-off-by: Adam Jackson <a...@redhat.com>
---
 hw/xfree86/modes/xf86Crtc.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 506fbb9..7ea0a28 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1556,6 +1556,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int 
maxY)
        int                 max_clock = 0;
        double              clock;
        Bool                add_default_modes = TRUE;
+       Bool                debug_modes = config->debug_modes ||
+                                         xf86Initialising;
        enum { sync_config, sync_edid, sync_default } sync_source = 
sync_default;
        
        while (output->probed_modes != NULL)
@@ -1725,8 +1727,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int 
maxY)
            if (mode->status == MODE_OK)
                mode->status = (*output->funcs->mode_valid)(output, mode);
        
-       xf86PruneInvalidModes(scrn, &output->probed_modes,
-                             config->debug_modes);
+       xf86PruneInvalidModes(scrn, &output->probed_modes, debug_modes);
        
        output->probed_modes = xf86SortModes (output->probed_modes);
        
@@ -1758,7 +1759,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int 
maxY)
        
        output->initial_rotation = xf86OutputInitialRotation (output);
 
-       if (config->debug_modes) {
+       if (debug_modes) {
            if (output->probed_modes != NULL) {
                xf86DrvMsg(scrn->scrnIndex, X_INFO,
                           "Printing probed modes for output %s\n",
@@ -1777,7 +1778,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int 
maxY)
            mode->VRefresh = xf86ModeVRefresh(mode);
            xf86SetModeCrtc(mode, INTERLACE_HALVE_V);
 
-           if (config->debug_modes)
+           if (debug_modes)
                xf86PrintModeline(scrn->scrnIndex, mode);
        }
     }
@@ -2909,6 +2910,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr 
edid_mon)
     ScrnInfoPtr                scrn = output->scrn;
     xf86CrtcConfigPtr  config = XF86_CRTC_CONFIG_PTR(scrn);
     int                        i;
+    Bool               debug_modes = config->debug_modes || xf86Initalising;
 #ifdef RANDR_12_INTERFACE
     int                        size;
 #endif
@@ -2918,7 +2920,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr 
edid_mon)
     
     output->MonInfo = edid_mon;
 
-    if (config->debug_modes) {
+    if (debug_modes) {
        xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n",
                   output->name);
        xf86PrintEDID(edid_mon);
-- 
1.6.4.4

_______________________________________________
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel