hi all
tested on my laptop with sis671 onborard
patch x17
diff -Naur srcori/sis_driver.c src/sis_driver.c
--- xf86-video-sis-0.9.1/src/sis_driver.c 2015-04-01 19:27:34.000000000 +0000
+++ src/sis_driver.c 2015-04-01 18:22:35.000000000 +0000
@@ -3204,9 +3204,12 @@
pSiS->PciBus = PCI_CFG_BUS(pSiS->PciInfo);
pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo);
pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo);
- pSiS->PciTag = pciTag( PCI_DEV_BUS(pSiS->PciInfo),
- PCI_DEV_DEV(pSiS->PciInfo),
- PCI_DEV_FUNC(pSiS->PciInfo));
+
+#ifndef XSERVER_LIBPCIACCESS
+ pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo),
+ PCI_DEV_DEV(pSiS->PciInfo),
+ PCI_DEV_FUNC(pSiS->PciInfo));
+#endif
#ifdef SIS_NEED_MAP_IOP
/********************************************/
@@ -4047,7 +4050,9 @@
#endif
memset(pSiS->SiS_Pr, 0, sizeof(struct SiS_Private));
+#ifndef XSERVER_LIBPCIACCESS
pSiS->SiS_Pr->PciTag = pSiS->PciTag;
+#endif
pSiS->SiS_Pr->ChipType = pSiS->ChipType;
pSiS->SiS_Pr->ChipRevision = pSiS->ChipRev;
pSiS->SiS_Pr->SiS_Backup70xx = 0xff;
@@ -6048,7 +6053,9 @@
SISMapMem(ScrnInfoPtr pScrn)
{
SISPtr pSiS = SISPTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
int mmioFlags = VIDMEM_MMIO;
+#endif
#ifdef SISDUALHEAD
SISEntPtr pSiSEnt = pSiS->entityPrivate;
#endif
diff -Naur srcori/sis.h src/sis.h
--- xf86-video-sis-0.9.1/src/sis.h 2015-04-01 19:27:34.000000000 +0000
+++ src/sis.h 2015-04-01 18:11:00.000000000 +0000
@@ -1046,9 +1046,10 @@
struct pci_device *PciInfo;
#else
pciVideoPtr PciInfo;
+ PCITAG PciTag;
#endif
- PCITAG PciTag;
+
int PciBus, PciDevice, PciFunc;
EntityInfoPtr pEnt;
diff -Naur srcori/vgatypes.h src/vgatypes.h
--- xf86-video-sis-0.9.1/src/vgatypes.h 2007-05-30 02:12:02.000000000 +0000
+++ src/vgatypes.h 2015-03-27 12:41:28.000000000 +0000
@@ -80,14 +80,14 @@
#endif
#endif
-#ifdef SIS_XORG_XF86
-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
+//#ifdef SIS_XORG_XF86
+//#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
typedef unsigned long IOADDRESS;
typedef unsigned long SISIOADDRESS;
-#else
+//#else
typedef IOADDRESS SISIOADDRESS;
-#endif
-#endif
+//#endif
+//#endif
typedef enum _SIS_CHIP_TYPE {
SIS_VGALegacy = 0,
diff -Naur srcori/vstruct.h src/vstruct.h
--- xf86-video-sis-0.9.1/src/vstruct.h 2009-01-09 14:15:52.000000000 +0000
+++ src/vstruct.h 2015-04-01 18:09:04.000000000 +0000
@@ -241,8 +241,10 @@
unsigned char ChipType;
unsigned char ChipRevision;
#ifdef SIS_XORG_XF86
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
#endif
+#endif
#ifdef SIS_LINUX_KERNEL
void *ivideo;
#endif
Search Criteria
Package Details: xf86-video-sisimedia 0.9.1-10
Package Actions
- View PKGBUILD
- Download tarball
- Search wiki
- Flagged out-of-date (2015-04-01)
| Package Base: | xf86-video-sisimedia |
|---|---|
| Description: | X.org SiS 671 video driver |
| Upstream URL: | http://www.linuxconsulting.ro/xorg-drivers/ |
| Category: | x11 |
| Licenses: | |
| Conflicts: | |
| Submitter: | lordheavy |
| Maintainer: | None |
| Last Packager: | lordheavy |
| Votes: | 0 |
| First Submitted: | 2015-02-15 10:43 |
| Last Updated: | 2015-02-15 10:43 |
Dependencies (4)
- glibc
- X-ABI-VIDEODRV_VERSION=19 (make)
- xf86dgaproto (make)
- xorg-server-devel (make)
Required by (0)
Sources
- 0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
- 0002-Remove-XFree86-Misc-PassMessage-support.patch
- 0003-Fix-build-with-Werror-format-security.patch
- 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
- 0005-Correct-bounds-check-of-blitClip-array-access.patch
- 0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
- 0006-Add-IgnoreHotkeyFlag-driver-option.patch
- 0007-Remove-useless-loader-symbol-lists.patch
- 0008-update-to-xextproto-7-1-support.patch
- 0009-update-for-rac-removal.patch
- 0010-change-to-use-abi-version-check.patch
- 0011-more-rac-removal.patch
- COPYING
- deprecated-sym2.patch
- disable-UploadToScreen-DownloadFromScreen.patch
- fix-xv-crash.patch
- https://sources.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
- pciTag-removal-workaround.patch
- remove_mibstore.h.patch
- sisimedia-no-xaa.patch
- sisimedia-xorg-1.13.patch
- swap-func-rename.patch
- sync-with-freedesktop.patch
- Untangle-XF86DRI.patch
- xf86-video-sis-0.9.1-20102701.patch
- xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
- xf86MapDomainMemory-pci_device_map_legacy.patch
- xserver112.patch
- xserver19.patch