rpms/xorg-x11-drv-ati/devel radeon-6.12.1-r600-fb-size.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.173, 1.174

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.12.1-r600-fb-size.patch 
Log Message:
* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 6.12.1-10
- radeon-6.12.1-r600-fb-size.patch: Bump fb size max on R600+ when no KMS
  so single-link dualhead stands a chance of working.


radeon-6.12.1-r600-fb-size.patch:

--- NEW FILE radeon-6.12.1-r600-fb-size.patch ---
diff -up xf86-video-ati-6.12.1/src/radeon_driver.c.jx xf86-video-ati-6.12.1/src/radeon_driver.c
--- xf86-video-ati-6.12.1/src/radeon_driver.c.jx	2009-04-09 11:40:31.000000000 -0400
+++ xf86-video-ati-6.12.1/src/radeon_driver.c	2009-04-09 11:52:43.000000000 -0400
@@ -3089,6 +3089,15 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
 	    } else if (IS_R300_VARIANT) {
 		crtc_max_X = 2560;
 		crtc_max_Y = 1200;
+	    } else if (pScrn->ChipFamily >= CHIP_FAMILY_R600) {
+		/* no kms, but also no 3d, so be a little aggressive */
+		if (pScrn->videoRam >= 128 * 1024) {
+		    crtc_max_X = 4096;
+		    crtc_max_y = 1920;
+		} else {
+		    crtc_max_X = 2560; 
+		    crtc_max_Y = 1920;
+		}
 	    } else if (IS_AVIVO_VARIANT) {
 		crtc_max_X = 2560;
 		crtc_max_Y = 1600;


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.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- xorg-x11-drv-ati.spec	7 Apr 2009 01:40:30 -0000	1.173
+++ xorg-x11-drv-ati.spec	9 Apr 2009 15:54:20 -0000	1.174
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,7 @@
 #Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
 Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
+Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
 ExcludeArch: s390 s390x
 
@@ -47,6 +48,7 @@
 #patch4 -p1 -b .remove-limit-heuristics
 #%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
+%patch7 -p1 -b .r600-fb-size
 
 %build
 autoreconf -iv
@@ -78,6 +80,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 6.12.1-10
+- radeon-6.12.1-r600-fb-size.patch: Bump fb size max on R600+ when no KMS
+  so single-link dualhead stands a chance of working.
+
 * Tue Apr 07 2009 Dave Airlie <airlied at redhat.com> 6.12.1-9
 - cache mmaps for objects until remove time.