Revert "drm/i915: correctly order the ring init sequence"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Aug 2012 07:54:14 +0000 (09:54 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 12 Oct 2012 20:47:23 +0000 (05:47 +0900)
commit0ba9e491a36eb07bf2fb7f43b6c374bea07c6834
tree724a6da0584d61fcb807efc9c71edc452955a48b
parent224cae7fedfe7dcc4c377ac235eda59eec1e6edf
Revert "drm/i915: correctly order the ring init sequence"

This reverts 622ecb9ace2ec006b58f6779732961945ea303ca which is
commit 0d8957c8a90bbb5d34fab9a304459448a5131e06 upstream.

We may only start to set up the new register values after having
confirmed that the ring is truely off. Otherwise the hw might lose the
newly written register values. This is caught later on in the init
sequence, when we check whether the register writes have stuck.

Reported-by: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Yang Guang <guang.a.yang@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/intel_ringbuffer.c