diff options
| author | Eric Anholt <eric@anholt.net> | 2009-02-27 22:51:22 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-03-06 13:26:10 -0800 |
| commit | 73b7190421132ad73179c3fb7bb0e06c427dce5c (patch) | |
| tree | 3fec1ee90ea2812b2e5ae92c03544e64337615f6 /src/i830_dri.c | |
| parent | e9d6bbbe0b41e29c58a79844decd81771da85dd4 (diff) | |
intel: Nuke shared-entity support (zaphod mode).
It's been broken for years now, and KMS offers a much better chance of getting
this working sensibly without making a mess of the 2D driver.
Diffstat (limited to 'src/i830_dri.c')
| -rw-r--r-- | src/i830_dri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_dri.c b/src/i830_dri.c index 96c711e5..b7ebd920 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -146,7 +146,7 @@ static Bool I830InitDma(ScrnInfoPtr pScrn) { I830Ptr pI830 = I830PTR(pScrn); - I830RingBuffer *ring = pI830->LpRing; + I830RingBuffer *ring = &pI830->ring; I830DRIPtr pI830DRI = (I830DRIPtr) pI830->pDRIInfo->devPrivate; drmI830Init info; @@ -773,9 +773,9 @@ I830DRIMapHW(ScreenPtr pScreen) if (!pI830->memory_manager) { if (drmAddMap(pI830->drmSubFD, - (drm_handle_t)pI830->LpRing->mem->offset + + (drm_handle_t)pI830->ring.mem->offset + pI830->LinearAddr, - pI830->LpRing->mem->size, DRM_AGP, 0, + pI830->ring.mem->size, DRM_AGP, 0, (drmAddress) &pI830->ring_map) < 0) { xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAddMap(ring_map) failed. Disabling DRI\n"); @@ -1004,7 +1004,7 @@ I830DRISwapContext(ScreenPtr pScreen, DRISyncType syncType, if (I810_DEBUG & DEBUG_VERBOSE_DRI) ErrorF("i830DRISwapContext (in)\n"); - *pI830->last_3d = LAST_3D_OTHER; + pI830->last_3d = LAST_3D_OTHER; if (!pScrn->vtSema) return; |