[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-xorg
Subject:    mergedfb broken with xorg-server-1.2.0
From:       Gilles Dartiguelongue <dartigug () esiee ! fr>
Date:       2007-01-28 17:26:00
Message-ID: 1170005160.4598.4.camel () su ! perronet ! esiee ! net
[Download RAW message or body]

Hi list,

I've updated to xorg-server-1.2.0 yesterday and found it broke my
mergedfb setup with r200. So I did a bisect and found that commit
d89fee68d0e49211871cd9eb3893ed55c1d478a6 is first bad commit

commit d89fee68d0e49211871cd9eb3893ed55c1d478a6
Author: Adam Jackson <ajax@benzedrine.nwnk.net>
Date:   Thu Sep 14 18:41:15 2006 -0400

    Record the maximum dot clock of the monitor, and filter by it.

I did a simple patch that reverts the changes and now xorg-server works
as expected. I'm open to better solutions and be happy to help settle
this.

-- 
Gilles Dartiguelongue <dartigug@esiee.fr>

["xorg.patch" (xorg.patch)]

--- hw/xfree86/common/xf86Config.c.old	2007-01-28 13:11:47.000000000 +0100
+++ hw/xfree86/common/xf86Config.c	2007-01-28 13:12:02.000000000 +0100
@@ -2243,7 +2243,6 @@
     monitorp->widthmm = conf_monitor->mon_width;
     monitorp->heightmm = conf_monitor->mon_height;
     monitorp->reducedblanking = FALSE;
-    monitorp->maxPixClock = 0;
     monitorp->options = conf_monitor->mon_option_lst;
 
     /*
--- hw/xfree86/common/xf86Mode.c.old	2007-01-28 13:12:49.000000000 +0100
+++ hw/xfree86/common/xf86Mode.c	2007-01-28 13:13:13.000000000 +0100
@@ -837,9 +837,6 @@
         }
     }
 
-    if ((monitor->maxPixClock) && (mode->Clock > monitor->maxPixClock))
-	return MODE_CLOCK_HIGH;
-
     return MODE_OK;
 }
 
--- hw/xfree86/common/xf86str.h.old	2007-01-28 13:13:53.000000000 +0100
+++ hw/xfree86/common/xf86str.h	2007-01-28 13:14:16.000000000 +0100
@@ -213,7 +213,6 @@
     pointer		options;
     pointer		DDC;
     Bool                reducedblanking; /* Allow CVT reduced blanking modes? */
-    int			maxPixClock;	 /* in kHz, like mode->Clock */
 } MonRec, *MonPtr;
 
 /* the list of clock ranges */
--- hw/xfree86/ddc/ddcProperty.c.old	2007-01-28 13:14:48.000000000 +0100
+++ hw/xfree86/ddc/ddcProperty.c	2007-01-28 13:15:37.000000000 +0100
@@ -302,7 +302,7 @@
 xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC)
 {
     DisplayModePtr Modes = NULL, Mode;
-    int i, clock;
+    int i;
     Bool have_hsync = FALSE, have_vrefresh = FALSE;
     int preferred;
     
@@ -364,11 +364,6 @@
 		xf86DrvMsg(scrnIndex, X_INFO,
 			"Using vrefresh ranges from config file\n");
 	    }
-
-	    clock = DDC->det_mon[i].section.ranges.max_clock * 1000;
-	    if (clock > Monitor->maxPixClock)
-		Monitor->maxPixClock = clock;
-
             break;
         case DT:
             Mode = DDCModeFromDetailedTiming(scrnIndex, 


[prev in list] [next in list] [prev in thread] [next in thread]