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_ring.h | |
| 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_ring.h')
| -rw-r--r-- | src/i830_ring.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/i830_ring.h b/src/i830_ring.h index c296d41a..062b7ead 100644 --- a/src/i830_ring.h +++ b/src/i830_ring.h @@ -34,12 +34,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. if (I810_DEBUG & DEBUG_VERBOSE_RING) \ ErrorF("OUT_RING 0x%08x: 0x%08x, (mask %x)\n", \ pI830->ring_next, (unsigned int)(n), \ - pI830->LpRing->tail_mask); \ - *(volatile uint32_t *)(pI830->LpRing->virtual_start + \ + pI830->ring.tail_mask); \ + *(volatile uint32_t *)(pI830->ring.virtual_start + \ pI830->ring_next) = n; \ pI830->ring_used += 4; \ pI830->ring_next += 4; \ - pI830->ring_next &= pI830->LpRing->tail_mask; \ + pI830->ring_next &= pI830->ring.tail_mask; \ } while (0) #define OUT_RING_F(x) do { \ @@ -60,8 +60,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. FatalError("%s: ADVANCE_LP_RING: under-used allocation %d/%d\n ", \ __FUNCTION__, pI830->ring_used, \ pI830->ring_emitting); \ - pI830->LpRing->tail = pI830->ring_next; \ - pI830->LpRing->space -= pI830->ring_used; \ + pI830->ring.tail = pI830->ring_next; \ + pI830->ring.space -= pI830->ring_used; \ if (pI830->ring_next & 0x07) \ FatalError("%s: ADVANCE_LP_RING: " \ "ring_next (0x%x) isn't on a QWord boundary\n", \ @@ -80,9 +80,9 @@ do { \ pI830->ring_emitting = (n) * 4; \ if ((n) & 1) \ pI830->ring_emitting += 4; \ - if (pI830->LpRing->space < pI830->ring_emitting) \ + if (pI830->ring.space < pI830->ring_emitting) \ WaitRingFunc(pScrn, pI830->ring_emitting, 0); \ - pI830->ring_next = pI830->LpRing->tail; \ + pI830->ring_next = pI830->ring.tail; \ if (I810_DEBUG & DEBUG_VERBOSE_RING) \ ErrorF( "BEGIN_LP_RING %d in %s\n", n, FUNCTION_NAME); \ pI830->ring_used = 0; \ |