From: Thomas Daniel Date: Tue, 2 Dec 2014 12:50:48 +0000 (+0000) Subject: drm/i915: Fix startup failure in LRC mode after recent init changes X-Git-Tag: omap-for-v4.1/prcm-dts-mfd-syscon-fix~75^2~43^2~80 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7778be1eab918274f79603d7c17b3ec8be77386;p=pandora-kernel.git drm/i915: Fix startup failure in LRC mode after recent init changes A previous commit introduced engine init changes: commit 372ee59699d9 ("drm/i915: Only init engines once") This broke execlists as intel_lr_context_render_state_init was trying to emit commands to the RCS for the default context before the ring->init_hw was called. Made a new gen8_init_rcs_context function and assign in to render ring init_context. Moved call to intel_logical_ring_workarounds_emit into gen8_init_rcs_context to maintain previous functionality. Moved call to render_state_init from lr_context_deferred_create into gen8_init_rcs_context, and modified deferred_create to call ring->init_context for non-default contexts. Modified i915_gem_context_enable to call ring->init_context for the default context. So init_context will now always be called when the hw is ready - in i915_gem_context_enable for the default context and in lr_context_deferred_create for other contexts. Signed-off-by: Thomas Daniel Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed