i915: add superioctl support to the ttm codepaths.

gears now runs for about 10-15 seconds with some artifacts before falling
over.

3 files changed, 5 insertions, 5 deletions

diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c
index 7eee0fbf501..91caa8757d2 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr.c
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.c
@@ -157,9 +157,9 @@ void dri_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset
    batch_buf->bufmgr->emit_reloc(batch_buf, flags, delta, offset, relocatee);
 }
 
-void *dri_process_relocs(dri_bo *batch_buf, GLuint *hack)
+void *dri_process_relocs(dri_bo *batch_buf)
 {
-   return batch_buf->bufmgr->process_relocs(batch_buf, hack);
+   return batch_buf->bufmgr->process_relocs(batch_buf);
 }
 
 void dri_post_submit(dri_bo *batch_buf, dri_fence **last_fence)
diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.h b/src/mesa/drivers/dri/common/dri_bufmgr.h
index f6f283eaa62..46e41f9bec1 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr.h
+++ b/src/mesa/drivers/dri/common/dri_bufmgr.h
@@ -164,7 +164,7 @@ struct _dri_bufmgr {
     */
    void (*emit_reloc)(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee);
 
-   void *(*process_relocs)(dri_bo *batch_buf, void *hack);
+   void *(*process_relocs)(dri_bo *batch_buf);
 
    void (*post_submit)(dri_bo *batch_buf, dri_fence **fence);
 };
@@ -205,7 +205,7 @@ dri_bo *dri_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name,
 				      unsigned int handle);
 
 void dri_emit_reloc(dri_bo *batch_buf, GLuint flags, GLuint delta, GLuint offset, dri_bo *relocatee);
-void *dri_process_relocs(dri_bo *batch_buf, GLuint *hack);
+void *dri_process_relocs(dri_bo *batch_buf);
 void dri_post_process_relocs(dri_bo *batch_buf);
 void dri_post_submit(dri_bo *batch_buf, dri_fence **last_fence);
 #endif
diff --git a/src/mesa/drivers/dri/common/dri_bufmgr_fake.c b/src/mesa/drivers/dri/common/dri_bufmgr_fake.c
index 21b09b448b5..adf0cf5ab72 100644
--- a/src/mesa/drivers/dri/common/dri_bufmgr_fake.c
+++ b/src/mesa/drivers/dri/common/dri_bufmgr_fake.c
@@ -881,7 +881,7 @@ relocation_sort(const void *a_in, const void *b_in) {
 }
 
 static void *
-dri_fake_process_reloc(dri_bo *batch_buf, GLuint *hack)
+dri_fake_process_reloc(dri_bo *batch_buf)
 {
    dri_bufmgr_fake *bufmgr_fake = (dri_bufmgr_fake *)batch_buf->bufmgr;
    GLuint i;