Attachment 65629 Details for Bug 18028 – Patch against xf86-video-sis-0.10.4

[patch] Patch against xf86-video-sis-0.10.4

xf86-video-sis-jan-bug-18028.patch (text/plain), 2.58 KB, created by Jan Lindemann on 2012-08-16 06:36:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Lindemann

Created: 2012-08-16 06:36:28 UTC

Size: 2.58 KB

patch

obsolete

># see https://bugs.freedesktop.org/show_bug.cgi?id=18028 for the bug this patch fixes
>--- xf86-video-sis-0.10.4.orig/src/sis_driver.c	2012-03-24 03:52:44.000000000 +0100
>+++ xf86-video-sis-0.10.4/src/sis_driver.c	2012-08-15 14:58:38.662556982 +0200
>@@ -7344,7 +7344,12 @@
>         if(pSiSEnt->MapCountIOBase) {
> 	    pSiSEnt->MapCountIOBase--;
> 	    if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
>+
>+#ifndef XSERVER_LIBPCIACCESS
> 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
>+#else
>+	        pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
>+#endif
> 		pSiSEnt->IOBase = NULL;
> 		pSiSEnt->MapCountIOBase = 0;
> 		pSiSEnt->forceUnmapIOBase = FALSE;
>@@ -7355,7 +7360,11 @@
> 	if(pSiSEnt->MapCountIOBaseDense) {
> 	    pSiSEnt->MapCountIOBaseDense--;
> 	    if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) {
>+#ifndef XSERVER_LIBPCIACCESS
> 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
>+#else
>+		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
>+#endif
> 		pSiSEnt->IOBaseDense = NULL;
> 		pSiSEnt->MapCountIOBaseDense = 0;
> 		pSiSEnt->forceUnmapIOBaseDense = FALSE;
>@@ -7366,7 +7375,11 @@
> 	if(pSiSEnt->MapCountFbBase) {
> 	    pSiSEnt->MapCountFbBase--;
> 	    if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
>+#ifndef XSERVER_LIBPCIACCESS
> 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
>+#else
>+		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
>+#endif
> 		pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
> 		pSiSEnt->MapCountFbBase = 0;
> 		pSiSEnt->forceUnmapFbBase = FALSE;
>@@ -7376,14 +7389,28 @@
> 	}
>     } else {
> #endif
>+#ifndef XSERVER_LIBPCIACCESS
> 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
>+#else
>+	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
>+#endif
> 	pSiS->IOBase = NULL;
> #ifdef __alpha__
>+#ifndef XSERVER_LIBPCIACCESS
> 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
>+#else
>+	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
>+#endif
> 	pSiS->IOBaseDense = NULL;
> #endif
>+
>+#ifndef XSERVER_LIBPCIACCESS
> 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
>+#else
>+	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
>+#endif
> 	pSiS->FbBase = pSiS->RealFbBase = NULL;
>+
> #ifdef SISDUALHEAD
>     }
> #endif

Actions: View | Splinter Review

Attachments on bug 18028: 19601 | 65629

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.