More libwsbm fixes

4 files changed, 12 insertions, 12 deletions

diff --git a/src/ochr_ioctl.c b/src/ochr_ioctl.c
index 1482cd2..3a4403e 100644
--- a/src/ochr_ioctl.c
+++ b/src/ochr_ioctl.c
@@ -242,7 +242,7 @@ ochr_yuv_relocation(struct _ViaCommandBuffer *cBuf,
     val_req = ochrValReq(node);
 
     if (!(val_req->presumed_flags & VIA_USE_PRESUMED)) {
-	val_req->presumed_gpu_offset = (uint64_t) wsbmBOOffset(buffer) - 
+	val_req->presumed_gpu_offset = (uint64_t) wsbmBOOffsetHint(buffer) - 
 	    wsbmBOPoolOffset(buffer);
 	val_req->presumed_flags |= VIA_USE_PRESUMED;
     }
@@ -329,7 +329,7 @@ ochr_2d_relocation(struct _ViaCommandBuffer *cBuf,
     val_req = ochrValReq(node);
 
     if (!(val_req->presumed_flags & VIA_USE_PRESUMED)) {
-	val_req->presumed_gpu_offset = (uint64_t) wsbmBOOffset(buffer);
+	val_req->presumed_gpu_offset = (uint64_t) wsbmBOOffsetHint(buffer);
 	val_req->presumed_flags |= VIA_USE_PRESUMED;
     }
 
@@ -447,8 +447,8 @@ ochr_tex_relocation(struct _ViaCommandBuffer *cBuf,
 	if (!(val_req->presumed_flags & VIA_USE_PRESUMED)) {
 	    val_req->presumed_flags = VIA_USE_PRESUMED;
 	    val_req->presumed_gpu_offset =
-		(uint64_t) wsbmBOOffset(addr[i].buf);
-	    if (wsbmBOPlacement(addr[i].buf) &
+		(uint64_t) wsbmBOOffsetHint(addr[i].buf);
+	    if (wsbmBOPlacementHint(addr[i].buf) &
 		(WSBM_PL_FLAG_TT | VIA_PL_FLAG_AGP))
 		val_req->presumed_flags |= VIA_PRESUMED_AGP;	    
 	}
@@ -538,7 +538,7 @@ ochr_dest_relocation(struct _ViaCommandBuffer *cBuf,
 
     if (!(val_req->presumed_flags & VIA_USE_PRESUMED)) {
         wsbmReadLockKernelBO();
-	val_req->presumed_gpu_offset = (uint64_t) wsbmBOOffset(dstBuffer);
+	val_req->presumed_gpu_offset = (uint64_t) wsbmBOOffsetHint(dstBuffer);
 	wsbmReadUnlockKernelBO();
 	val_req->presumed_flags |= VIA_USE_PRESUMED;
     }
diff --git a/src/via_cursor.c b/src/via_cursor.c
index 3af4978..b9165a7 100644
--- a/src/via_cursor.c
+++ b/src/via_cursor.c
@@ -76,7 +76,7 @@ VIAHWCursorInit(ScreenPtr pScreen)
     if (pVia->cursorMap == NULL)
 	return FALSE;
 
-    pVia->cursorOffset = wsbmBOOffset(pVia->scanout.bufs[VIA_SCANOUT_CURSOR]);
+    pVia->cursorOffset = wsbmBOOffsetHint(pVia->scanout.bufs[VIA_SCANOUT_CURSOR]);
     memset(pVia->cursorMap, 0x00, VIA_CURSOR_SIZE);
 
     if (pVia->Chipset == VIA_CX700 ||
diff --git a/src/via_driver.c b/src/via_driver.c
index dd6e878..b16fc71 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1827,7 +1827,7 @@ VIAEnterVT(int scrnIndex, int flags)
 	return FALSE;
     }
 
-    pVia->displayOffset = wsbmBOOffset(pVia->scanout.bufs[VIA_SCANOUT_DISPLAY]);
+    pVia->displayOffset = wsbmBOOffsetHint(pVia->scanout.bufs[VIA_SCANOUT_DISPLAY]);
 
     pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
     retVal = wsbmBOSetStatus(pVia->scanout.bufs[VIA_SCANOUT_CURSOR],
@@ -1845,7 +1845,7 @@ VIAEnterVT(int scrnIndex, int flags)
     if (!pVia->cursorMap)
 	return FALSE;
 
-    pVia->cursorOffset = wsbmBOOffset(pVia->scanout.bufs[VIA_SCANOUT_CURSOR]);
+    pVia->cursorOffset = wsbmBOOffsetHint(pVia->scanout.bufs[VIA_SCANOUT_CURSOR]);
 
     /* A Patch for APM suspend/resume, when HWCursor has garbage. */
     if (pVia->hwcursor)
@@ -2585,7 +2585,7 @@ VIAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     pVia->front.virtual = pVia->displayMap;
     pVia->front.size = wsbmBOSize(pVia->scanout.bufs[VIA_SCANOUT_DISPLAY]);
 
-    pVia->displayOffset = wsbmBOOffset(pVia->scanout.bufs[VIA_SCANOUT_DISPLAY]);
+    pVia->displayOffset = wsbmBOOffsetHint(pVia->scanout.bufs[VIA_SCANOUT_DISPLAY]);
 
     pScrn->AdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
 
diff --git a/src/via_swov.c b/src/via_swov.c
index 01fe1ab..7fa3280 100644
--- a/src/via_swov.c
+++ b/src/via_swov.c
@@ -964,7 +964,7 @@ AddHQVSurface(ScrnInfoPtr pScrn, unsigned int numbuf, CARD32 fourcc)
     ViaYUVFillBlack(pVia, hqvMap, fbsize);
     wsbmBOUnmap(pVia->scanout.bufs[VIA_SCANOUT_OVERLAY]);
 
-    addr = wsbmBOOffset(pVia->scanout.bufs[VIA_SCANOUT_OVERLAY]);
+    addr = wsbmBOOffsetHint(pVia->scanout.bufs[VIA_SCANOUT_OVERLAY]);
 
     for (i = 0; i < numbuf; i++) {
         pVia->swov.overlayRecordV1.dwHQVAddr[i] = addr;
@@ -1040,7 +1040,7 @@ CreateSurface(ScrnInfoPtr pScrn, CARD32 FourCC, CARD16 Width,
 	    if (hqvBuf->virtual == NULL)
 		goto out_err;
 
-	    hqvBuf->pinnedOffset = wsbmBOOffset(hqvBuf->buf);
+	    hqvBuf->pinnedOffset = wsbmBOOffsetHint(hqvBuf->buf);
 	    hqvBuf->deltaY = 0;
 	    if (isplanar) {
 		hqvBuf->deltaU = hqvBuf->deltaY + pitch*Height;
@@ -1872,7 +1872,7 @@ Upd_Video(ScrnInfoPtr pScrn, unsigned long videoFlag,
 	     */
 
 	    ret = wsbmBOSetStatus(hqvBuf->buf, WSBM_PL_FLAG_NO_EVICT, 0);
-	    hqvBuf->pinnedOffset = wsbmBOOffset(hqvBuf->buf);
+	    hqvBuf->pinnedOffset = wsbmBOOffsetHint(hqvBuf->buf);
 
 	    viaSetHqvSrc(pScrn, pVia->swov.SrcFourCC, hqvBuf);	    
             FlushVidRegBuffer(pVia);