From 107151ce9f82955191a7fd6a2e6bfd5ff8cc5aea Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 9 Sep 2014 16:27:57 +0100 Subject: igt/gem_ppgtt: Create secondary contexts and mm Signed-off-by: Chris Wilson --- lib/intel_batchbuffer.c | 15 ++++++++++++++- lib/intel_batchbuffer.h | 5 +++++ 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index 9408ad9e..952b86af 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -79,6 +79,7 @@ intel_batchbuffer_reset(struct intel_batchbuffer *batch) BATCH_SZ, 4096); memset(batch->buffer, 0, sizeof(batch->buffer)); + batch->ctx = NULL; batch->ptr = batch->buffer; batch->end = NULL; @@ -163,6 +164,7 @@ void intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring) { unsigned int used = flush_on_ring_common(batch, ring); + drm_intel_context *ctx; if (used == 0) return; @@ -171,11 +173,22 @@ intel_batchbuffer_flush_on_ring(struct intel_batchbuffer *batch, int ring) batch->ptr = NULL; - do_or_die(drm_intel_bo_mrb_exec(batch->bo, used, NULL, 0, 0, ring)); + /* XXX bad kernel API */ + ctx = batch->ctx; + if (ring != I915_EXEC_RENDER) + ctx = NULL; + do_or_die(drm_intel_gem_bo_context_exec(batch->bo, ctx, used, ring)); intel_batchbuffer_reset(batch); } +void +intel_batchbuffer_set_context(struct intel_batchbuffer *batch, + drm_intel_context *context) +{ + batch->ctx = context; +} + /** * intel_batchbuffer_flush_with_context: * @batch: batchbuffer object diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h index 77a63347..0ec66015 100644 --- a/lib/intel_batchbuffer.h +++ b/lib/intel_batchbuffer.h @@ -14,6 +14,7 @@ struct intel_batchbuffer { uint32_t devid; int gen; + drm_intel_context *ctx; drm_intel_bo *bo; uint8_t buffer[BATCH_SZ]; @@ -24,6 +25,10 @@ struct intel_batchbuffer { struct intel_batchbuffer *intel_batchbuffer_alloc(drm_intel_bufmgr *bufmgr, uint32_t devid); +void intel_batchbuffer_set_context(struct intel_batchbuffer *batch, + drm_intel_context *ctx); + + void intel_batchbuffer_free(struct intel_batchbuffer *batch); -- cgit v1.2.3