diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-11-20 00:33:07 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-03 09:35:28 +0100 |
| commit | 35a57ffbb10840af219eeaf64718434242bb7c76 (patch) | |
| tree | d8a9ca94097b8a506a3f09fe13a475489118e2fb /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915: Move intel_init_pipe_control out of engine->init_hw (diff) | |
| download | linux-35a57ffbb10840af219eeaf64718434242bb7c76.tar.xz linux-35a57ffbb10840af219eeaf64718434242bb7c76.zip | |
drm/i915: Only init engines once
We can do this.
And now there's finally the clean split between software setup and
hardware setup I kinda wanted since multi-ring support was merged
aeons ago. It only took almost 5 years.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Dave Gordon <david.s.gordon@intel.com>
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 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 542382f2b1d5..4ffb08cca983 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1387,12 +1387,6 @@ static int logical_ring_init(struct drm_device *dev, struct intel_engine_cs *rin if (ret) return ret; - if (ring->init_hw) { - ret = ring->init_hw(ring); - if (ret) - return ret; - } - ret = intel_lr_context_deferred_create(ring->default_context, ring); return ret; |