rpms/xorg-x11-drv-ati/devel radeon-6.9.0-panel-size-sanity.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.113, 1.114

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-ati.spec 
Added Files:
	radeon-6.9.0-panel-size-sanity.patch 
Log Message:
* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 6.9.0-14
- radeon-6.9.0-panel-size-sanity.patch: Panels smaller than 800x480 are
  highly implausible, disable them if we find them.  If you have one,
  you can force it with Option "PanelSize".


radeon-6.9.0-panel-size-sanity.patch:

--- NEW FILE radeon-6.9.0-panel-size-sanity.patch ---
diff -up xf86-video-ati-6.9.0/src/radeon_output.c.jx xf86-video-ati-6.9.0/src/radeon_output.c
--- xf86-video-ati-6.9.0/src/radeon_output.c.jx	2008-09-11 15:31:28.000000000 -0400
+++ xf86-video-ati-6.9.0/src/radeon_output.c	2008-09-11 15:41:33.000000000 -0400
@@ -1972,14 +1972,18 @@ RADEONGetLVDSInfo (xf86OutputPtr output)
     RADEONOutputPrivatePtr radeon_output = output->driver_private;
     char* s;
 
-    if (!RADEONGetLVDSInfoFromBIOS(output))
-	RADEONGetPanelInfoFromReg(output);
-
     if ((s = xf86GetOptValString(info->Options, OPTION_PANEL_SIZE))) {
 	radeon_output->PanelPwrDly = 200;
 	if (sscanf (s, "%dx%d", &radeon_output->PanelXRes, &radeon_output->PanelYRes) != 2) {
-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Invalid PanelSize option: %s\n", s);
-	    RADEONGetPanelInfoFromReg(output);
+	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Invalid PanelSize option: %s, disabling the panel\n", s);
+	    return FALSE;
+	}
+    } else if (!RADEONGetLVDSInfoFromBIOS(output)) {
+	RADEONGetPanelInfoFromReg(output);
+	if (radeon_output->PanelXRes < 800 || radeon_output->PanelYRes < 480) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+		       "Implausible panel size, disabling\n");
+	    return FALSE;
 	}
     }
 


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.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- xorg-x11-drv-ati.spec	11 Sep 2008 17:25:35 -0000	1.113
+++ xorg-x11-drv-ati.spec	11 Sep 2008 19:44:55 -0000	1.114
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -19,6 +19,7 @@
 Patch2:     radeon-suspend-fix.patch
 Patch3:	    radeon-fix-pipe-config.patch
 Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
+Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 
 ExcludeArch: s390 s390x
 
@@ -42,6 +43,7 @@
 %patch2 -p1 -b .suspend
 %patch3 -p1 -b .pipe-config
 %patch4 -p1 -b .remove-limit-heuristics
+%patch5 -p1 -b .panel-size
 
 %build
 autoreconf
@@ -73,6 +75,11 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Sep 11 2008 Adam Jackson <ajax at redhat.com> 6.9.0-14
+- radeon-6.9.0-panel-size-sanity.patch: Panels smaller than 800x480 are
+  highly implausible, disable them if we find them.  If you have one,
+  you can force it with Option "PanelSize".
+
 * 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