Attachment 24217 Details for Bug 20761 – use GTT maps in KMS mode

[patch] use GTT maps in KMS mode

i830-uxa-gtt-map-3.patch (text/plain), 2.93 KB, created by Jesse Barnes on 2009-03-24 18:27:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2009-03-24 18:27:36 UTC

Size: 2.93 KB

patch

obsolete

>diff --git a/src/i830_driver.c b/src/i830_driver.c
>index 7502d30..7cb8667 100644
>--- a/src/i830_driver.c
>+++ b/src/i830_driver.c
>@@ -833,10 +833,20 @@ i830_update_front_offset(ScrnInfoPtr pScrn)
>     * yet.  We'll fix it up at CreateScreenResources.
>     */
>    if (!pI830->starting && pI830->accel != ACCEL_UXA) {
>+      dri_bo *bo = pI830->front_buffer->bo;
>+      pointer data;
>+
>+      data = pI830->FbBase + pScrn->fbOffset;
>+      if (bo) {
>+	  if (drm_intel_gem_bo_map_gtt(bo))
>+	      xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s: bo map failed\n",
>+		       __FUNCTION__);
>+	  else
>+	      data = bo->virtual;
>+      }
>       if (!pScreen->ModifyPixmapHeader(pScreen->GetScreenPixmap(pScreen),
> 				       pScrn->virtualX, pScrn->virtualY, -1, -1,
>-				       pitch, (pointer)(pI830->FbBase +
>-							pScrn->fbOffset)))
>+				       pitch, data))
>        FatalError("Couldn't adjust screen pixmap\n");
>    }
> }
>diff --git a/src/i830_exa.c b/src/i830_exa.c
>index 0a22486..381592b 100644
>--- a/src/i830_exa.c
>+++ b/src/i830_exa.c
>@@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
> #include "i810_reg.h"
> #include "i915_drm.h"
> #include <string.h>
>+#include <sys/mman.h>
> 
> #define ALWAYS_SYNC		0
> #define ALWAYS_FLUSH		0
>@@ -837,8 +838,6 @@ i830_uxa_set_pixmap_bo (PixmapPtr pixmap, dri_bo *bo)
> static Bool
> i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
> {
>-    ScrnInfoPtr pScrn = xf86Screens[pixmap->drawable.pScreen->myNum];
>-    I830Ptr pI830 = I830PTR(pScrn);
>     dri_bo *bo = i830_get_pixmap_bo (pixmap);
> 
>     if (bo) {
>@@ -853,16 +852,12 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
> 	    i830->need_sync = FALSE;
> 	}
> 
>-	if (pScrn->vtSema && !pI830->use_drm_mode && pI830->memory_manager) {
>-	    if (drm_intel_bo_pin(bo, 4096) != 0)
>-		return FALSE;
>-	    drm_intel_gem_bo_start_gtt_access(bo, access == UXA_ACCESS_RW);
>-	    pixmap->devPrivate.ptr = pI830->FbBase + bo->offset;
>-	} else {
>-	    if (dri_bo_map(bo, access == UXA_ACCESS_RW) != 0)
>-		return FALSE;
>-	    pixmap->devPrivate.ptr = bo->virtual;
>+	if (drm_intel_gem_bo_map_gtt(bo)) {
>+	    xf86DrvMsg(scrn->scrnIndex, X_WARNING, "%s: bo map failed\n",
>+		       __FUNCTION__);
>+	    return FALSE;
> 	}
>+	pixmap->devPrivate.ptr = bo->virtual;
>     }
>     return TRUE;
> }
>@@ -870,8 +865,6 @@ i830_uxa_prepare_access (PixmapPtr pixmap, uxa_access_t access)
> static void
> i830_uxa_finish_access (PixmapPtr pixmap)
> {
>-    ScrnInfoPtr pScrn = xf86Screens[pixmap->drawable.pScreen->myNum];
>-    I830Ptr pI830 = I830PTR(pScrn);
>     dri_bo *bo = i830_get_pixmap_bo (pixmap);
> 
>     if (bo) {
>@@ -879,11 +872,6 @@ i830_uxa_finish_access (PixmapPtr pixmap)
> 	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
> 	I830Ptr i830 = I830PTR(scrn);
> 
>-	if (pScrn->vtSema && !pI830->use_drm_mode && pI830->memory_manager)
>-	    drm_intel_bo_unpin(bo);
>-	else
>-	    dri_bo_unmap(bo);
>-
> 	pixmap->devPrivate.ptr = NULL;
> 	if (bo == i830->front_buffer->bo)
> 	    i830->need_flush = TRUE;

Actions: View | Splinter Review

Attachments on bug 20761: 24069 | 24070 | 24217 | 24792

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.