diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-26 15:41:24 -0600 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-26 15:41:24 -0600 |
| commit | 2b440d54617bf0020171ce765708e7a9b48f2185 (patch) | |
| tree | f125abe7e2c08ccaee721e895c4adf7f3faac4c2 /src/mesa/drivers/dri/i965/intel_ioctl.c | |
| parent | ab57cbaccccb30fd743ba3283251430e6bc3a071 (diff) | |
| parent | b422e5ad3716d32f2434ca38819f4a877c7eeeeb (diff) | |
Merge branch 'master' into autoconf2
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_ioctl.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_ioctl.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_ioctl.c b/src/mesa/drivers/dri/i965/intel_ioctl.c index 91677c0c52..ebf5e3ae83 100644 --- a/src/mesa/drivers/dri/i965/intel_ioctl.c +++ b/src/mesa/drivers/dri/i965/intel_ioctl.c @@ -45,17 +45,6 @@ #include "intel_bufmgr_ttm.h" #include "i915_drm.h" -static void intelWaitIdleLocked( struct intel_context *intel ) -{ - unsigned int fence; - - if (INTEL_DEBUG & DEBUG_SYNC) - fprintf(stderr, "waiting for idle\n"); - - fence = intelEmitIrqLocked(intel); - intelWaitIrq(intel, fence); -} - int intelEmitIrqLocked( struct intel_context *intel ) { int seq = 1; @@ -185,7 +174,7 @@ intel_exec_ioctl(struct intel_context *intel, execbuf.batch.DR4 = ((((GLuint) intel->drawX) & 0xffff) | (((GLuint) intel->drawY) << 16)); - execbuf.ops_list = (unsigned)start; // TODO + execbuf.ops_list = (unsigned long)start; // TODO execbuf.fence_arg.flags = DRM_FENCE_FLAG_SHAREABLE | DRM_I915_FENCE_FLAG_FLUSHED; if (intel->no_hw) |