xf86-video-ati: Branch 'master' - 2 commits

[Alex Deucher]

 src/radeon_driver.c |   21 +++++++++++++++++++--
 src/radeon_output.c |    2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
diff-tree 056ca6bb5adf974290693b55de6cd6880d2132d1 (from 13fd53286bdda2c55683bdb5f63e7d345f6c63ef)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Thu Aug 23 20:19:47 2007 -0400

    RADEON: NONE to None to match other port info

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 90a2c92..1f38b3b 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -77,7 +77,7 @@ const char *TMDSTypeName[4] = {
 };
 
 const char *DDCTypeName[6] = {
-  "NONE",
+  "None",
   "MONID",
   "DVI_DDC",
   "VGA_DDC",
diff-tree 13fd53286bdda2c55683bdb5f63e7d345f6c63ef (from 53bad86ca48a9b6529c1f0989ee568d9d48841c6)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Thu Aug 23 20:17:51 2007 -0400

    RADEON: set (hopefully) reasonable default max desktop sizes
    
    Based on the amount of vram.  We really need ttm...

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 469e7bc..c6c7845 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2772,9 +2772,26 @@ _X_EXPORT Bool RADEONPreInit(ScrnInfoPtr
 		crtc_max_Y = 8192;
 	}
     } else {
-	crtc_max_X = 1600;
-	crtc_max_Y = 1200;
+	if (pScrn->videoRam < 16384) {
+	    crtc_max_X = 1600;
+	    crtc_max_Y = 1200;
+	} else if (pScrn->videoRam <= 32768) {
+	    crtc_max_X = 2048;
+	    crtc_max_Y = 1200;
+	} else if (pScrn->videoRam > 32768) {
+	    if (IS_R300_VARIANT) {
+		crtc_max_X = 2560;
+		crtc_max_Y = 2048;
+	    } else {
+		crtc_max_X = 2048;
+		crtc_max_Y = 2048;
+	    }
+	}
     }
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Max desktop size set to %dx%d\n",
+	       crtc_max_X, crtc_max_Y);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	       "For a larger or smaller max desktop size, add a Virtual line to your xorg.conf\n");
 
     /*xf86CrtcSetSizeRange (pScrn, 320, 200, info->MaxSurfaceWidth, info->MaxLines);*/
     xf86CrtcSetSizeRange (pScrn, 320, 200, crtc_max_X, crtc_max_Y);