rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-libpciaccess.patch, 1.7, 1.8 xorg-x11-drv-openchrome.spec, 1.16, 1.17

Xavier Bachelot (xavierb) fedora-extras-commits at redhat.com
Mon Mar 10 00:32:59 UTC 2008


Author: xavierb

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

Modified Files:
	openchrome-0.2.901-libpciaccess.patch 
	xorg-x11-drv-openchrome.spec 
Log Message:
- Revert to last good version of the libpciaccess patch.

openchrome-0.2.901-libpciaccess.patch:

Index: openchrome-0.2.901-libpciaccess.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/openchrome-0.2.901-libpciaccess.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openchrome-0.2.901-libpciaccess.patch	8 Mar 2008 20:36:47 -0000	1.7
+++ openchrome-0.2.901-libpciaccess.patch	10 Mar 2008 00:32:56 -0000	1.8
@@ -187,11 +187,11 @@
 +++ src/via_id.c	2008-03-06 22:25:29.000000000 +0100
 @@ -30,6 +30,7 @@
  #endif
- 
+
  #include "via_driver.h"
 +#include "via.h"
  #include "via_id.h"
- 
+
  /*
 @@ -218,15 +218,15 @@
      struct ViaCardIdStruct *Id;
@@ -222,8 +222,9 @@
      pVia->Id = NULL;
  }
  
+diff -Naur src/via_driver.c src/via_driver.c
 --- src/via_driver.c	2008-01-02 18:58:40.000000000 +0100
-+++ src/via_driver.c	2008-03-07 22:39:15.000000000 +0100
++++ src/via_driver.c	2008-01-10 12:37:37.000000000 +0100
 @@ -50,7 +50,30 @@
  
  /* Prototypes. */
@@ -434,52 +435,158 @@
      }
  
      if (pVia->Chipset == VIA_CLE266)
-@@ -968,18 +1081,33 @@
-     switch (pVia->Chipset) {
-         case VIA_CLE266:
-         case VIA_KM400:
+@@ -961,52 +1074,6 @@
+ 
+     xf86DrvMsg(pScrn->scrnIndex, from, "Chipset revision: %d\n", pVia->ChipRev);
+ 
+-    xfree(pEnt);
+-
+-    /* Detect the amount of installed RAM */
+-    from = X_PROBED;
+-    switch (pVia->Chipset) {
+-        case VIA_CLE266:
+-        case VIA_KM400:
+-            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
+-            break;
+-        case VIA_PM800:
+-        case VIA_VM800:
+-        case VIA_K8M800:
+-            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
+-            break;
+-        case VIA_K8M890:
+-        case VIA_P4M890:
+-        case VIA_P4M900:
+-        case VIA_CX700:
+-            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
+-            break;
+-        default:
+-            if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {
+-                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-                           "Using old memory-detection method.\n");
+-                bMemSize = hwp->readSeq(hwp, 0x39);
+-                if (bMemSize > 16 && bMemSize <= 128)
+-                    pScrn->videoRam = (bMemSize + 1) << 9;
+-                else if (bMemSize > 0 && bMemSize < 31)
+-                    pScrn->videoRam = bMemSize << 12;
+-                else {
+-                    from = X_DEFAULT;
+-                    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-                               "Memory size detection failed: using 16 MB.\n");
+-                    pScrn->videoRam = 16 << 10;
+-                }
+-            } else {
+-                from = X_DEFAULT;
+-                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-                           "No memory-detection done.  Use VideoRAM option.\n");
+-            }
+-    }
+-
+-    if (from == X_PROBED)
+-        xf86DrvMsg(pScrn->scrnIndex, from,
+-                   "Probed amount of VideoRAM = %d kB\n", pScrn->videoRam);
+-
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
+ 	       "Setting up default chipset options...\n");
+     if (!VIASetupDefaultOptions(pScrn)) {
+@@ -1019,9 +1086,16 @@
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
+ 	       "Starting to parse config file options...\n");
+ 
+-    if (xf86GetOptValInteger(VIAOptions, OPTION_VIDEORAM, &pScrn->videoRam))
+-        xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-                   "Setting amount of VideoRAM to %d kB\n", pScrn->videoRam);
++    pScrn->videoRam = pEnt->device->videoRam;
++    from = xf86GetOptValInteger(VIAOptions, OPTION_VIDEORAM,
++				&pScrn->videoRam) ? 
++	X_CONFIG : X_PROBED;
++    xf86DrvMsg(pScrn->scrnIndex, from, "VideoRAM is set to %d kB\n",
++               pScrn->videoRam);
++    if (pScrn->videoRam != pEnt->device->videoRam)
++        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                   "Detected VideoRAM was %d kB!\n", pEnt->device->videoRam);
++    xfree(pEnt);
+ 
+     //pVia->shadowFB = FALSE;
+     from = xf86GetOptValBool(VIAOptions, OPTION_SHADOW_FB, &pVia->shadowFB) ? 
+@@ -1378,8 +1452,10 @@
+ 
+     /* maybe throw in some more sanity checks here */
+ 
++#if !XSERVER_LIBPCIACCESS
+     pVia->PciTag = pciTag(pVia->PciInfo->bus, pVia->PciInfo->device,
+                           pVia->PciInfo->func);
++#endif
+ 
+     if (!VIAMapMMIO(pScrn)) {
+ 	VIAFreeRec(pScrn);
+@@ -1440,6 +1518,66 @@
+         return FALSE;
+     }
+ 
++    from = X_PROBED;
++
++    /* Detect the amount of installed RAM */
++    switch (pVia->Chipset) {
++        case VIA_CLE266:
++        case VIA_KM400:
 +#if XSERVER_LIBPCIACCESS
 +            pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xE1);
 +            pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 10 ;
 +#else
-             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
++            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 0), 0xE1) & 0x70 ) >> 4 ) ) << 10 ;
++            break;
 +#endif
-             break;
-         case VIA_PM800:
-         case VIA_VM800:
-         case VIA_K8M800:
++        case VIA_PM800:
++        case VIA_VM800:
++        case VIA_K8M800:
 +#if XSERVER_LIBPCIACCESS
 +            pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xA1);
 +            pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 10 ;
 +#else
-             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
++            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 10 ;
++            break;
 +#endif
-             break;
-         case VIA_K8M890:
-         case VIA_P4M890:
-         case VIA_P4M900:
-         case VIA_CX700:
++        case VIA_K8M890:
++        case VIA_P4M890:
++        case VIA_P4M900:
++        case VIA_CX700:
 +#if XSERVER_LIBPCIACCESS
 +            pci_device_cfg_read_u32 (bridge, & pScrn->videoRam, 0xA1);
 +            pScrn->videoRam = (1 << ( ( pScrn->videoRam & 0x70) >> 4 )) << 12 ;
 +#else
-             pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
++            pScrn->videoRam = ( 1 << ( ( pciReadByte(pciTag(0, 0, 3), 0xA1) & 0x70 ) >> 4 ) ) << 12 ;
++            break;
 +#endif
-             break;
-         default:
-             if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {
-@@ -1378,8 +1506,10 @@
- 
-     /* maybe throw in some more sanity checks here */
- 
-+#if !XSERVER_LIBPCIACCESS
-     pVia->PciTag = pciTag(pVia->PciInfo->bus, pVia->PciInfo->device,
-                           pVia->PciInfo->func);
-+#endif
- 
-     if (!VIAMapMMIO(pScrn)) {
- 	VIAFreeRec(pScrn);
-@@ -2046,26 +2176,74 @@
++        default:
++            if (pScrn->videoRam < 16384 || pScrn->videoRam > 65536) {
++                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                          "Using old memory-detection method.\n");
++                bMemSize = hwp->readSeq(hwp, 0x39);
++                if (bMemSize > 16 && bMemSize <= 128)
++                    pScrn->videoRam = (bMemSize + 1) << 9;
++                else if (bMemSize > 0 && bMemSize < 31)
++                    pScrn->videoRam = bMemSize << 12;
++                else {
++                    from = X_DEFAULT;
++                    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                               "Memory size detection failed: using 16 MB.\n");
++                    pScrn->videoRam = 16 << 10;
++                }
++            } else {
++                from = X_DEFAULT;
++                xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++                          "No memory-detection done.  Use VideoRAM option.\n");
++            }
++    }
++
++    if (from == X_PROBED)
++        xf86DrvMsg(pScrn->scrnIndex, from, "Probed VideoRAM = %d kB\n",
++                   pScrn->videoRam);
++
+     /* Split FB for SAMM */
+     /* FIXME: For now, split FB into two equal sections. This should
+      *        be able to be adjusted by user with a config option. */
+@@ -2046,26 +2183,74 @@
  VIAMapMMIO(ScrnInfoPtr pScrn)
  {
      VIAPtr pVia = VIAPTR(pScrn);
@@ -559,7 +666,7 @@
  
      if (!pVia->MapBase || !pVia->BltBase) {
          xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -2111,6 +2289,9 @@
+@@ -2111,6 +2296,9 @@
  VIAMapFB(ScrnInfoPtr pScrn)
  {
      VIAPtr pVia = VIAPTR(pScrn);
@@ -569,7 +676,7 @@
  
      DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAMapFB\n"));
      xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
-@@ -2125,6 +2306,7 @@
+@@ -2125,6 +2313,7 @@
  	 * in the OS support layer.
  	 */
  
@@ -577,7 +684,7 @@
          unsigned char *tmp; 
          tmp = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
  			    pVia->PciTag, pVia->FrameBufferBase,
-@@ -2143,10 +2325,24 @@
+@@ -2143,10 +2332,24 @@
          xf86UnMapVidMem(pScrn->scrnIndex, (pointer)tmp,
                          pVia->videoRambytes);
  
@@ -602,7 +709,7 @@
          pVia->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
                                       pVia->PciTag, pVia->FrameBufferBase,
                                       pVia->videoRambytes);
-@@ -2156,6 +2352,7 @@
+@@ -2156,6 +2359,7 @@
                         "Internal error: could not map framebuffer\n");
              return FALSE;
          }
@@ -610,7 +717,7 @@
  
          pVia->FBFreeStart = (pScrn->displayWidth * pScrn->bitsPerPixel >> 3) *
                              pScrn->virtualY;
-@@ -2166,7 +2363,11 @@
+@@ -2166,7 +2370,11 @@
                     pVia->FBBase, pVia->FBFreeStart, pVia->FBFreeEnd);
      }
  
@@ -622,7 +729,7 @@
      pScrn->fbOffset = 0;
      if(pVia->IsSecondary) pScrn->fbOffset = pScrn->videoRam << 10;
  
-@@ -2184,6 +2385,16 @@
+@@ -2184,6 +2392,16 @@
      /* Disable MMIO */
      ViaSeqMask(VGAHWPTR(pScrn), 0x1A, 0x00, 0x60);
  
@@ -639,7 +746,7 @@
      if (pVia->MapBase)
          xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pVia->MapBase, VIA_MMIO_REGSIZE);
  
-@@ -2192,6 +2403,7 @@
+@@ -2192,6 +2410,7 @@
  
      if (pVia->FBBase)
          xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pVia->FBBase, pVia->videoRambytes);


Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/devel/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-openchrome.spec	9 Mar 2008 18:06:00 -0000	1.16
+++ xorg-x11-drv-openchrome.spec	10 Mar 2008 00:32:56 -0000	1.17
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.901
-Release:	13%{?dist}
+Release:	14%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -22,7 +22,6 @@
 Patch2:         openchrome-0.2.901-replace_xf86memcpy.patch
 Patch3:         openchrome-0.2.901-P4M900_fifo_settings.patch
 Patch4:         openchrome-0.2.901-VM800_xv_LCD.patch
-Patch5:         openchrome-0.2.901-old_memory_detection.patch
 ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pkgconfig
@@ -62,7 +61,6 @@
 %patch2 -p0 -b .xf86memcpy
 %patch3 -p0 -b .P4M900_fifo
 %patch4 -p0 -b .VM800_xv_LCD
-%patch5 -p0 -R -b .old_memory-detection
 
 %build
 autoreconf
@@ -111,6 +109,9 @@
 
 
 %changelog
+* Sun Mar 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-14
+- Revert to last good version of the libpciaccess patch.
+
 * Sun Mar 09 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-13
 - Temporarily revert to old memory detection method. We need something that
   works out of the box for F9 Beta.




More information about the fedora-extras-commits mailing list