diff options
| author | Eric Anholt <eric@anholt.net> | 2010-02-19 12:54:48 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-20 12:57:21 -0500 |
| commit | c2c670ef18755cf5c878edf8a6b7d1617f54fe73 (patch) | |
| tree | 80592e6e5f910b1a4b19c663632570a60c6477fb /src/xvmc | |
| parent | b320449f75adf912e06832dacc0b861ce26353bd (diff) | |
Remove more DRI1 dead code.
Diffstat (limited to 'src/xvmc')
| -rw-r--r-- | src/xvmc/intel_batchbuffer.c | 35 | ||||
| -rw-r--r-- | src/xvmc/intel_xvmc.h | 1 |
2 files changed, 0 insertions, 36 deletions
diff --git a/src/xvmc/intel_batchbuffer.c b/src/xvmc/intel_batchbuffer.c index ebaac7a4..1807d2cd 100644 --- a/src/xvmc/intel_batchbuffer.c +++ b/src/xvmc/intel_batchbuffer.c @@ -49,41 +49,6 @@ #include "brw_structs.h" #define MI_BATCH_BUFFER_END (0xA << 23) #define BATCH_SIZE 8*1024 /* one bo is allocated each time, so the size can be small */ -static int intelEmitIrqLocked(void) -{ - drmI830IrqEmit ie; - int ret, seq; - - ie.irq_seq = &seq; - ret = drmCommandWriteRead(xvmc_driver->fd, DRM_I830_IRQ_EMIT, - &ie, sizeof(ie)); - - if (ret) { - fprintf(stderr, "%s: drmI830IrqEmit: %d\n", __FUNCTION__, ret); - exit(1); - } - - return seq; -} - -static void intelWaitIrq(int seq) -{ - int ret; - drmI830IrqWait iw; - - iw.irq_seq = seq; - - do { - ret = - drmCommandWrite(xvmc_driver->fd, DRM_I830_IRQ_WAIT, &iw, - sizeof(iw)); - } while (ret == -EAGAIN || ret == -EINTR); - - if (ret) { - fprintf(stderr, "%s: drmI830IrqWait: %d\n", __FUNCTION__, ret); - exit(1); - } -} static void i965_end_batch(void) { diff --git a/src/xvmc/intel_xvmc.h b/src/xvmc/intel_xvmc.h index 67c7b380..43153cc2 100644 --- a/src/xvmc/intel_xvmc.h +++ b/src/xvmc/intel_xvmc.h @@ -41,7 +41,6 @@ #include <stdint.h> #include <xf86drm.h> -#include "i830_common.h" #include "i830_hwmc.h" #include <X11/X.h> #include <X11/Xlibint.h> |