diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-20 00:33:08 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-03 09:35:29 +0100 |
| commit | bfc882b4e30fbc169ecfe3508378623743806f56 (patch) | |
| tree | 40cd52c97a63bcec651da7da71cebf9199ccf6fe /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915: Remove unnecessary goto in intel_primary_plane_disable() (diff) | |
| download | linux-dev-bfc882b4e30fbc169ecfe3508378623743806f56.tar.xz linux-dev-bfc882b4e30fbc169ecfe3508378623743806f56.zip | |
drm/i915: Flatten engine init control flow
Now that sanity prevails and we have the clean split between software
init and starting the engines we can drop all the "have we allocate
this struct already?" nonsense.
Execlist code could benefit quite a bit more still, but that's for
another patch.
Reviewed-by: Dave Gordon <david.s.gordon@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 4ffb08cca983..d6f82532ac1d 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1833,8 +1833,7 @@ int intel_lr_context_deferred_create(struct intel_context *ctx, int ret; WARN_ON(ctx->legacy_hw_ctx.rcs_state != NULL); - if (ctx->engine[ring->id].state) - return 0; + WARN_ON(ctx->engine[ring->id].state); context_size = round_up(get_lr_context_size(ring), 4096); |