summaryrefslogtreecommitdiff
path: root/src/i830_accel.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-03-14 10:04:18 -0700
committerEric Anholt <eric@anholt.net>2008-03-14 10:18:11 -0700
commit69fbc17441d0f894d17b058e65ae22300cd2a54c (patch)
tree5c1c2e0830dfef2bf9577b10ec4b6162c78b16aa /src/i830_accel.c
parent65f92cfb7a05c9c028cf73ce1221cc0a651b50b3 (diff)
Change OUT_RING and similar calls to OUT_BATCH for batchbuffer merge
Diffstat (limited to 'src/i830_accel.c')
-rw-r--r--src/i830_accel.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/i830_accel.c b/src/i830_accel.c
index fdc713be..953a73bc 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -195,10 +195,10 @@ I830Sync(ScrnInfoPtr pScrn)
*/
{
- BEGIN_LP_RING(2);
- OUT_RING(MI_FLUSH | flags);
- OUT_RING(MI_NOOP); /* pad to quadword */
- ADVANCE_LP_RING();
+ BEGIN_BATCH(2);
+ OUT_BATCH(MI_FLUSH | flags);
+ OUT_BATCH(MI_NOOP); /* pad to quadword */
+ ADVANCE_BATCH();
}
I830WaitLpRing(pScrn, pI830->LpRing->mem->size - 8, 0);
@@ -217,10 +217,10 @@ I830EmitFlush(ScrnInfoPtr pScrn)
flags = 0;
{
- BEGIN_LP_RING(2);
- OUT_RING(MI_FLUSH | flags);
- OUT_RING(MI_NOOP); /* pad to quadword */
- ADVANCE_LP_RING();
+ BEGIN_BATCH(2);
+ OUT_BATCH(MI_FLUSH | flags);
+ OUT_BATCH(MI_NOOP); /* pad to quadword */
+ ADVANCE_BATCH();
}
}