aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/common
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2007-10-03 16:54:59 +1000
committerDave Airlie <[email protected]>2007-10-03 16:54:59 +1000
commitfa031c8914d685e153b4ab886f43fdbfbbd0a30b (patch)
tree83b10ef26363902a0af6c0c94e76fc73da2c81ab /src/mesa/drivers/dri/common
parent4cd3ef58a989f61ff22669648e4117426c6e603c (diff)
i915: add superioctl initial support inside bufmgr ttm
Diffstat (limited to 'src/mesa/drivers/dri/common')
-rw-r--r--src/mesa/drivers/dri/common/dri_bufmgr.c4
-rw-r--r--src/mesa/drivers/dri/common/dri_bufmgr.h4
-rw-r--r--src/mesa/drivers/dri/common/dri_bufmgr_fake.c2
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 359b57863ad..7eee0fbf501 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)
+void *dri_process_relocs(dri_bo *batch_buf, GLuint *hack)
{
- batch_buf->bufmgr->process_relocs(batch_buf);
+ return batch_buf->bufmgr->process_relocs(batch_buf, hack);
}
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 aeeb6bdb43c..f6f283eaa62 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 *(*process_relocs)(dri_bo *batch_buf, void *hack);
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);
+void *dri_process_relocs(dri_bo *batch_buf, GLuint *hack);
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 adf0cf5ab72..21b09b448b5 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)
+dri_fake_process_reloc(dri_bo *batch_buf, GLuint *hack)
{
dri_bufmgr_fake *bufmgr_fake = (dri_bufmgr_fake *)batch_buf->bufmgr;
GLuint i;