rpms/xorg-x11-drv-cirrus/devel cirrus-1.2.0-qemu.patch, NONE, 1.1 xorg-x11-drv-cirrus.spec, 1.25, 1.26

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-cirrus.spec 
Added Files:
	cirrus-1.2.0-qemu.patch 
Log Message:
* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 1.2.0-5
- cirrus-1.2.0-qemu.patch: Detect qemu virtual video when we can, and default
  to 1024x768 in that case. (#251264)


cirrus-1.2.0-qemu.patch:

--- NEW FILE cirrus-1.2.0-qemu.patch ---
diff -up xf86-video-cirrus-1.2.0/src/alp_driver.c.jx xf86-video-cirrus-1.2.0/src/alp_driver.c
--- xf86-video-cirrus-1.2.0/src/alp_driver.c.jx	2008-03-19 10:29:23.000000000 -0400
+++ xf86-video-cirrus-1.2.0/src/alp_driver.c	2009-02-27 10:59:27.000000000 -0500
@@ -812,6 +812,20 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
      else
  	xf86SetDDCproperties(pScrn,xf86PrintEDID(
  	    xf86DoEDID_DDC2(pScrn->scrnIndex,pCir->I2CPtr1)));
+#ifdef XSERVER_LIBPCIACCESS
+     if (!pScrn->monitor->DDC &&
+	 pCir->PciInfo->subvendor_id & 0xffff == 0x1af4) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+		   "Defaulting to 1024x768 for QEMU\n");
+	pScrn->monitor->nHsync = 1;
+	pScrn->monitor->hsync[0].lo = 31.5;
+	pScrn->monitor->hsync[0].hi = 48.0;
+	pScrn->monitor->nVrefresh = 1;
+	pScrn->monitor->vrefresh[0].lo = 56.0;
+	pScrn->monitor->vrefresh[0].hi = 60.1;
+	pScrn->monitor->maxPixClock = 65000;
+     }
+#endif
  
      /* Probe the possible LCD display */
      AlpProbeLCD(pScrn);


Index: xorg-x11-drv-cirrus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/xorg-x11-drv-cirrus.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xorg-x11-drv-cirrus.spec	26 Feb 2009 10:43:51 -0000	1.25
+++ xorg-x11-drv-cirrus.spec	27 Feb 2009 16:01:12 -0000	1.26
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.2.0
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,6 +16,8 @@
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   cirrus.xinf
 
+Patch0:	    cirrus-1.2.0-qemu.patch
+
 BuildRequires: xorg-x11-server-sdk >= 1.5.99.902
 BuildRequires: xorg-x11-util-macros >= 1.1.5
 
@@ -27,6 +29,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .qemu
 
 %build
 %configure --disable-static
@@ -56,6 +59,10 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 1.2.0-5
+- cirrus-1.2.0-qemu.patch: Detect qemu virtual video when we can, and default
+  to 1024x768 in that case. (#251264)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild