rpms/xorg-x11-drv-openchrome/devel openchrome-0.2.901-VM800_xv_LCD.patch, NONE, 1.1 openchrome-0.2.901-libpciaccess.patch, 1.3, 1.4 xorg-x11-drv-openchrome.spec, 1.10, 1.11

Xavier Bachelot (xavierb) fedora-extras-commits at redhat.com
Thu Mar 6 21:53:22 UTC 2008


Author: xavierb

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

Modified Files:
	openchrome-0.2.901-libpciaccess.patch 
	xorg-x11-drv-openchrome.spec 
Added Files:
	openchrome-0.2.901-VM800_xv_LCD.patch 
Log Message:
* Thu Mar 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-8
- Add patch to fix XV on LCD for VM800.
- Improved libpciaccess patch.


openchrome-0.2.901-VM800_xv_LCD.patch:

--- NEW FILE openchrome-0.2.901-VM800_xv_LCD.patch ---
--- src/via_swov.c
+++ src/via_swov.c
@@ -1728,5 +1728,6 @@
      * Enable video on secondary 
      */
-    if (pVia->Chipset == VIA_P4M900 && pVia->pBIOSInfo->PanelActive) {
+    if ((pVia->Chipset == VIA_P4M900 || pVia->Chipset == VIA_VM800)
+        && pVia->pBIOSInfo->PanelActive) {
         /* V1_ON_SND_DISPLAY */
         vidCtl |= 0x80000000;

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openchrome-0.2.901-libpciaccess.patch	10 Jan 2008 20:57:05 -0000	1.3
+++ openchrome-0.2.901-libpciaccess.patch	6 Mar 2008 21:53:16 -0000	1.4
@@ -353,16 +353,6 @@
  
      if (!VIAMapMMIO(pScrn)) {
  	VIAFreeRec(pScrn);
-@@ -1407,7 +1483,9 @@
-     xf86DrvMsg(pScrn->scrnIndex, X_INFO, 
- 	       "...Finished parsing config file options.\n");
- 
-+#ifndef XSERVER_LIBPCIACCESS
-     ViaCheckCardId(pScrn);   
-+#endif
- 
-     /* Read memory bandwidth from registers */
-     pVia->MemClk = hwp->readCrtc(hwp, 0x3D) >> 4;
 @@ -1440,6 +1518,65 @@
          return FALSE;
      }
@@ -686,43 +676,33 @@
 +#define VIA_MEMBASE(p,n)  (p)->regions[(n)].base_addr
 +#define VENDOR_ID(p)      (p)->vendor_id
 +#define DEVICE_ID(p)      (p)->device_id
-+#define SUBVENDOR_ID(p)          (p)->subvendor_id
++#define SUBVENDOR_ID(p)   (p)->subvendor_id
 +#define SUBSYS_ID(p)      (p)->subdevice_id
 +#define CHIP_REVISION(p)  (p)->revision
 +#else
 +#define VIA_MEMBASE(p,n)  (p)->memBase[n]
 +#define VENDOR_ID(p)      (p)->vendor
 +#define DEVICE_ID(p)      (p)->chipType
-+#define SUBVENDOR_ID(p)          (p)->subsysVendor
++#define SUBVENDOR_ID(p)   (p)->subsysVendor
 +#define SUBSYS_ID(p)      (p)->subsysCard
 +#define CHIP_REVISION(p)  (p)->chipRev
 +#endif
 +
  #endif /* _VIA_H_ */
-diff -Naur src/via_id.c src/via_id.c
---- src/via_id.c	2008-01-02 18:58:44.000000000 +0100
-+++ src/via_id.c	2008-01-10 12:20:18.000000000 +0100
-@@ -212,6 +212,10 @@
-     hwp->writeCrtc(hwp, 0x4F, tmp);
- }
- 
-+/*
-+ *
-+ */
-+#ifndef XSERVER_LIBPCIACCESS
- void
- ViaCheckCardId(ScrnInfoPtr pScrn)
- {
-@@ -238,4 +242,4 @@
- 	       pVia->PciInfo->chipType, pVia->PciInfo->subsysVendor, pVia->PciInfo->subsysCard);
-     pVia->Id = NULL;
- }
--
-+#endif
 diff -Naur ChangeLog ChangeLog
 --- ChangeLog	2008-01-02 19:31:02.000000000 +0100
 +++ ChangeLog	2008-01-10 12:20:18.000000000 +0100
-@@ -1,3 +1,11 @@
+@@ -1,3 +1,21 @@
++2008-03-06  Jon Nettleton  <jon-dot-nettleton-at-gmail-dot-com>
++
++	* src/via.h:
++	* src/via_driver.c: (VIAPreInit):
++	* src/via_id.c: (ViaCheckCardId):
++
++	Switched ViaCheckCardId to use the macros defined in 
++	via.h.  This allows it to work with libpciaccess enabled
++	xorg servers as well as legacy versions.
++
 +2007-12-31  Jon Nettleton  <jon-dot-nettleton-at-gmail-dot-com>
 +
 +	* src/via_driver.c: (VIAPreInit), (VIAMapMMIO):
@@ -734,3 +714,25 @@
  2007-10-29  Benno Schulenberg  <bensberg-at-justemail-dot-net>
  
  	* src/via_driver.c: (VIAPreInit):
+--- src/via_id.c	2008-03-06 20:30:31.000000000 +0100
++++ src/via_id.c	2008-03-06 22:25:29.000000000 +0100
+@@ -227,15 +255,15 @@
+     struct ViaCardIdStruct *Id;
+     VIAPtr pVia = VIAPTR(pScrn);
+     
+-    if ((pVia->PciInfo->subsysVendor == pVia->PciInfo->vendor) &&
+-	(pVia->PciInfo->subsysCard == pVia->PciInfo->chipType))
++    if ((SUBVENDOR_ID(pVia->PciInfo) == VENDOR_ID(pVia->PciInfo)) &&
++	(SUBSYS_ID(pVia->PciInfo) == DEICE_ID(pVia->PciInfo)))
+         xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+                    "Manufacturer plainly copied main PCI IDs to subsystem/card IDs.\n");
+ 
+     for (Id = ViaCardId; Id->String; Id++) {
+ 	if ((Id->Chip == pVia->Chipset) && 
+-	    (Id->Vendor == pVia->PciInfo->subsysVendor) &&
+-	    (Id->Device == pVia->PciInfo->subsysCard)) {
++	    (Id->Vendor == SUBVENDOR_ID(pVia->PciInfo)) &&
++	    (Id->Device == SUBSYS_ID(pVia->PciInfo))) {
+ 	    xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected %s.\n", Id->String);
+ 	    pVia->Id = Id;
+ 	    return;


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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-openchrome.spec	20 Feb 2008 07:02:25 -0000	1.10
+++ xorg-x11-drv-openchrome.spec	6 Mar 2008 21:53:16 -0000	1.11
@@ -9,7 +9,7 @@
 Summary:	Xorg X11 openchrome video driver
 Name:		xorg-x11-drv-openchrome
 Version:	0.2.901
-Release:	7%{?dist}
+Release:	8%{?dist}
 URL:		http://www.openchrome.org
 License:	MIT
 Group:		User Interface/X Hardware Support
@@ -21,6 +21,7 @@
 Patch1:         openchrome-0.2.901-libpciaccess.patch
 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
 ExclusiveArch:	%{ix86} x86_64
 
 BuildRequires:	pkgconfig
@@ -57,6 +58,7 @@
 %patch1 -p0 -b .libpciaccess
 %patch2 -p0 -b .xf86memcpy
 %patch3 -p0 -b .P4M900_fifo
+%patch4 -p0 -b .VM800_xv_LCD
 
 %build
 autoreconf
@@ -105,6 +107,10 @@
 
 
 %changelog
+* Thu Mar 06 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.901-8
+- Add patch to fix XV on LCD for VM800.
+- Improved libpciaccess patch.
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.901-7
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list