rpms/xorg-x11-drv-ati/devel radeon-6.9.0-remove-limit-heuristics.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.112, 1.113 radeon-6.9.0-fb-size.patch, 1.2, NONE

[Soren Sandmann Pedersen]

Author: ssp

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.9.0-remove-limit-heuristics.patch 
Removed Files:
	radeon-6.9.0-fb-size.patch 
Log Message:
Remove fb size patch; add patch to remove size range heuristics

radeon-6.9.0-remove-limit-heuristics.patch:

--- NEW FILE radeon-6.9.0-remove-limit-heuristics.patch ---
diff -up xf86-video-ati-6.9.0/src/radeon_driver.c.orig xf86-video-ati-6.9.0/src/radeon_driver.c
--- xf86-video-ati-6.9.0/src/radeon_driver.c.orig	2008-09-11 09:58:15.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_driver.c	2008-09-11 09:58:40.000000000 -0400
@@ -2932,32 +2932,41 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
 	    if (crtc_max_Y > 8192)
 		crtc_max_Y = 8192;
 	} else {
+
 	    /*
-	     * note that these aren't really the CRTC limits, they're just
-	     * heuristics until we have a better memory manager.
+	     * <ssp> In radeon_driver.c it says:
+	     *        *
+	     *        * note that these aren't really the CRTC limits, they're just
+	     *        * heuristics until we have a better memory manager.
+	     *	      *
+	     *	  then it goes on to heuristically assign numbers to crtc_max_X/Y
+	     *        I think that's wrong because xf86InitialConfiguration will already pick a
+	     *	  reasonable value for xf86CrtcSetSizeRange() - there is no need for driver
+	     *	  heuristics. So I think it should just set the size range to whatever the crtc
+	     *	  limits are. Does anyone know the actual values?
+	     * <ajax> depends on whether your front buffer is tiled
+	     * <ssp>  Ah, so info->MaxSurfaceWidth would be a resonable setting
+	     * <ajax> 3968 if it is.  otherwise i think it's 8k for r500+ and 4k for previous
+	     * <ssp>  Cool, I'll patch it to do something like that in Fedora then
+	     * <ajax> ta
+	     *
 	     */
-	    if (pScrn->videoRam <= 16384) {
-		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 {
-		crtc_max_X = 2048;
-		crtc_max_Y = 1200;
-	}
+	    if (info->allowColorTiling) {
+		crtc_max_X = info->MaxSurfaceWidth;
+		crtc_max_Y = info->MaxLines;
+	    }
+	    else {
+               if (IS_AVIVO_VARIANT) {
+		    crtc_max_X = 8192;
+		    crtc_max_Y = 8192;
+		}
+		else {
+		    crtc_max_X = 4096;
+		    crtc_max_Y = 4096;
+		}
+	    }
 	}
-	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);
 	


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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xorg-x11-drv-ati.spec	10 Sep 2008 17:48:04 -0000	1.112
+++ xorg-x11-drv-ati.spec	11 Sep 2008 17:25:35 -0000	1.113
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   12%{?dist}
+Release:   13%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -18,7 +18,7 @@
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-suspend-fix.patch
 Patch3:	    radeon-fix-pipe-config.patch
-Patch4:	    radeon-6.9.0-fb-size.patch
+Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 
 ExcludeArch: s390 s390x
 
@@ -41,7 +41,7 @@
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .suspend
 %patch3 -p1 -b .pipe-config
-%patch4 -p1 -b .fb-size
+%patch4 -p1 -b .remove-limit-heuristics
 
 %build
 autoreconf
@@ -73,6 +73,11 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 6.9.0-13
+- Remove the fb size hack since there is a fix in the server now.
+- Unfortunately, the driver prevents this fix from working by applying 
+  its own heuristics. Remove those.
+
 * 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 DELETED ---