Attachment 363715 Details for Bug 441070

[patch] Patch against xf86-video-mga-1.4.11 from OpenSuSE 11.3 milestone6

mga-xinerama.diff (text/plain), 5.95 KB, created by Christian Bronk on 2010-05-21 07:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Bronk

Created: 2010-05-21 07:20:08 UTC

Size: 5.95 KB

patch

obsolete

>diff -Nur src.orig/mga.h src/mga.h
>--- src.orig/mga.h	2009-07-28 02:24:51.000000000 +0200
>+++ src/mga.h	2010-05-21 08:48:14.681866904 +0200
>@@ -333,6 +333,13 @@
>     int			mastervideoRam;
>     int			slavevideoRam;
>     Bool		directRenderingEnabled;
>+
>+    void  *		mappedIOBase;
>+    int			mappedIOUsage;
>+
>+    void  *		mappedILOADBase;
>+    int			mappedILOADUsage;
>+
>     ScrnInfoPtr 	pScrn_1;
>     ScrnInfoPtr 	pScrn_2;
> } MGAEntRec, *MGAEntPtr;
>diff -Nur src.orig/mga_driver.c src/mga_driver.c
>--- src.orig/mga_driver.c	2010-05-21 08:47:07.375867537 +0200
>+++ src/mga_driver.c	2010-05-21 08:48:19.474870036 +0200
>@@ -2809,30 +2809,49 @@
> #ifdef XSERVER_LIBPCIACCESS
>     struct pci_device *const dev = pMga->PciInfo;
>     struct pci_mem_region *region;
>-    void **memory[2];
>     int i, err;
> #endif
> 
> 
>     if (!pMga->FBDev) {
> #ifdef XSERVER_LIBPCIACCESS
>-        memory[pMga->io_bar] = &pMga->IOBase;
>-        memory[pMga->framebuffer_bar] = &pMga->FbBase;
> 
>-        for (i = 0; i < 2; i++) {
>-            region = &dev->regions[i];
>+	    pciaddr_t fbaddr = pMga->FbAddress;
>+	    pciaddr_t fbsize = pMga->FbMapSize;
>             err = pci_device_map_range(dev,
>-                                       region->base_addr, region->size,
>-                                       PCI_DEV_MAP_FLAG_WRITABLE,
>-                                       memory[i]);
>-
>+				   fbaddr, fbsize,
>+				   PCI_DEV_MAP_FLAG_WRITABLE,
>+				   (void **)&pMga->FbBase);
>             if (err) {
>                 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>-                           "Unable to map BAR %i.  %s (%d)\n",
>-                           i, strerror(err), err);
>+                           "Unable to map Framebuffer %08llX %llx.  %s (%d)\n", (long long)fbaddr, (long long)fbsize, strerror(err), err);
>                 return FALSE;
>-            }
>-        }
>+	    }
>+		
>+	if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedIOUsage == 0)
>+	{
>+		region = &dev->regions[pMga->io_bar];
>+		err = pci_device_map_range(dev,
>+				   region->base_addr, region->size,
>+				   PCI_DEV_MAP_FLAG_WRITABLE,
>+				   &pMga->IOBase);
>+
>+		if (err) {
>+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>+				   "Unable to map IO Region %i.  %s (%d)\n",
>+				   pMga->io_bar, strerror(err), err);
>+			return FALSE;
>+		}
>+		if(pMga->entityPrivate != NULL)
>+		{
>+			pMga->entityPrivate->mappedIOBase = pMga->IOBase;
>+		}
>+	}
>+	else
>+		pMga->IOBase = pMga->entityPrivate->mappedIOBase;
>+
>+	if(pMga->entityPrivate != NULL)		
>+		pMga->entityPrivate->mappedIOUsage ++;
> #else
> 	/*
> 	 * For Alpha, we need to map SPARSE memory, since we need
>@@ -2874,16 +2893,27 @@
>     if (pMga->iload_bar != -1) {
> #ifdef XSERVER_LIBPCIACCESS
>         region = &dev->regions[pMga->iload_bar];
>-        err = pci_device_map_range(dev,
>+
>+	if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedILOADUsage == 0)
>+	{
>+		err = pci_device_map_range(dev,
>                                    region->base_addr, region->size,
>                                    PCI_DEV_MAP_FLAG_WRITABLE,
>                                    (void *) &pMga->ILOADBase);
>-	if (err) {
>-	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>-		       "Unable to map BAR 2 (ILOAD region).  %s (%d)\n",
>-		       strerror(err), err);
>-	    return FALSE;
>+		if (err) {
>+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>+				   "Unable to map BAR 2 (ILOAD region).  %s (%d)\n",
>+				   strerror(err), err);
>+			return FALSE;
>+		}
>+		if(pMga->entityPrivate != NULL)
>+			pMga->entityPrivate->mappedILOADBase = pMga->ILOADBase;
> 	}
>+	else
>+		pMga->ILOADBase = pMga->entityPrivate->mappedILOADBase;
>+
>+	if(pMga->entityPrivate != NULL)
>+		pMga->entityPrivate->mappedILOADUsage ++;
> #else
> 	pMga->ILOADBase = xf86MapPciMem(pScrn->scrnIndex,
> 					VIDMEM_MMIO | VIDMEM_MMIO_32BIT |
>@@ -2905,7 +2935,7 @@
> static Bool
> MGAUnmapMem(ScrnInfoPtr pScrn)
> {
>-    MGAPtr pMga = MGAPTR(pScrn);
>+ MGAPtr pMga = MGAPTR(pScrn);
> #ifdef XSERVER_LIBPCIACCESS
>     struct pci_device * const dev = pMga->PciInfo;
> #endif
>@@ -2913,10 +2943,24 @@
>     
>     if (!pMga->FBDev) {
> #ifdef XSERVER_LIBPCIACCESS
>-        pci_device_unmap_range(dev, pMga->IOBase, 
>-			       dev->regions[pMga->io_bar].size);
>-        pci_device_unmap_range(dev, pMga->FbBase, 
>-			       dev->regions[pMga->framebuffer_bar].size);
>+	    if(pMga->entityPrivate != NULL)
>+		    pMga->entityPrivate->mappedIOUsage --;
>+
>+	    if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedIOUsage == 0)
>+	    {
>+		    int err = pci_device_unmap_range(dev, pMga->IOBase, 
>+					   dev->regions[pMga->io_bar].size);
>+
>+		if(err)
>+	            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "failed UNMAPPING io 0x%08llX, 0x%llX\n", (long long)pMga->IOBase, (long long)dev->regions[pMga->io_bar].size);
>+	
>+		    if(pMga->entityPrivate != NULL)
>+			    pMga->entityPrivate->mappedIOBase = NULL;
>+	    }
>+
>+        int err = pci_device_unmap_range(dev, pMga->FbBase, pMga->FbMapSize);
>+	if(err)
>+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "failed UNMAPPING framebuffer 0x%08llX, 0x%llX\n", (long long)pMga->FbBase, (long long)pMga->FbMapSize);
> #else
> 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->IOBase, 0x4000);
> 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->FbBase, pMga->FbMapSize);
>@@ -2929,8 +2973,20 @@
> 
>     if ((pMga->iload_bar != -1) && (pMga->ILOADBase != NULL)) {
> #ifdef XSERVER_LIBPCIACCESS
>-        pci_device_unmap_range(dev, pMga->ILOADBase,
>+	    if(pMga->entityPrivate != NULL)
>+		    pMga->entityPrivate->mappedILOADUsage --;
>+
>+	    if(pMga->entityPrivate == NULL || pMga->entityPrivate->mappedILOADUsage == 0)
>+	    {
>+		int err =   pci_device_unmap_range(dev, pMga->ILOADBase,
> 			       dev->regions[pMga->iload_bar].size);
>+               if(err)
>+                    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "failed UNMAPPING iLOAD 0x%08llX, 0x%llX\n", (long long)pMga->ILOADBase, (long long)dev->regions[pMga->iload_bar].size);
>+
>+		    if(pMga->entityPrivate != NULL)
>+			    pMga->entityPrivate->mappedILOADBase = NULL;
>+	    }
>+
> #else
> 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pMga->ILOADBase, 0x800000);
> #endif

Actions: View | Diff

Attachments on bug 441070: 249382 | 249383 | 249384 | 363715