diff options
| author | Mika Kuoppala | 2015-07-03 16:09:36 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-07-06 16:51:26 +0200 |
| commit | cc3c42532c312c60f8499e22bbdb895ed5ce1d73 (patch) | |
| tree | f121d595e387aa14a7826eeafef9f91154a16600 /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915: Convert intel_lr_context_pin() for requests (diff) | |
| download | kernel-qcow2-linux-cc3c42532c312c60f8499e22bbdb895ed5ce1d73.tar.gz kernel-qcow2-linux-cc3c42532c312c60f8499e22bbdb895ed5ce1d73.tar.xz kernel-qcow2-linux-cc3c42532c312c60f8499e22bbdb895ed5ce1d73.zip | |
drm/i915: Convert execlists_elsp_writ() for requests
Pass around requests to carry context deeper in callchain.
Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 5ae68215e6fb..a07284adc317 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -292,12 +292,16 @@ static uint64_t execlists_ctx_descriptor(struct intel_engine_cs *ring, return desc; } -static void execlists_elsp_write(struct intel_engine_cs *ring, - struct drm_i915_gem_object *ctx_obj0, - struct drm_i915_gem_object *ctx_obj1) +static void execlists_elsp_write(struct drm_i915_gem_request *rq0, + struct drm_i915_gem_request *rq1) { + + struct intel_engine_cs *ring = rq0->ring; struct drm_device *dev = ring->dev; struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_i915_gem_object *ctx_obj0 = rq0->ctx->engine[ring->id].state; + struct drm_i915_gem_object *ctx_obj1 = rq1 ? + rq1->ctx->engine[ring->id].state : NULL; uint64_t temp = 0; uint32_t desc[4]; @@ -365,18 +369,12 @@ static int execlists_update_context(struct drm_i915_gem_request *rq) static void execlists_submit_requests(struct drm_i915_gem_request *rq0, struct drm_i915_gem_request *rq1) { - struct intel_engine_cs *ring = rq0->ring; - struct drm_i915_gem_object *ctx_obj0 = rq0->ctx->engine[ring->id].state; - struct drm_i915_gem_object *ctx_obj1 = NULL; - execlists_update_context(rq0); - if (rq1) { + if (rq1) execlists_update_context(rq1); - ctx_obj1 = rq1->ctx->engine[ring->id].state; - } - execlists_elsp_write(ring, ctx_obj0, ctx_obj1); + execlists_elsp_write(rq0, rq1); } static void execlists_context_unqueue(struct intel_engine_cs *ring) |