Attachment 5269 Details for Bug 6242 – private DMA buffers / mach64-ddx

[patch] private DMA buffers / mach64-ddx

ati-tst-0.patch (text/plain), 8.17 KB, created by George - on 2006-04-12 10:46:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2006-04-12 10:46:01 UTC

Size: 8.17 KB

patch

obsolete

>diff -Naup -x '*.swp' -x CVS -x 'Makefile*' -x '*o' -x '*a' -x atimach64render.c xf86-video-ati-exa/src/atidri.c xf86-video-ati-tst/src/atidri.c
>--- xf86-video-ati-exa/src/atidri.c	2006-04-11 18:46:25.000000000 +0300
>+++ xf86-video-ati-tst/src/atidri.c	2006-04-11 18:45:45.000000000 +0300
>@@ -660,6 +660,37 @@ static int Mach64MinBits(int val)
>     return bits;
> }
> 
>+static Bool ATIDRISetBufSize( ScreenPtr pScreen, unsigned int maxSize )
>+{
>+   ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
>+   ATIPtr pATI = ATIPTR(pScreenInfo);
>+   ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
>+
>+   if (pATI->OptionBufferSize) {
>+      if (pATI->OptionBufferSize < 1 || pATI->OptionBufferSize > maxSize  ) {
>+	 xf86DrvMsg( pScreen->myNum, X_ERROR, "[drm] Illegal DMA buffers size: %d MB\n",
>+		     pATI->OptionBufferSize );
>+	 return FALSE;
>+      }
>+      if (pATI->OptionBufferSize > 2) {
>+	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[drm] Illegal DMA buffers size: %d MB\n",
>+		     pATI->OptionBufferSize );
>+	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[drm] Clamping DMA buffers size to 2 MB\n",
>+		     pATI->OptionBufferSize );
>+	 pATIDRIServer->bufferSize = 2;
>+      } else {
>+	 pATIDRIServer->bufferSize = pATI->OptionBufferSize;
>+	 xf86DrvMsg( pScreen->myNum, X_CONFIG, "[drm] Using %d MB for DMA buffers\n",
>+		     pATIDRIServer->bufferSize );
>+      }
>+   } else {
>+      xf86DrvMsg( pScreen->myNum, X_DEFAULT, "[drm] Using %d MB for DMA buffers\n",
>+		  pATIDRIServer->bufferSize );
>+   }
>+
>+   return TRUE;
>+}
>+
> static Bool ATIDRISetAgpMode( ScreenPtr pScreen )
> {
>    ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
>@@ -782,27 +813,8 @@ static Bool ATIDRIAgpInit( ScreenPtr pSc
>    xf86DrvMsg(pScreen->myNum, X_INFO,
> 	      "[agp] Using %d kB for DMA descriptor ring\n", pATIDRIServer->ringSize);
> 
>-   if (pATI->OptionBufferSize) {
>-      if (pATI->OptionBufferSize < 1 || pATI->OptionBufferSize > pATIDRIServer->agpSize  ) {
>-	 xf86DrvMsg( pScreen->myNum, X_ERROR, "[agp] Illegal DMA buffers size: %d MB\n",
>-		     pATI->OptionBufferSize );
>-	 return FALSE;
>-      }
>-      if (pATI->OptionBufferSize > 2) {
>-	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] Illegal DMA buffers size: %d MB\n",
>-		     pATI->OptionBufferSize );
>-	 xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] Clamping DMA buffers size to 2 MB\n",
>-		     pATI->OptionBufferSize );
>-	 pATIDRIServer->bufferSize = 2;
>-      } else {
>-	 pATIDRIServer->bufferSize = pATI->OptionBufferSize;
>-	 xf86DrvMsg( pScreen->myNum, X_CONFIG, "[agp] Using %d MB for DMA buffers\n",
>-		     pATIDRIServer->bufferSize );
>-      }
>-   } else {
>-      xf86DrvMsg( pScreen->myNum, X_DEFAULT, "[agp] Using %d MB for DMA buffers\n",
>-		  pATIDRIServer->bufferSize );
>-   }
>+   if ( !ATIDRISetBufSize( pScreen, pATIDRIServer->agpSize ) )
>+      return FALSE;
> 
>    pATIDRIServer->agpTexSize    = pATIDRIServer->agpSize - pATIDRIServer->bufferSize;
> 
>@@ -848,7 +860,7 @@ static Bool ATIDRIAgpInit( ScreenPtr pSc
> 
>    /* Map vertex buffers */
>    if ( drmAddMap( pATI->drmFD, pATIDRIServer->bufferStart, pATIDRIServer->bufferMapSize,
>-		   DRM_AGP, 0, &pATIDRIServer->bufferHandle ) < 0 ) {
>+		   DRM_AGP, DRM_READ_ONLY, &pATIDRIServer->bufferHandle ) < 0 ) {
>       xf86DrvMsg( pScreen->myNum, X_ERROR,
> 		  "[agp] Could not add vertex buffers mapping\n" );
>       return FALSE;
>@@ -925,6 +937,56 @@ static Bool ATIDRIAgpInit( ScreenPtr pSc
>    return TRUE;
> }
> 
>+static Bool ATIDRIPciInit( ScreenPtr pScreen )
>+{
>+   ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum];
>+   ATIPtr pATI = ATIPTR(pScreenInfo);
>+   ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo;
>+
>+   pATIDRIServer->bufferSize = ATI_DEFAULT_BUFFER_SIZE;
>+   pATIDRIServer->ringSize = 16; /* 16 kB ring */
>+
>+   if ( !ATIDRISetBufSize( pScreen, (unsigned)(-1) ) )
>+      return FALSE;
>+
>+   /* Set size of the DMA descriptor ring */
>+   pATIDRIServer->ringStart   = 0;
>+   pATIDRIServer->ringMapSize = pATIDRIServer->ringSize*1024; /* ringSize is in kB */
>+
>+   /* Set size of the vertex buffer */
>+   pATIDRIServer->bufferStart   = 0;
>+   pATIDRIServer->bufferMapSize = pATIDRIServer->bufferSize*1024*1024;
>+
>+   /* Map DMA descriptor ring */
>+   if ( drmAddMap( pATI->drmFD, 0, pATIDRIServer->ringMapSize,
>+		   DRM_CONSISTENT, DRM_RESTRICTED, &pATIDRIServer->ringHandle ) < 0 ) {
>+      xf86DrvMsg( pScreen->myNum, X_ERROR,
>+		  "[pci] Could not add ring mapping\n" );
>+      return FALSE;
>+   }
>+   xf86DrvMsg( pScreen->myNum, X_INFO,
>+	       "[pci] ring handle = 0x%08lx\n",
>+	       pATIDRIServer->ringHandle );
>+
>+   if ( drmMap( pATI->drmFD, pATIDRIServer->ringHandle,
>+		pATIDRIServer->ringMapSize, &pATIDRIServer->ringMap ) < 0 ) {
>+      xf86DrvMsg( pScreen->myNum, X_ERROR,
>+		  "[pci] Could not map ring\n" );
>+      return FALSE;
>+   }
>+   xf86DrvMsg( pScreen->myNum, X_INFO,
>+	       "[pci] Ring mapped at 0x%08lx\n",
>+	       (unsigned long)pATIDRIServer->ringMap );
>+
>+   /* Disable AGP for ForcePCIMode */
>+   if ( pATI->BusType != ATI_BUS_PCI ) {
>+       outm( AGP_BASE, 0 );
>+       outm( AGP_CNTL, 0 );
>+   }
>+
>+   return TRUE;
>+}
>+
> /* Add a map for the MMIO registers that will be accessed by any
>  * DRI-based clients.
>  */
>@@ -1001,7 +1063,7 @@ static Bool ATIDRIAddBuffers( ScreenPtr 
>    /* Initialize vertex buffers */
>    if ( pATIDRIServer->IsPCI ) {
>       pATIDRIServer->numBuffers = drmAddBufs( pATI->drmFD,
>-					      (pATIDRIServer->bufferSize*1024*1024)/MACH64_BUFFER_SIZE,
>+					      pATIDRIServer->bufferMapSize/MACH64_BUFFER_SIZE,
> 					      MACH64_BUFFER_SIZE,
> 					      0,
> 					      0 );
>@@ -1314,50 +1376,22 @@ Bool ATIDRIScreenInit( ScreenPtr pScreen
> 
>    pATIDRIServer->IsPCI = (pATI->BusType == ATI_BUS_PCI || pATI->OptionIsPCI) ? TRUE : FALSE;
> 
>-   if ( pATI->BusType != ATI_BUS_PCI && pATI->OptionIsPCI ) {
>-       outm( AGP_BASE, 0 );
>-       outm( AGP_CNTL, 0 );
>-       xf86DrvMsg(pScreen->myNum, X_CONFIG, "[dri] Forcing PCI mode\n");
>-   }
>-
>-   /* Check buffer size option for PCI, since it won't be done in ATIDRIAgpInit */
>-   if ( pATIDRIServer->IsPCI) {
>-      pATIDRIServer->bufferSize = ATI_DEFAULT_BUFFER_SIZE;
>-      if (pATI->OptionBufferSize) {
>-      	 if (pATI->OptionBufferSize < 1) {
>-	    xf86DrvMsg( pScreen->myNum, X_ERROR, "[pci] Illegal DMA buffers size: %d MB\n",
>-			pATI->OptionBufferSize );
>-	    ATIDRICloseScreen( pScreen );
>-	    return FALSE;
>-	 }
>-	 if (pATI->OptionBufferSize > 2) {
>-	    xf86DrvMsg( pScreen->myNum, X_WARNING, "[pci] Illegal DMA buffers size: %d MB\n",
>-			pATI->OptionBufferSize );
>-	    xf86DrvMsg( pScreen->myNum, X_WARNING, "[pci] Clamping DMA buffers size to 2 MB\n",
>-			pATI->OptionBufferSize );
>-	    pATIDRIServer->bufferSize = 2;
>-	 } else {
>-	    pATIDRIServer->bufferSize = pATI->OptionBufferSize;
>-	    xf86DrvMsg( pScreen->myNum, X_CONFIG, "[pci] Using %d MB DMA buffer size\n",
>-			pATIDRIServer->bufferSize );
>-	 }
>-      } else {
>-	 xf86DrvMsg( pScreen->myNum, X_DEFAULT, "[pci] Using %d MB DMA buffer size\n",
>-		     pATIDRIServer->bufferSize );
>-      }
>-   }
>+   if ( pATI->BusType != ATI_BUS_PCI && pATI->OptionIsPCI )
>+       xf86DrvMsg(pScreen->myNum, X_CONFIG, "[drm] Forcing PCI mode\n");
> 
>    /* Initialize AGP */
>    if ( !pATIDRIServer->IsPCI && !ATIDRIAgpInit( pScreen ) ) {
>       pATIDRIServer->IsPCI = TRUE;
>-      if ( pATI->BusType != ATI_BUS_PCI ) {
>-	 outm( AGP_BASE, 0 );
>-	 outm( AGP_CNTL, 0 );
>-      }
>       xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] AGP failed to initialize -- falling back to PCI mode.\n" );
>       xf86DrvMsg( pScreen->myNum, X_WARNING, "[agp] Make sure you have the agpgart kernel module loaded.\n" );
>    }
> 
>+   /* Initialize PCI */
>+   if ( pATIDRIServer->IsPCI && !ATIDRIPciInit( pScreen ) ) {
>+      ATIDRICloseScreen( pScreen );
>+      return FALSE;
>+   }
>+
>    if ( !ATIDRIMapInit( pScreen ) ) {
>       ATIDRICloseScreen( pScreen );
>       return FALSE;
>diff -Naup -x '*.swp' -x CVS -x 'Makefile*' -x '*o' -x '*a' -x atimach64render.c xf86-video-ati-exa/src/mach64_common.h xf86-video-ati-tst/src/mach64_common.h
>--- xf86-video-ati-exa/src/mach64_common.h	2006-04-04 00:05:21.000000000 +0300
>+++ xf86-video-ati-tst/src/mach64_common.h	2006-04-11 16:25:40.000000000 +0300
>@@ -112,7 +112,7 @@ typedef struct {
> } drmMach64Vertex;
> 
> typedef struct {
>-   int idx;
>+   void *buf;
>    int pitch;
>    int offset;
>    int format;

Actions: View | Splinter Review

Attachments on bug 6242: 4911 | 4912 | 4913 | 4925 | 5123 | 5269 | 5270 | 5271 | 5283 | 5284 | 6234 | 6235 | 6236 | 6241 | 6270 | 6271 | 7232

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.