Revert "context: libdrm wrappers"context_support

This reverts commit c665e6a7319a67a1e43c204537b64bdcfda1da27.

2 files changed, 4 insertions, 38 deletions

diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index bcbdf618..3fcc5787 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -75,13 +75,13 @@ intel_batchbuffer_free(struct intel_batchbuffer *batch)
 
 #define CMD_POLY_STIPPLE_OFFSET       0x7906
 
-static unsigned int
-flush_on_ring_common(struct intel_batchbuffer *batch, int ring)
+void
+intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring)
 {
 	unsigned int used = batch->ptr - batch->buffer;
 
 	if (used == 0)
-		return 0;
+		return;
 
 	if (IS_GEN5(batch->devid)) {
 		/* emit gen5 w/a without batch space checks - we reserve that
@@ -100,17 +100,7 @@ flush_on_ring_common(struct intel_batchbuffer *batch, int ring)
 	/* Mark the end of the buffer. */
 	*(uint32_t *)(batch->ptr) = MI_BATCH_BUFFER_END; /* noop */
 	batch->ptr += 4;
-	return batch->ptr - batch->buffer;
-}
-
-void
-intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring)
-{
-	int ret;
-	unsigned int used = flush_on_ring_common(batch, ring);
-
-	if (used == 0)
-		return;
+	used = batch->ptr - batch->buffer;
 
 	do_or_die(drm_intel_bo_subdata(batch->bo, 0, used, batch->buffer));
 
@@ -122,28 +112,6 @@ intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring)
 }
 
 void
-intel_batchbuffer_flush_with_context(struct intel_batchbuffer *batch,
-				     drm_intel_context *context)
-{
-	int ret;
-	unsigned int used = flush_on_ring_common(batch, I915_EXEC_RENDER);
-
-	if (used == 0)
-		return;
-
-	ret = drm_intel_bo_subdata(batch->bo, 0, used, batch->buffer);
-	assert(ret == 0);
-
-	batch->ptr = NULL;
-
-	ret = drm_intel_gem_bo_context_exec(batch->bo, context, used,
-					    I915_EXEC_RENDER);
-	assert(ret == 0);
-
-	intel_batchbuffer_reset(batch);
-}
-
-void
 intel_batchbuffer_flush(struct intel_batchbuffer *batch)
 {
 	int ring = 0;
diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h
index ba0934cb..7ea13684 100644
--- a/lib/intel_batchbuffer.h
+++ b/lib/intel_batchbuffer.h
@@ -25,8 +25,6 @@ void intel_batchbuffer_free(struct intel_batchbuffer *batch);
 
 void intel_batchbuffer_flush(struct intel_batchbuffer *batch);
 void intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring);
-void intel_batchbuffer_flush_with_context(struct intel_batchbuffer *batch,
-					  drm_intel_context *context);
 
 void intel_batchbuffer_reset(struct intel_batchbuffer *batch);