summary refs log tree commit diff
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2014-11-20 00:33:07 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-12-03 09:35:28 +0100
commit35a57ffbb10840af219eeaf64718434242bb7c76 (patch)
treed8a9ca94097b8a506a3f09fe13a475489118e2fb /drivers/gpu/drm/i915/intel_ringbuffer.c
parent99be1dfe06e56b6e32f522979e9cf354dad5dc2e (diff)
downloadlinux-35a57ffbb10840af219eeaf64718434242bb7c76.tar.gz
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_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index f0ffcf7c7eb3..590b7c38292f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1859,10 +1859,6 @@ static int intel_init_ring_buffer(struct drm_device *dev,
 	if (ret)
 		goto error;
 
-	ret = ring->init_hw(ring);
-	if (ret)
-		goto error;
-
 	return 0;
 
 error: