diff options
| author | Eric Anholt <eric@anholt.net> | 2008-03-14 10:04:18 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-03-14 10:18:11 -0700 |
| commit | 69fbc17441d0f894d17b058e65ae22300cd2a54c (patch) | |
| tree | 5c1c2e0830dfef2bf9577b10ec4b6162c78b16aa /src/i830_video.c | |
| parent | 65f92cfb7a05c9c028cf73ce1221cc0a651b50b3 (diff) | |
Change OUT_RING and similar calls to OUT_BATCH for batchbuffer merge
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index cc351f1c..c25e9921 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -421,18 +421,18 @@ i830_overlay_on(ScrnInfoPtr pScrn) deactivate = i830_pipe_a_require_activate (pScrn); overlay->OCMD &= ~OVERLAY_ENABLE; - BEGIN_LP_RING(6); - OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE); - OUT_RING(MI_NOOP); - OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_ON); + BEGIN_BATCH(6); + OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE); + OUT_BATCH(MI_NOOP); + OUT_BATCH(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_ON); if (OVERLAY_NOPHYSICAL(pI830)) - OUT_RING(pI830->overlay_regs->offset | OFC_UPDATE); + OUT_BATCH(pI830->overlay_regs->offset | OFC_UPDATE); else - OUT_RING(pI830->overlay_regs->bus_addr | OFC_UPDATE); + OUT_BATCH(pI830->overlay_regs->bus_addr | OFC_UPDATE); /* Wait for the overlay to light up before attempting to use it */ - OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); - OUT_RING(MI_NOOP); - ADVANCE_LP_RING(); + OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); + OUT_BATCH(MI_NOOP); + ADVANCE_BATCH(); i830WaitSync(pScrn); /* @@ -466,12 +466,12 @@ i830_overlay_continue(ScrnInfoPtr pScrn, Bool update_filter) flip_addr |= OFC_UPDATE; OVERLAY_DEBUG ("overlay_continue cmd 0x%08x -> 0x%08x sta 0x%08x\n", overlay->OCMD, INREG(OCMD_REGISTER), INREG(DOVSTA)); - BEGIN_LP_RING(4); - OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE); - OUT_RING(MI_NOOP); - OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_CONTINUE); - OUT_RING(flip_addr); - ADVANCE_LP_RING(); + BEGIN_BATCH(4); + OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE); + OUT_BATCH(MI_NOOP); + OUT_BATCH(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_CONTINUE); + OUT_BATCH(flip_addr); + ADVANCE_BATCH(); OVERLAY_DEBUG("overlay_continue\n"); } @@ -492,10 +492,10 @@ i830_overlay_off(ScrnInfoPtr pScrn) * executed */ { - BEGIN_LP_RING(2); - OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); - OUT_RING(MI_NOOP); - ADVANCE_LP_RING(); + BEGIN_BATCH(2); + OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); + OUT_BATCH(MI_NOOP); + ADVANCE_BATCH(); i830WaitSync(pScrn); } @@ -506,17 +506,17 @@ i830_overlay_off(ScrnInfoPtr pScrn) overlay->OCMD &= ~OVERLAY_ENABLE; OVERLAY_DEBUG ("overlay_off cmd 0x%08x -> 0x%08x sta 0x%08x\n", overlay->OCMD, INREG(OCMD_REGISTER), INREG(DOVSTA)); - BEGIN_LP_RING(6); - OUT_RING(MI_FLUSH | MI_WRITE_DIRTY_STATE); - OUT_RING(MI_NOOP); - OUT_RING(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_CONTINUE); + BEGIN_BATCH(6); + OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE); + OUT_BATCH(MI_NOOP); + OUT_BATCH(MI_OVERLAY_FLIP | MI_OVERLAY_FLIP_CONTINUE); if (OVERLAY_NOPHYSICAL(pI830)) - OUT_RING(pI830->overlay_regs->offset); + OUT_BATCH(pI830->overlay_regs->offset); else - OUT_RING(pI830->overlay_regs->bus_addr); - OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); - OUT_RING(MI_NOOP); - ADVANCE_LP_RING(); + OUT_BATCH(pI830->overlay_regs->bus_addr); + OUT_BATCH(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_OVERLAY_FLIP); + OUT_BATCH(MI_NOOP); + ADVANCE_BATCH(); i830WaitSync(pScrn); } *pI830->overlayOn = FALSE; |