drm/i915: Move intel_init_pipe_control out of engine->init_hw
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 19 Nov 2014 23:33:06 +0000 (00:33 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Dec 2014 08:35:27 +0000 (09:35 +0100)
commit99be1dfe06e56b6e32f522979e9cf354dad5dc2e
tree2097727ef4e142da54d9a83ca853457a05397a8c
parentecfe00d802d47af797f09cf8c88ad5ee7aa8d11b
drm/i915: Move intel_init_pipe_control out of engine->init_hw

With this all the ->init_hw hooks really only set up hw state needed
to start the ring, all the software state setup and memory/buffer
allocations happen beforehand.

v2: We need to call intel_init_pipe_control after the ring init since
otherwise engine->dev is NULL and it falls over. Currently that's
now after the hw ring is enabled but a) we'll be fine as long as no
one submits a batch b) this will change soon.

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>
drivers/gpu/drm/i915/intel_lrc.c
drivers/gpu/drm/i915/intel_ringbuffer.c