rpms/xorg-x11-drv-cirrus/devel cirrus-pciaccess.patch, 1.1, 1.2 xorg-x11-drv-cirrus.spec, 1.18, 1.19

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	cirrus-pciaccess.patch xorg-x11-drv-cirrus.spec 
Log Message:
* Mon Jan 21 2008 Dave Airlie <airlied at redhat.com> - 1.1.0-7
- make cirrus work with pciaccess in qemu


cirrus-pciaccess.patch:

Index: cirrus-pciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-cirrus/devel/cirrus-pciaccess.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cirrus-pciaccess.patch	17 Jan 2008 06:02:09 -0000	1.1
+++ cirrus-pciaccess.patch	21 Jan 2008 08:49:44 -0000	1.2
@@ -38,7 +38,7 @@
  cirrus_alpine_la_LTLIBRARIES = cirrus_alpine.la
  cirrus_alpine_la_LDFLAGS = -module -avoid-version
 diff --git a/src/alp_driver.c b/src/alp_driver.c
-index 6d17b37..dd06845 100644
+index 6d17b37..a282c21 100644
 --- a/src/alp_driver.c
 +++ b/src/alp_driver.c
 @@ -56,8 +56,13 @@
@@ -55,7 +55,17 @@
  #include "fb.h"
  
  
-@@ -570,9 +575,9 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -346,7 +351,8 @@ AlpCountRam(ScrnInfoPtr pScrn)
+     
+     /* Map the Alp memory and MMIO areas */
+     pCir->FbMapSize = 1024*1024; /* XX temp */
+-    pCir->IoMapSize = 0x4000;	/* 16K for moment */
++    if (!pCir->IoMapSize)
++    	pCir->IoMapSize = 0x4000;	/* 16K for moment */
+     if (!CirMapMem(pCir, pScrn->scrnIndex))
+ 	return 0;
+ 
+@@ -570,9 +576,9 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  	pCir->Chipset = pCir->pEnt->chipset;
  	/* Find the PCI info for this screen */
  	pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
@@ -68,7 +78,7 @@
  
      if (xf86LoadSubModule(pScrn, "int10")) {
  	xf86LoaderReqSymLists(int10Symbols,NULL);
-@@ -583,8 +588,9 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -583,8 +589,9 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  	 * This is a hack: We restore the PCI base regs as some Colorgraphic
  	 * BIOSes tend to mess them up
  	 */
@@ -80,7 +90,7 @@
  	
      }
  
-@@ -684,7 +690,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -684,7 +691,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
  			pCir->ChipRev);
  	} else {
@@ -89,7 +99,7 @@
  	}
  
  	/* Find the frame buffer base address */
-@@ -698,10 +704,10 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -698,10 +705,10 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  		pCir->FbAddress = pCir->pEnt->device->MemBase;
  		from = X_CONFIG;
  	} else {
@@ -102,7 +112,7 @@
  			from = X_PROBED;
  		} else {
  			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -724,8 +730,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -724,8 +731,9 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  	    pCir->IOAddress = pCir->pEnt->device->IOBase;
  		from = X_CONFIG;
  	} else {
@@ -110,10 +120,11 @@
 -			pCir->IOAddress = pCir->PciInfo->memBase[1] & 0xfffff000;
 +		if (PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM) != 0) {
 +			pCir->IOAddress = PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM) & 0xfffff000;
++			pCir->IoMapSize = PCI_REGION_SIZE(pCir->PciInfo, 1);
  			from = X_PROBED;
  		} else {
  			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -1082,6 +1088,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1082,6 +1090,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  
  	/* Load bpp-specific modules */
  	switch (pScrn->bitsPerPixel) {
@@ -121,7 +132,7 @@
  	case 1:  
  	    if (xf86LoadSubModule(pScrn, "xf1bpp") == NULL) {
  	        AlpFreeRec(pScrn);
-@@ -1089,6 +1096,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1089,6 +1098,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  	    } 
  	    xf86LoaderReqSymbols("xf1bppScreenInit",NULL);
  	    break;
@@ -130,7 +141,7 @@
  	case 4:  
  	    if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
  	        AlpFreeRec(pScrn);
-@@ -1096,6 +1105,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -1096,6 +1107,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  	    } 
  	    xf86LoaderReqSymbols("xf4bppScreenInit",NULL);	    
  	    break;
@@ -138,7 +149,7 @@
  	case 8:
  	case 16:
  	case 24:
-@@ -1575,18 +1585,22 @@ AlpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -1575,18 +1587,22 @@ AlpScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
  	 */
  
  	switch (pScrn->bitsPerPixel) {


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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- xorg-x11-drv-cirrus.spec	17 Jan 2008 06:05:24 -0000	1.18
+++ xorg-x11-drv-cirrus.spec	21 Jan 2008 08:49:44 -0000	1.19
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 cirrus video driver
 Name:      xorg-x11-drv-cirrus
 Version:   1.1.0
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -61,6 +61,9 @@
 %{_mandir}/man4/cirrus.4*
 
 %changelog
+* Mon Jan 21 2008 Dave Airlie <airlied at redhat.com> - 1.1.0-7
+- make cirrus work with pciaccess in qemu
+
 * Thu Jan 17 2008 Dave Airlie <airlied at redhat.com> - 1.1.0-6
 - update for new server build and pciaccess