- Remove the 2048 limit code. using the DRI beyond 2048 has yet to cause any

problems that I've heard of (other than getting an empty window) and the
"no2048limit" option generally caused confusion.
- Update the radeon man page: fix spelling mistakes, update IGP 3D status.

3 files changed, 34 insertions, 49 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
index 1f089ce93..24e771550 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.h
@@ -580,7 +580,6 @@ typedef struct {
     Bool		AtLeastOneNonClone;
     int			MergedFBXDPI, MergedFBYDPI;
     Bool		NoVirtual;
-    Bool		No2048Limit;
 
 } RADEONInfoRec, *RADEONInfoPtr;
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man
index 8662495b7..feab52c19 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon.man
@@ -29,16 +29,16 @@ Radeon 7200
 Radeon 7000(VE), M6
 .TP 12
 .B RS100
-Radeon IGP320(M) (2D only)
+Radeon IGP320(M)
 .TP 12
 .B RV200
 Radeon 7500, M7, FireGL 7800
 .TP 12
 .B RS200
-Radeon IGP330(M)/IGP340(M) (2D only)
+Radeon IGP330(M)/IGP340(M)
 .TP 12
 .B RS250
-Radeon Mobility 7000 IGP (2D only)
+Radeon Mobility 7000 IGP
 .TP 12
 .B R200
 Radeon 8500, 9100, FireGL 8800/8700
@@ -47,7 +47,7 @@ Radeon 8500, 9100, FireGL 8800/8700
 Radeon 9000PRO/9000, M9
 .TP 12
 .B RS300
-Radeon 9100 IGP (2D only)
+Radeon 9100 IGP
 .TP 12
 .B RV280
 Radeon 9200PRO/9200/9200SE, M9+
@@ -178,7 +178,7 @@ BIOS   \-\- Remain unchanged from BIOS setting.
 .br 
 HIGH   \-\- Force to the highest priority. 
           Use this if you have problem with above options.
-          This may affect performence slightly.
+          This may affect performance slightly.
 .br 
 The default value is
 .B AUTO.
@@ -195,7 +195,7 @@ CRT    \-\- Analog CRT monitor
 .br 
 TMDS   \-\- Desktop flat panel
 .br 
-LVDS   \-\- Lapto flat panel
+LVDS   \-\- Laptop flat panel
 .br
 This option can be used in following format:
 .br
@@ -213,7 +213,7 @@ DVI port on DVI+VGA cards
 .br 
 LCD output on laptops
 .br 
-Internal TMDS prot on DVI+DVI cards
+Internal TMDS port on DVI+DVI cards
 .br 
 .B Secondary head:
 .br 
@@ -239,7 +239,7 @@ determined by the
 keyword defined on the
 .B Screen
 section of your XF86Config file.  It works just like regular virtual
-desktop accept you have two viewports looking into it instead of one.
+desktop except you have two viewports looking into it instead of one.
 .br
 For example, if you wanted a desktop composed of two 1024x768 viewports
 looking into a single desktop you would create a virtual desktop of 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
index 6949c94bc..b9d47cca6 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
@@ -153,8 +153,7 @@ typedef enum {
     OPTION_NORADEONXINERAMA,
     OPTION_CRT2ISSCRN0,
     OPTION_DISP_PRIORITY,
-    OPTION_PANEL_SIZE,
-    OPTION_NO2048LIMIT
+    OPTION_PANEL_SIZE
 } RADEONOpts;
 
 const OptionInfoRec RADEONOptions[] = {
@@ -192,7 +191,6 @@ const OptionInfoRec RADEONOptions[] = {
     { OPTION_CRT2ISSCRN0,    "MergedXineramaCRT2IsScreen0", OPTV_BOOLEAN, {0}, FALSE },
     { OPTION_DISP_PRIORITY,  "DisplayPriority",  OPTV_ANYSTR,  {0}, FALSE },
     { OPTION_PANEL_SIZE,     "PanelSize",        OPTV_ANYSTR,  {0}, FALSE },
-    { OPTION_NO2048LIMIT,    "No2048Limit",      OPTV_BOOLEAN, {0}, FALSE },
     { -1,                    NULL,               OPTV_NONE,    {0}, FALSE }
 };
 
@@ -4389,36 +4387,33 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	    xf86DrvMsg(scrnIndex, X_WARNING,
 		       "Direct rendering not yet supported on "
 		       "Radeon 9500 and newer cards\n");
-	} else {
-	    if (info->IsSecondary)
-		info->directRenderingEnabled = FALSE;
-	    else {
-		/* Xinerama has sync problem with DRI, disable it for now */
-		if (xf86IsEntityShared(info->pEnt->index)) {
-		    info->directRenderingEnabled = FALSE;
-	            xf86DrvMsg(scrnIndex, X_WARNING,
-			       "Direct Rendering Disabled -- "
-			       "Dual-head configuration is not working with "
-			       "DRI at present.\n"
-			       "Please use the radeon MergedFB option if you "
-			       "want Dual-head with DRI.\n");
-		} else if ( pScrn->virtualX > 2048 || pScrn->virtualY > 2048 ) {
-        	    if (info->No2048Limit) {
-	    		info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
-            		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+	} else if (info->IsSecondary) {
+	    info->directRenderingEnabled = FALSE;
+	} else if (xf86IsEntityShared(info->pEnt->index)) {
+	    /* Xinerama has sync problem with DRI, disable it for now */
+	    info->directRenderingEnabled = FALSE;
+	    xf86DrvMsg(scrnIndex, X_WARNING,
+			"Direct Rendering Disabled -- "
+			"Dual-head configuration is not working with "
+			"DRI at present.\n"
+			"Please use the radeon MergedFB option if you "
+			"want Dual-head with DRI.\n");
+#if 0
+	} else if ( pScrn->virtualX > 2048 || pScrn->virtualY > 2048 ) {
+            if (info->No2048Limit) {
+	    	info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
+            	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 	    		"DRI forced on with virtual screen of greater than 2048.\n");
-        	    } else {
-                        info->directRenderingEnabled = FALSE;
-                        xf86DrvMsg(scrnIndex, X_WARNING,
-                               "Direct Rendering Disabled -- "
-                               "Virtual resolution exceeds 2048 "
-                               "(hardware limitation)\n");
-		    }
-		} else {
-		    info->directRenderingEnabled =
-			RADEONDRIScreenInit(pScreen);
-		}
+            } else {
+                info->directRenderingEnabled = FALSE;
+                xf86DrvMsg(scrnIndex, X_WARNING,
+                            "Direct Rendering Disabled -- "
+                            "Virtual resolution exceeds 2048 "
+                            "(hardware limitation)\n");
 	    }
+#endif
+	} else {
+	    info->directRenderingEnabled = RADEONDRIScreenInit(pScreen);
 	}
     }
 #endif
@@ -7305,15 +7300,6 @@ RADEONGetMergedFBOptions(ScrnInfoPtr pScrn)
     info->CRT2IsScrn0 = FALSE;
     info->CRT2Position = radeonClone;
     info->MergedFBXDPI = info->MergedFBYDPI = 0;
-    info->No2048Limit = FALSE;
-
-    if (xf86GetOptValBool(info->Options, OPTION_NO2048LIMIT, &val)) {
-        if (val) {
-            info->No2048Limit = TRUE;
-        } else {
-            info->No2048Limit = FALSE;
-        }
-    }
 
     if (info->MergeType == MT_NONE) {
 	info->MergedFB = FALSE;