rpms/xorg-x11-drv-ati/devel radeon-6.9.0-fb-size.patch, 1.1, 1.2 xorg-x11-drv-ati.spec, 1.111, 1.112

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2341

Modified Files:
	radeon-6.9.0-fb-size.patch xorg-x11-drv-ati.spec 
Log Message:
* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 6.9.0-12
- Do the fb size hack a differently bad way.


radeon-6.9.0-fb-size.patch:

Index: radeon-6.9.0-fb-size.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.9.0-fb-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- radeon-6.9.0-fb-size.patch	8 Sep 2008 19:20:47 -0000	1.1
+++ radeon-6.9.0-fb-size.patch	10 Sep 2008 17:48:04 -0000	1.2
@@ -1,56 +1,27 @@
 diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.jx xf86-video-ati-6.9.0/src/radeon_driver.c
---- xf86-video-ati-6.9.0/src/radeon_driver.c.jx	2008-09-08 14:17:30.000000000 -0400
-+++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-08 14:44:15.000000000 -0400
-@@ -2713,6 +2713,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
-     xf86Int10InfoPtr  pInt10 = NULL;
-     void *int10_save = NULL;
-     const char *s;
-+    int crtc_min_X = 320, crtc_min_Y = 200;
-     int crtc_max_X, crtc_max_Y;
-     RADEONEntPtr pRADEONEnt;
-     DevUnion* pPriv;
-@@ -2936,19 +2937,25 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
- 	     * note that these aren't really the CRTC limits, they're just
- 	     * heuristics until we have a better memory manager.
- 	     */
--	    if (pScrn->videoRam <= 16384) {
-+	    if (pScrn->videoRam <= 32768) {
- 		crtc_max_X = 1600;
- 		crtc_max_Y = 1200;
--	    } else if (IS_R300_VARIANT) {
--		crtc_max_X = 2560;
--		crtc_max_Y = 1200;
--	    } else if (IS_AVIVO_VARIANT) {
--		crtc_max_X = 2560;
--		crtc_max_Y = 1600;
-+	    } else if (pScrn->videoRam <= 65536) {
-+		crtc_min_X = 3360;
-+		crtc_min_Y = 1050;
-+		crtc_max_X = 3968;
-+		crtc_max_Y = 1440;
+--- xf86-video-ati-6.9.0/src/radeon_driver.c.jx	2008-09-10 13:03:42.000000000 -0400
++++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-10 13:16:02.000000000 -0400
+@@ -2948,16 +2948,14 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
  	    } else {
--		crtc_max_X = 2048;
--		crtc_max_Y = 1200;
--	}
-+		crtc_min_X = 3840;
-+		crtc_min_Y = 1200;
-+		if (IS_AVIVO_VARIANT) {
-+		    crtc_max_X = 5120;
-+		    crtc_max_Y = 1600;
-+		} else {
-+		    crtc_max_X = 3968;
-+		    crtc_max_Y = 1440;
-+		}
+ 		crtc_max_X = 2048;
+ 		crtc_max_Y = 1200;
++	    }
++
++	    if (pScrn->videoRam > 65536) {
++		pScrn->display->virtualX = 3840;
++		pScrn->display->virtualY = 1200;
 +	    }
  	}
- 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Max desktop size set to %dx%d\n",
- 		   crtc_max_X, crtc_max_Y);
-@@ -2959,7 +2966,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
- 		   "reduce the desktop size by adjusting the Virtual line to your xorg.conf\n");
- 	
+-	}
+-	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");
+-	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+-		   "If you are having trouble with 3D, "
+-		   "reduce the desktop size by adjusting the 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);
-+	xf86CrtcSetSizeRange (pScrn, crtc_min_X, crtc_min_Y, crtc_max_X, crtc_max_Y);
+ 	xf86CrtcSetSizeRange (pScrn, 320, 200, crtc_max_X, crtc_max_Y);
  	
- 	RADEONPreInitDDC(pScrn);
- 


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- xorg-x11-drv-ati.spec	9 Sep 2008 19:20:18 -0000	1.111
+++ xorg-x11-drv-ati.spec	10 Sep 2008 17:48:04 -0000	1.112
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -73,6 +73,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Sep 10 2008 Adam Jackson <ajax at redhat.com> 6.9.0-12
+- Do the fb size hack a differently bad way.
+
 * Tue Sep  9 2008 Kristian Høgsberg <krh at redhat.com> 6.9.0-11
 - Restore CFLAGS after testing for DRM_MODE in radeon-modeset.patch.