Skip to content

Commit

Permalink
drm/i915: Emit await(batch) before MI_BB_START
Browse files Browse the repository at this point in the history 
Be consistent and ensure that we always emit the asynchronous waits
prior to issuing instructions that use the address. This ensures that if
we do emit GPU commands to do the await, they are before our use!

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200510102431.21959-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed May 11, 2020
1 parent c7e8a3d commit b0a997a
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 54 deletions.
49 changes: 32 additions & 17 deletions drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -972,12 +972,6 @@ emit_rpcs_query(struct drm_i915_gem_object *obj,
goto err_batch;
}

err = rq->engine->emit_bb_start(rq,
batch->node.start, batch->node.size,
0);
if (err)
goto err_request;

i915_vma_lock(batch);
err = i915_request_await_object(rq, batch->obj, false);
if (err == 0)
Expand All @@ -994,6 +988,18 @@ emit_rpcs_query(struct drm_i915_gem_object *obj,
if (err)
goto skip_request;

if (rq->engine->emit_init_breadcrumb) {
err = rq->engine->emit_init_breadcrumb(rq);
if (err)
goto skip_request;
}

err = rq->engine->emit_bb_start(rq,
batch->node.start, batch->node.size,
0);
if (err)
goto skip_request;

i915_vma_unpin_and_release(&batch, 0);
i915_vma_unpin(vma);

Expand All @@ -1005,7 +1011,6 @@ emit_rpcs_query(struct drm_i915_gem_object *obj,

skip_request:
i915_request_set_error_once(rq, err);
err_request:
i915_request_add(rq);
err_batch:
i915_vma_unpin_and_release(&batch, 0);
Expand Down Expand Up @@ -1541,10 +1546,6 @@ static int write_to_scratch(struct i915_gem_context *ctx,
goto err_unpin;
}

err = engine->emit_bb_start(rq, vma->node.start, vma->node.size, 0);
if (err)
goto err_request;

i915_vma_lock(vma);
err = i915_request_await_object(rq, vma->obj, false);
if (err == 0)
Expand All @@ -1553,14 +1554,23 @@ static int write_to_scratch(struct i915_gem_context *ctx,
if (err)
goto skip_request;

if (rq->engine->emit_init_breadcrumb) {
err = rq->engine->emit_init_breadcrumb(rq);
if (err)
goto skip_request;
}

err = engine->emit_bb_start(rq, vma->node.start, vma->node.size, 0);
if (err)
goto skip_request;

i915_vma_unpin(vma);

i915_request_add(rq);

goto out_vm;
skip_request:
i915_request_set_error_once(rq, err);
err_request:
i915_request_add(rq);
err_unpin:
i915_vma_unpin(vma);
Expand Down Expand Up @@ -1674,10 +1684,6 @@ static int read_from_scratch(struct i915_gem_context *ctx,
goto err_unpin;
}

err = engine->emit_bb_start(rq, vma->node.start, vma->node.size, flags);
if (err)
goto err_request;

i915_vma_lock(vma);
err = i915_request_await_object(rq, vma->obj, true);
if (err == 0)
Expand All @@ -1686,6 +1692,16 @@ static int read_from_scratch(struct i915_gem_context *ctx,
if (err)
goto skip_request;

if (rq->engine->emit_init_breadcrumb) {
err = rq->engine->emit_init_breadcrumb(rq);
if (err)
goto skip_request;
}

err = engine->emit_bb_start(rq, vma->node.start, vma->node.size, flags);
if (err)
goto skip_request;

i915_vma_unpin(vma);

i915_request_add(rq);
Expand All @@ -1708,7 +1724,6 @@ static int read_from_scratch(struct i915_gem_context *ctx,
goto out_vm;
skip_request:
i915_request_set_error_once(rq, err);
err_request:
i915_request_add(rq);
err_unpin:
i915_vma_unpin(vma);
Expand Down
25 changes: 9 additions & 16 deletions drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ igt_emit_store_dw(struct i915_vma *vma,
offset += PAGE_SIZE;
}
*cmd = MI_BATCH_BUFFER_END;

i915_gem_object_unpin_map(obj);

intel_gt_chipset_flush(vma->vm->gt);
Expand Down Expand Up @@ -126,16 +127,6 @@ int igt_gpu_fill_dw(struct intel_context *ce,
goto err_batch;
}

flags = 0;
if (INTEL_GEN(ce->vm->i915) <= 5)
flags |= I915_DISPATCH_SECURE;

err = rq->engine->emit_bb_start(rq,
batch->node.start, batch->node.size,
flags);
if (err)
goto err_request;

i915_vma_lock(batch);
err = i915_request_await_object(rq, batch->obj, false);
if (err == 0)
Expand All @@ -152,15 +143,17 @@ int igt_gpu_fill_dw(struct intel_context *ce,
if (err)
goto skip_request;

i915_request_add(rq);

i915_vma_unpin_and_release(&batch, 0);
flags = 0;
if (INTEL_GEN(ce->vm->i915) <= 5)
flags |= I915_DISPATCH_SECURE;

return 0;
err = rq->engine->emit_bb_start(rq,
batch->node.start, batch->node.size,
flags);

skip_request:
i915_request_set_error_once(rq, err);
err_request:
if (err)
i915_request_set_error_once(rq, err);
i915_request_add(rq);
err_batch:
i915_vma_unpin_and_release(&batch, 0);
Expand Down
16 changes: 9 additions & 7 deletions drivers/gpu/drm/i915/gt/intel_renderstate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,14 @@ int intel_renderstate_emit(struct intel_renderstate *so,
if (!so->vma)
return 0;

i915_vma_lock(so->vma);
err = i915_request_await_object(rq, so->vma->obj, false);
if (err == 0)
err = i915_vma_move_to_active(so->vma, rq, 0);
i915_vma_unlock(so->vma);
if (err)
return err;

err = engine->emit_bb_start(rq,
so->batch_offset, so->batch_size,
I915_DISPATCH_SECURE);
Expand All @@ -233,13 +241,7 @@ int intel_renderstate_emit(struct intel_renderstate *so,
return err;
}

i915_vma_lock(so->vma);
err = i915_request_await_object(rq, so->vma->obj, false);
if (err == 0)
err = i915_vma_move_to_active(so->vma, rq, 0);
i915_vma_unlock(so->vma);

return err;
return 0;
}

void intel_renderstate_fini(struct intel_renderstate *so)
Expand Down
28 changes: 14 additions & 14 deletions drivers/gpu/drm/i915/selftests/i915_request.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,20 +865,20 @@ static int live_all_engines(void *arg)
goto out_request;
}

err = engine->emit_bb_start(request[idx],
batch->node.start,
batch->node.size,
0);
GEM_BUG_ON(err);
request[idx]->batch = batch;

i915_vma_lock(batch);
err = i915_request_await_object(request[idx], batch->obj, 0);
if (err == 0)
err = i915_vma_move_to_active(batch, request[idx], 0);
i915_vma_unlock(batch);
GEM_BUG_ON(err);

err = engine->emit_bb_start(request[idx],
batch->node.start,
batch->node.size,
0);
GEM_BUG_ON(err);
request[idx]->batch = batch;

i915_request_get(request[idx]);
i915_request_add(request[idx]);
idx++;
Expand Down Expand Up @@ -993,13 +993,6 @@ static int live_sequential_engines(void *arg)
}
}

err = engine->emit_bb_start(request[idx],
batch->node.start,
batch->node.size,
0);
GEM_BUG_ON(err);
request[idx]->batch = batch;

i915_vma_lock(batch);
err = i915_request_await_object(request[idx],
batch->obj, false);
Expand All @@ -1008,6 +1001,13 @@ static int live_sequential_engines(void *arg)
i915_vma_unlock(batch);
GEM_BUG_ON(err);

err = engine->emit_bb_start(request[idx],
batch->node.start,
batch->node.size,
0);
GEM_BUG_ON(err);
request[idx]->batch = batch;

i915_request_get(request[idx]);
i915_request_add(request[idx]);

Expand Down

0 comments on commit b0a997a

Please sign in to comment.