summaryrefslogtreecommitdiff
path: root/src/i830_accel.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-02-27 22:51:22 -0800
committerEric Anholt <eric@anholt.net>2009-03-06 13:26:10 -0800
commit73b7190421132ad73179c3fb7bb0e06c427dce5c (patch)
tree3fec1ee90ea2812b2e5ae92c03544e64337615f6 /src/i830_accel.c
parente9d6bbbe0b41e29c58a79844decd81771da85dd4 (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_accel.c')
-rw-r--r--src/i830_accel.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 9155c927..9f5bcb55 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -96,7 +96,7 @@ int
I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
{
I830Ptr pI830 = I830PTR(pScrn);
- I830RingBuffer *ring = pI830->LpRing;
+ I830RingBuffer *ring = &pI830->ring;
int iters = 0;
unsigned int start = 0;
unsigned int now = 0;
@@ -188,8 +188,6 @@ I830Sync(ScrnInfoPtr pScrn)
}
#endif
- if (pI830->entityPrivate && !pI830->entityPrivate->RingRunning) return;
-
I830EmitFlush(pScrn);
intel_batch_flush(pScrn, TRUE);