rpms/xorg-x11-drv-openchrome/F-10 openchrome-0.2.903-fix_bltsize.patch, NONE, 1.1 openchrome-0.2.903-sync_pciids.patch, 1.1, 1.2 xorg-x11-drv-openchrome.spec, 1.31, 1.32
Xavier Bachelot
xavierb at fedoraproject.org
Tue Dec 30 01:40:12 UTC 2008
Author: xavierb
Update of /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19134
Modified Files:
openchrome-0.2.903-sync_pciids.patch
xorg-x11-drv-openchrome.spec
Added Files:
openchrome-0.2.903-fix_bltsize.patch
Log Message:
Fix for RHBZ#446489
openchrome-0.2.903-fix_bltsize.patch:
--- NEW FILE openchrome-0.2.903-fix_bltsize.patch ---
Index: src/via_driver.c
===================================================================
--- src/via_driver.c (revision 683)
+++ src/via_driver.c (revision 696)
@@ -2343,8 +2343,7 @@
err = pci_device_map_range(pVia->PciInfo,
pVia->MmioBase + VIA_MMIO_BLTBASE,
VIA_MMIO_BLTSIZE,
- (PCI_DEV_MAP_FLAG_WRITABLE
- | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
+ PCI_DEV_MAP_FLAG_WRITABLE,
(void **)&pVia->BltBase);
if (err) {
@@ -2446,7 +2445,8 @@
#ifdef XSERVER_LIBPCIACCESS
err = pci_device_map_range(pVia->PciInfo, pVia->FrameBufferBase,
pVia->videoRambytes,
- PCI_DEV_MAP_FLAG_WRITABLE,
+ (PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE),
(void **)&pVia->FBBase);
if (err) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
Index: src/via_accel.c
===================================================================
--- src/via_accel.c (revision 684)
+++ src/via_accel.c (revision 696)
@@ -1284,7 +1284,7 @@
xaaptr->SetupForImageWrite = viaSetupForImageWrite;
xaaptr->SubsequentImageWriteRect = viaSubsequentImageWriteRect;
xaaptr->ImageWriteBase = pVia->BltBase;
- xaaptr->ImageWriteRange = VIA_MMIO_BLTSIZE;
+ xaaptr->ImageWriteRange = (64 * 1024);
return XAAInit(pScreen, xaaptr);
openchrome-0.2.903-sync_pciids.patch:
Index: openchrome-0.2.903-sync_pciids.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-10/openchrome-0.2.903-sync_pciids.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openchrome-0.2.903-sync_pciids.patch 28 Aug 2008 20:01:43 -0000 1.1
+++ openchrome-0.2.903-sync_pciids.patch 30 Dec 2008 01:40:12 -0000 1.2
@@ -1,6 +1,24 @@
---- src/via_id.c
-+++ src/via_id.c
-@@ -158,6 +158,7 @@
+Index: src/via_id.c
+===================================================================
+--- src/via_id.c (.../tags/release_0_2_903/src/via_id.c) (revision 696)
++++ src/via_id.c (.../trunk/src/via_id.c) (revision 696)
+@@ -87,6 +87,7 @@
+ {"Asustek K8V-MX", VIA_K8M800, 0x1043, 0x8129, VIA_DEVICE_CRT},
+ {"Mitac 8399", VIA_K8M800, 0x1071, 0x8399, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV}, /* aka "Pogolinux Konabook 3100" */
+ {"Mitac 8889", VIA_K8M800, 0x1071, 0x8889, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
++ {"MSI K8M Neo-V (broken pci id)", VIA_K8M800, 0x1106, 0x0204, VIA_DEVICE_CRT},
+ {"VIA VT3108 (K8M800)", VIA_K8M800, 0x1106, 0x3108, VIA_DEVICE_CRT}, /* borrowed by Asustek A8V-MX */
+ {"Shuttle FX21", VIA_K8M800, 0x1297, 0x3052, VIA_DEVICE_CRT},
+ {"Shuttle FX83", VIA_K8M800, 0x1297, 0xF683, VIA_DEVICE_CRT | VIA_DEVICE_TV},
+@@ -113,6 +114,7 @@
+ {"Packard Bell Imedia 2097", VIA_K8M800, 0x1631, 0xD007, VIA_DEVICE_CRT},
+ {"Fujitsu-Siemens Amilo K7610", VIA_K8M800, 0x1734, 0x10B3, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"ASRock K8Upgrade-VM800", VIA_K8M800, 0x1849, 0x3108, VIA_DEVICE_CRT},
++ {"Axper XP-M8VM800", VIA_K8M800, 0x1940, 0xD000, VIA_DEVICE_CRT},
+
+ /*** PM800, PM880, PN800, CN400 ***/
+ {"VIA VT3118 (PM800)", VIA_PM800, 0x1106, 0x3118, VIA_DEVICE_CRT}, /* borrowed by ECS PM800-M2 */
+@@ -158,6 +160,7 @@
{"Asustek P5V800-MX", VIA_VM800, 0x3344, 0x1122, VIA_DEVICE_CRT},
/*** K8M890 ***/
@@ -8,7 +26,14 @@
{"Asustek A8V-VM", VIA_K8M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
{"Asustek M2V-MX SE", VIA_K8M890, 0x1043, 0x8297, VIA_DEVICE_CRT},
{"Foxconn K8M890M2MA-RS2H", VIA_K8M890, 0x105B, 0x0C84, VIA_DEVICE_CRT},
-@@ -196,6 +197,7 @@
+@@ -190,12 +193,13 @@
+ {"ASRock P4VM900-SATA2", VIA_P4M900, 0x1849, 0x3371, VIA_DEVICE_CRT},
+
+ /*** CX700 ***/
+- {"VIA VT8454B", VIA_CX700, 0x0908, 0x1975, VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
++ {"VIA VT8454B", VIA_CX700, 0x0908, 0x1975, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /* Evaluation board, reference possibly wrong */
+ {"VIA VT3324 (CX700)", VIA_CX700, 0x1106, 0x3157, VIA_DEVICE_CRT},
+ {"MSI Fuzzy CX700/CX700D", VIA_CX700, 0x1462, 0x8020, VIA_DEVICE_CRT | VIA_DEVICE_LCD | VIA_DEVICE_TV},
{"Samsung Q1B", VIA_CX700, 0x144D, 0xC02C, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"FIC CE260", VIA_CX700, 0x1509, 0x2D30, VIA_DEVICE_LCD},
{"FIC CE261", VIA_CX700, 0x1509, 0x2F07, VIA_DEVICE_LCD},
@@ -16,3 +41,11 @@
{"Packard Bell EasyNote XS", VIA_CX700, 0x1631, 0xC201, VIA_DEVICE_LCD}, /* aka Everex Cloudbook CE1200V */
/*** P4M890, VN890 ***/
+@@ -204,6 +208,7 @@
+ {"Asustek P5V-VM ULTRA", VIA_P4M890, 0x1043, 0x81B5, VIA_DEVICE_CRT},
+ {"Asustek P5V-VM DH", VIA_P4M890, 0x1043, 0x81CE, VIA_DEVICE_CRT},
+ {"Mitac 8615", VIA_P4M890, 0x1071, 0x8615, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
++ {"Mitac 8624 (Joybook R41E)", VIA_P4M890, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"VIA VT3343 (P4M890)", VIA_P4M890, 0x1106, 0x3343, VIA_DEVICE_CRT},
+ {"MSI P4M890M-L/IL (MS-7255)", VIA_P4M890, 0x1462, 0x7255, VIA_DEVICE_CRT},
+ {"Biostar P4M890-M7 TE", VIA_P4M890, 0x1565, 0x1207, VIA_DEVICE_CRT},
Index: xorg-x11-drv-openchrome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-openchrome/F-10/xorg-x11-drv-openchrome.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xorg-x11-drv-openchrome.spec 28 Aug 2008 20:01:43 -0000 1.31
+++ xorg-x11-drv-openchrome.spec 30 Dec 2008 01:40:12 -0000 1.32
@@ -9,7 +9,7 @@
Summary: Xorg X11 openchrome video driver
Name: xorg-x11-drv-openchrome
Version: 0.2.903
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.openchrome.org
License: MIT
Group: User Interface/X Hardware Support
@@ -20,6 +20,7 @@
# Patches from upstream trunk :
Patch1: openchrome-0.2.903-sync_pciids.patch
+Patch2: openchrome-0.2.903-fix_bltsize.patch
# Fedora specific patches :
Patch100: openchrome-0.2.903-re_enable_AGPDMA.patch
# Experimental patches (branch backport, etc...):
@@ -61,6 +62,7 @@
%prep
%setup -q -n %{tarball}-%{version}
%patch1 -p0 -b .pciids
+%patch2 -p0 -b .bltsize
%patch100 -p0 -b .agpdma
%patch200 -p0 -b .panel
@@ -111,6 +113,9 @@
%changelog
+* Mon Dec 29 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.903-2
+- Fix for RHBZ#446489.
+
* Wed Aug 20 2008 Xavier Bachelot <xavier AT bachelot DOT org> - 0.2.903-1
- Update to 0.2.903.
More information about the fedora-extras-commits
mailing list