rpms/xorg-x11-drv-r128/devel r128-6.8.1-panel-hack.patch, NONE, 1.1 xorg-x11-drv-r128.spec, 1.6, 1.7

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-r128.spec 
Added Files:
	r128-6.8.1-panel-hack.patch 
Log Message:
* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 6.8.1-2
- r128-6.8.1-panel-hack.patch: Set sync ranges based on panel size.


r128-6.8.1-panel-hack.patch:
 r128_driver.c |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE r128-6.8.1-panel-hack.patch ---
diff -up xf86-video-r128-6.8.1/src/r128_driver.c.jx xf86-video-r128-6.8.1/src/r128_driver.c
--- xf86-video-r128-6.8.1/src/r128_driver.c.jx	2009-07-28 01:15:42.000000000 -0400
+++ xf86-video-r128-6.8.1/src/r128_driver.c	2009-09-18 16:56:54.000000000 -0400
@@ -1700,7 +1700,22 @@ static Bool R128PreInitModes(ScrnInfoPtr
                 R128SetSyncRangeFromEdid(pScrn, 1);
             if(pScrn->monitor->nVrefresh <= 0)
                 R128SetSyncRangeFromEdid(pScrn, 0);
-        }
+        } else if (info->PanelXRes && info->PanelYRes) {
+	    DisplayModePtr mode = xf86CVTMode(info->PanelXRes, info->PanelYRes,
+					      60, 1, 0);
+
+	    pScrn->monitor->nHsync = 1;
+	    pScrn->monitor->hsync[0].lo = 31.5;
+	    pScrn->monitor->hsync[0].hi =
+		(float)mode->Clock / (float)mode->HTotal;
+	    pScrn->monitor->nVrefresh = 1;
+	    pScrn->monitor->vrefresh[0].lo = 56.0;
+	    pScrn->monitor->vrefresh[0].hi =
+		(float)mode->Clock*1000.0 / (float)mode->HTotal /
+		(float)mode->VTotal;
+
+	    xfree(mode);
+	}
 
         modesFound = xf86ValidateModes(pScrn,
 				   pScrn->monitor->Modes,


Index: xorg-x11-drv-r128.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-r128/devel/xorg-x11-drv-r128.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xorg-x11-drv-r128.spec	4 Aug 2009 05:17:05 -0000	1.6
+++ xorg-x11-drv-r128.spec	18 Sep 2009 20:58:29 -0000	1.7
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 r128 video driver
 Name:      xorg-x11-drv-r128
 Version:   6.8.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   r128.xinf
 
+Patch0:	    r128-6.8.1-panel-hack.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
@@ -30,6 +32,7 @@ X.Org X11 r128 video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .panel
 
 %build
 # aclocal ; automake -a ; autoconf
@@ -57,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/r128.4*
 
 %changelog
+* Fri Sep 18 2009 Adam Jackson <ajax at redhat.com> 6.8.1-2
+- r128-6.8.1-panel-hack.patch: Set sync ranges based on panel size.
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.8.1-1
 - r128 6.8.1